diff options
| author | Yuriy Glukhov <yuriy.glukhov@gmail.com> | 2018-03-24 22:55:06 +0200 |
|---|---|---|
| committer | Yuriy Glukhov <yuriy.glukhov@gmail.com> | 2018-03-24 22:55:06 +0200 |
| commit | 0770844285257b27f34b1f16a9fe4df08394a06a (patch) | |
| tree | 6c166b6e9070cc3fdd12b005050002b349b9a1fe /lib | |
| parent | b52de1fcee29a8098bfa387524ecb12456afd7d7 (diff) | |
| download | Nim-0770844285257b27f34b1f16a9fe4df08394a06a.tar.gz | |
Comments addressed
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pure/net.nim | 2 | ||||
| -rw-r--r-- | lib/windows/winlean.nim | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/pure/net.nim b/lib/pure/net.nim index f16d496b4..336068df0 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 b2afd3f69..a0c784637 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 |