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

Convert *_family fields to cushort

Browse source 
Fixes #9008
This commit is contained in:
LemonBoy 2018-09-19 09:24:30 +02:00
commit a27429304e
14 changed files with 61 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/async/tasyncawait.nim
View file

@ -41,10 +41,7 @@ proc createServer(port: Port) {.async.} =
var server = newAsyncNativeSocket()
block:
var name: Sockaddr_in
when defined(windows):
name.sin_family = toInt(AF_INET).int16
else:
name.sin_family = toInt(AF_INET)
name.sin_family = toInt(AF_INET).uint16
name.sin_port = htons(uint16(port))
name.sin_addr.s_addr = htonl(INADDR_ANY)
if bindAddr(server.SocketHandle, cast[ptr SockAddr](addr(name)),

5
tests/async/tnewasyncudp.nim
View file

@ -29,10 +29,7 @@ proc saveReceivedPort(port: int) =
proc prepareAddress(intaddr: uint32, intport: uint16): ptr Sockaddr_in =
result = cast[ptr Sockaddr_in](alloc0(sizeof(Sockaddr_in)))
when defined(windows):
result.sin_family = toInt(nativesockets.AF_INET).int16
else:
result.sin_family = toInt(nativesockets.AF_INET)
result.sin_family = toInt(nativesockets.AF_INET).uint16
result.sin_port = nativesockets.htons(intport)
result.sin_addr.s_addr = nativesockets.htonl(intaddr)

2
tests/async/twinasyncrw.nim
View file

@ -234,7 +234,7 @@ when defined(windows):
setBlocking(server, false)
block:
var name = Sockaddr_in()
name.sin_family = toInt(Domain.AF_INET).int16
name.sin_family = toInt(Domain.AF_INET).uint16
name.sin_port = htons(uint16(port))
name.sin_addr.s_addr = htonl(INADDR_ANY)
if bindAddr(server, cast[ptr SockAddr](addr(name)),

4
tests/stdlib/tnet.nim
View file

@ -66,11 +66,11 @@ block: # "IpAddress/Sockaddr conversion"
doAssert(ipaddr_1 == ipaddr_2)
doAssert($ipaddr_1 == $ipaddr_2)
if sockaddr.ss_family == AF_INET.toInt:
if sockaddr.ss_family.cint == 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:
elif sockaddr.ss_family.cint == AF_INET6.toInt:
var sockaddr6: Sockaddr_in6
copyMem(addr sockaddr6, addr sockaddr, sizeof(sockaddr6))
fromSockAddr(sockaddr6, socklen, ipaddr_2, port_2)