From 29bb10b1854206015ad411f5b77c8fcd8aa90024 Mon Sep 17 00:00:00 2001 From: Yuriy Glukhov Date: Wed, 14 Mar 2018 22:53:00 +0200 Subject: [PATCH 1/4] Convertion procs for (IpAddress, Port) <-> (SockAddr, Socklen) --- lib/pure/net.nim | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/lib/pure/net.nim b/lib/pure/net.nim index af9eea51a7..bb1c1ce6e2 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -414,6 +414,39 @@ proc isIpAddress*(address_str: string): bool {.tags: [].} = return false return true +proc toSockAddr*(address: IpAddress, port: Port, sa: var SockAddr, sl: var Socklen) = + ## Converts `IpAddress` and `Port` to `SockAddr` and `Socklen` + let port = htons(uint16(port)) + case address.family + of IpAddressFamily.IPv4: + sl = sizeof(Sockaddr_in).Socklen + let s = cast[ptr Sockaddr_in](addr sa) + s.sin_family = type(s.sin_family)(AF_INET) + s.sin_port = port + copyMem(addr s.sin_addr, unsafeAddr address.address_v4[0], sizeof(s.sin_addr)) + of IpAddressFamily.IPv6: + sl = sizeof(Sockaddr_in6).Socklen + let s = cast[ptr Sockaddr_in6](addr sa) + s.sin6_family = type(s.sin6_family)(AF_INET6) + s.sin6_port = port + copyMem(addr s.sin6_addr, unsafeAddr address.address_v6[0], sizeof(s.sin6_addr)) + +proc fromSockAddr*(sa: SockAddr, sl: Socklen, address: var IpAddress, port: var Port) = + ## Converts `SockAddr` and `Socklen` to `IpAddress` and `Port`. Raises + ## `ObjectConversionError` in case of invalid `sa` and `sl` arguments. + if sa.sa_family.int == AF_INET.int and sl == sizeof(Sockaddr_in).Socklen: + address = IpAddress(family: IpAddressFamily.IPv4) + let s = cast[ptr Sockaddr_in](unsafeAddr sa) + copyMem(addr address.address_v4, addr s.sin_addr, sizeof(address.address_v4)) + port = ntohs(s.sin_port).Port + elif sa.sa_family.int == AF_INET6.int and sl == sizeof(Sockaddr_in6).Socklen: + address = IpAddress(family: IpAddressFamily.IPv6) + let s = cast[ptr Sockaddr_in6](unsafeAddr sa) + copyMem(addr address.address_v6, addr s.sin6_addr, sizeof(address.address_v6)) + port = ntohs(s.sin6_port).Port + else: + raise newException(ObjectConversionError, "Unexpected SockAddr/Socklen") + when defineSsl: CRYPTO_malloc_init() doAssert SslLibraryInit() == 1 From 1bd0efb067b7c1939f4d68c9014b7d67cb4e7020 Mon Sep 17 00:00:00 2001 From: Yuriy Glukhov Date: Thu, 15 Mar 2018 15:44:12 +0200 Subject: [PATCH 2/4] Fixed crash/interface. Added tests. --- lib/pure/nativesockets.nim | 2 +- lib/pure/net.nim | 12 ++++++------ lib/windows/winlean.nim | 4 ++++ tests/stdlib/tnet.nim | 32 +++++++++++++++++++++++++++++++- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/lib/pure/nativesockets.nim b/lib/pure/nativesockets.nim index 280c4e9272..68061853b5 100644 --- a/lib/pure/nativesockets.nim +++ b/lib/pure/nativesockets.nim @@ -31,7 +31,7 @@ else: export Sockaddr_storage, Sockaddr_un, Sockaddr_un_path_length export SocketHandle, Sockaddr_in, Addrinfo, INADDR_ANY, SockAddr, SockLen, - Sockaddr_in6, + Sockaddr_in6, Sockaddr_storage, inet_ntoa, recv, `==`, connect, send, accept, recvfrom, sendto, freeAddrInfo diff --git a/lib/pure/net.nim b/lib/pure/net.nim index bb1c1ce6e2..a48e200d8f 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -414,7 +414,7 @@ proc isIpAddress*(address_str: string): bool {.tags: [].} = return false return true -proc toSockAddr*(address: IpAddress, port: Port, sa: var SockAddr, sl: var Socklen) = +proc toSockAddr*(address: IpAddress, port: Port, sa: var Sockaddr_storage, sl: var Socklen) = ## Converts `IpAddress` and `Port` to `SockAddr` and `Socklen` let port = htons(uint16(port)) case address.family @@ -431,18 +431,18 @@ proc toSockAddr*(address: IpAddress, port: Port, sa: var SockAddr, sl: var Sockl s.sin6_port = port copyMem(addr s.sin6_addr, unsafeAddr address.address_v6[0], sizeof(s.sin6_addr)) -proc fromSockAddr*(sa: SockAddr, sl: Socklen, address: var IpAddress, port: var Port) = +proc fromSockAddr*(sa: Sockaddr_storage, sl: Socklen, address: var IpAddress, port: var Port) = ## Converts `SockAddr` and `Socklen` to `IpAddress` and `Port`. Raises ## `ObjectConversionError` in case of invalid `sa` and `sl` arguments. - if sa.sa_family.int == AF_INET.int and sl == sizeof(Sockaddr_in).Socklen: + if sa.ss_family.int == AF_INET.int and sl == sizeof(Sockaddr_in).Socklen: address = IpAddress(family: IpAddressFamily.IPv4) let s = cast[ptr Sockaddr_in](unsafeAddr sa) - copyMem(addr address.address_v4, addr s.sin_addr, sizeof(address.address_v4)) + copyMem(addr address.address_v4[0], addr s.sin_addr, sizeof(address.address_v4)) port = ntohs(s.sin_port).Port - elif sa.sa_family.int == AF_INET6.int and sl == sizeof(Sockaddr_in6).Socklen: + elif sa.ss_family.int == AF_INET6.int and sl == sizeof(Sockaddr_in6).Socklen: address = IpAddress(family: IpAddressFamily.IPv6) let s = cast[ptr Sockaddr_in6](unsafeAddr sa) - copyMem(addr address.address_v6, addr s.sin6_addr, sizeof(address.address_v6)) + copyMem(addr address.address_v6[0], addr s.sin6_addr, sizeof(address.address_v6)) port = ntohs(s.sin6_port).Port else: raise newException(ObjectConversionError, "Unexpected SockAddr/Socklen") diff --git a/lib/windows/winlean.nim b/lib/windows/winlean.nim index b2c1cc1f5f..b2afd3f698 100644 --- a/lib/windows/winlean.nim +++ b/lib/windows/winlean.nim @@ -481,6 +481,10 @@ type sin6_flowinfo*: int32 # unsigned sin6_addr*: In6_addr + Sockaddr_storage* {.importc: "SOCKADDR_STORAGE", + header: "winsock2.h".} = object + ss_family*: int16 + Servent* = object s_name*: cstring s_aliases*: cstringArray diff --git a/tests/stdlib/tnet.nim b/tests/stdlib/tnet.nim index e8ada05e70..64d690fc96 100644 --- a/tests/stdlib/tnet.nim +++ b/tests/stdlib/tnet.nim @@ -1,4 +1,4 @@ -import net +import net, nativesockets import unittest suite "isIpAddress tests": @@ -45,3 +45,33 @@ suite "parseIpAddress tests": test "invalid ipv6": expect(ValueError): discard parseIpAddress("gggg:cdba:0000:0000:0000:0000:3257:9652") + +block: # "IpAddress/Sockaddr conversion" + proc test(ipaddrstr: string) = + var ipaddr_1 = parseIpAddress(ipaddrstr) + # echo ipaddrstr, " ", $ipaddr_1 + + doAssert($ipaddrstr == $ipaddr_1) + + var sockaddr: Sockaddr_storage + var socklen: Socklen + var ipaddr_2: IpAddress + var port_2: Port + + toSockAddr(ipaddr_1, Port(0), sockaddr, socklen) + fromSockAddr(sockaddr, socklen, ipaddr_2, port_2) + + doAssert(ipaddrstr == $ipaddr_1) + + doAssert(ipaddr_1 == ipaddr_2) + doAssert($ipaddr_1 == $ipaddr_2) + + + # ipv6 address of example.com + test("2606:2800:220:1:248:1893:25c8:1946") + # ipv6 address of localhost + test("::1") + # ipv4 address of example.com + test("93.184.216.34") + # ipv4 address of localhost + test("127.0.0.1") From b52de1fcee29a8098bfa387524ecb12456afd7d7 Mon Sep 17 00:00:00 2001 From: Yuriy Glukhov Date: Thu, 15 Mar 2018 17:39:09 +0200 Subject: [PATCH 3/4] More flexible fromSockAddr interface --- lib/pure/net.nim | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/pure/net.nim b/lib/pure/net.nim index a48e200d8f..f16d496b42 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -431,22 +431,26 @@ proc toSockAddr*(address: IpAddress, port: Port, sa: var Sockaddr_storage, sl: v s.sin6_port = port copyMem(addr s.sin6_addr, unsafeAddr address.address_v6[0], sizeof(s.sin6_addr)) -proc fromSockAddr*(sa: Sockaddr_storage, sl: Socklen, address: var IpAddress, port: var Port) = - ## Converts `SockAddr` and `Socklen` to `IpAddress` and `Port`. Raises - ## `ObjectConversionError` in case of invalid `sa` and `sl` arguments. +proc fromSockAddrAux(sa: ptr Sockaddr_storage, sl: Socklen, address: var IpAddress, port: var Port) = if sa.ss_family.int == AF_INET.int and sl == sizeof(Sockaddr_in).Socklen: address = IpAddress(family: IpAddressFamily.IPv4) - let s = cast[ptr Sockaddr_in](unsafeAddr sa) + let s = cast[ptr Sockaddr_in](sa) copyMem(addr address.address_v4[0], addr s.sin_addr, sizeof(address.address_v4)) port = ntohs(s.sin_port).Port elif sa.ss_family.int == AF_INET6.int and sl == sizeof(Sockaddr_in6).Socklen: address = IpAddress(family: IpAddressFamily.IPv6) - let s = cast[ptr Sockaddr_in6](unsafeAddr sa) + let s = cast[ptr Sockaddr_in6](sa) copyMem(addr address.address_v6[0], addr s.sin6_addr, sizeof(address.address_v6)) port = ntohs(s.sin6_port).Port else: raise newException(ObjectConversionError, "Unexpected SockAddr/Socklen") +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) + when defineSsl: CRYPTO_malloc_init() doAssert SslLibraryInit() == 1 From 0770844285257b27f34b1f16a9fe4df08394a06a Mon Sep 17 00:00:00 2001 From: Yuriy Glukhov Date: Sat, 24 Mar 2018 22:55:06 +0200 Subject: [PATCH 4/4] Comments addressed --- lib/pure/net.nim | 2 +- lib/windows/winlean.nim | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/pure/net.nim b/lib/pure/net.nim index f16d496b42..336068df05 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -443,7 +443,7 @@ proc fromSockAddrAux(sa: ptr Sockaddr_storage, sl: Socklen, address: var IpAddre copyMem(addr address.address_v6[0], addr s.sin6_addr, sizeof(address.address_v6)) port = ntohs(s.sin6_port).Port else: - raise newException(ObjectConversionError, "Unexpected SockAddr/Socklen") + raise newException(ValueError, "Neither IPv4 nor IPv6") proc fromSockAddr*(sa: Sockaddr_storage | SockAddr | Sockaddr_in | Sockaddr_in6, sl: Socklen, address: var IpAddress, port: var Port) {.inline.} = diff --git a/lib/windows/winlean.nim b/lib/windows/winlean.nim index b2afd3f698..a0c784637a 100644 --- a/lib/windows/winlean.nim +++ b/lib/windows/winlean.nim @@ -484,6 +484,9 @@ type Sockaddr_storage* {.importc: "SOCKADDR_STORAGE", header: "winsock2.h".} = object ss_family*: int16 + ss_pad1: array[6, byte] + ss_align: int64 + ss_pad2: array[112, byte] Servent* = object s_name*: cstring