mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-20 14:25:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comments addressed

Browse Source
This commit is contained in:
Yuriy Glukhov
2018-03-24 22:55:06 +02:00
parent b52de1fcee
commit 0770844285
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pure/net.nim
View File

@@ -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.} =

3
lib/windows/winlean.nim
View File

@@ -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