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

fix #19244 - solves the problem of the InAddr object constructor in Windows. (#19259)

Browse source 
* Update winlean.nim

* Update tnet_ll.nim
This commit is contained in:
rockcavera 2021-12-17 05:01:33 -03:00 • committed by GitHub
commit 5ddaf3e1fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/windows/winlean.nim
View file

@ -478,7 +478,7 @@ type
PSockAddr = ptr SockAddr PSockAddr = ptr SockAddr
InAddr* {.importc: "IN_ADDR", header: "winsock2.h".} = object InAddr* {.importc: "IN_ADDR", header: "winsock2.h", union.} = object
s_addr*: uint32 # IP address s_addr*: uint32 # IP address
Sockaddr_in* {.importc: "SOCKADDR_IN", Sockaddr_in* {.importc: "SOCKADDR_IN",

6
tests/stdlib/tnet_ll.nim
View file

@ -26,6 +26,7 @@ suite "inet_ntop tests":
# regular # regular
var ip4 = InAddr() var ip4 = InAddr()
ip4.s_addr = 0x10111213'u32 ip4.s_addr = 0x10111213'u32
check: ip4.s_addr == 0x10111213'u32
var buff: array[0..255, char] var buff: array[0..255, char]
let r = inet_ntop(AF_INET, cast[pointer](ip4.s_addr.addr), buff[0].addr, buff.len.int32) let r = inet_ntop(AF_INET, cast[pointer](ip4.s_addr.addr), buff[0].addr, buff.len.int32)
@ -43,3 +44,8 @@ suite "inet_ntop tests":
let r = inet_ntop(AF_INET6, cast[pointer](ip6[0].addr), buff[0].addr, buff.len.int32) let r = inet_ntop(AF_INET6, cast[pointer](ip6[0].addr), buff[0].addr, buff.len.int32)
let res = if r == nil: "" else: $r let res = if r == nil: "" else: $r
check: not ipv6Support or res == "10:110:20:120:30:130:40:140" check: not ipv6Support or res == "10:110:20:120:30:130:40:140"
test "InAddr":
# issue 19244
var ip4 = InAddr(s_addr: 0x10111213'u32)
check: ip4.s_addr == 0x10111213'u32