jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7992 from yglukhov/fromSockAddr-compile-error

Browse source 
Fixed compilation error when Sockaddr_in4 or Sockaddr_in6 passed to fromSockAddr
This commit is contained in:
Andreas Rumpf 2018-06-08 13:38:39 +02:00 • committed by GitHub
commit e273ef4f5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/net.nim
View file

@ -447,7 +447,7 @@ proc fromSockAddr*(sa: Sockaddr_storage | SockAddr | Sockaddr_in | Sockaddr_in6,
sl: Socklen, address: var IpAddress, port: var Port) {.inline.} = sl: Socklen, address: var IpAddress, port: var Port) {.inline.} =
## Converts `SockAddr` and `Socklen` to `IpAddress` and `Port`. Raises ## Converts `SockAddr` and `Socklen` to `IpAddress` and `Port`. Raises
## `ObjectConversionError` in case of invalid `sa` and `sl` arguments. ## `ObjectConversionError` in case of invalid `sa` and `sl` arguments.
fromSockAddrAux(unsafeAddr sa, sl, address, port) fromSockAddrAux(cast[ptr Sockaddr_storage](unsafeAddr sa), sl, address, port)
when defineSsl: when defineSsl:
CRYPTO_malloc_init() CRYPTO_malloc_init()

12
tests/stdlib/tnet.nim
View file

@ -66,6 +66,18 @@ block: # "IpAddress/Sockaddr conversion"
doAssert(ipaddr_1 == ipaddr_2) doAssert(ipaddr_1 == ipaddr_2)
doAssert($ipaddr_1 == $ipaddr_2) doAssert($ipaddr_1 == $ipaddr_2)
if sockaddr.ss_family == AF_INET.toInt:
var sockaddr4: Sockaddr_in
copyMem(addr sockaddr4, addr sockaddr, sizeof(sockaddr4))
fromSockAddr(sockaddr4, socklen, ipaddr_2, port_2)
elif sockaddr.ss_family == AF_INET6.toInt:
var sockaddr6: Sockaddr_in6
copyMem(addr sockaddr6, addr sockaddr, sizeof(sockaddr6))
fromSockAddr(sockaddr6, socklen, ipaddr_2, port_2)
doAssert(ipaddr_1 == ipaddr_2)
doAssert($ipaddr_1 == $ipaddr_2)
# ipv6 address of example.com # ipv6 address of example.com
test("2606:2800:220:1:248:1893:25c8:1946") test("2606:2800:220:1:248:1893:25c8:1946")