diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-06-08 13:38:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 13:38:39 +0200 |
| commit | e273ef4f5e9ecbb015781fbbf62bbd72d69f47aa (patch) | |
| tree | 295a00e53c3dd08940bc2100264d148ac78cf0a6 | |
| parent | f99acdb07584d2c4c5eb1f22d998d97bcd823357 (diff) | |
| parent | b2323de9140dfa3a1cbe007274970457bb1ecc76 (diff) | |
| download | Nim-e273ef4f5e9ecbb015781fbbf62bbd72d69f47aa.tar.gz | |
Merge pull request #7992 from yglukhov/fromSockAddr-compile-error
Fixed compilation error when Sockaddr_in4 or Sockaddr_in6 passed to fromSockAddr
| -rw-r--r-- | lib/pure/net.nim | 2 | ||||
| -rw-r--r-- | tests/stdlib/tnet.nim | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/pure/net.nim b/lib/pure/net.nim index 60817484a..5d2efebee 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -447,7 +447,7 @@ proc fromSockAddr*(sa: Sockaddr_storage | SockAddr | Sockaddr_in | Sockaddr_in6, sl: Socklen, address: var IpAddress, port: var Port) {.inline.} = ## Converts `SockAddr` and `Socklen` to `IpAddress` and `Port`. Raises ## `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: CRYPTO_malloc_init() diff --git a/tests/stdlib/tnet.nim b/tests/stdlib/tnet.nim index 64d690fc9..d364447da 100644 --- a/tests/stdlib/tnet.nim +++ b/tests/stdlib/tnet.nim @@ -66,6 +66,18 @@ block: # "IpAddress/Sockaddr conversion" 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 test("2606:2800:220:1:248:1893:25c8:1946") |