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

more Protocol supports in windows (#15274) [backport:1.2]

Browse source
This commit is contained in:
flywind 2020-09-07 18:10:20 +08:00 • committed by GitHub
commit e08b802d79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/pure/nativesockets.nim
View file

@ -68,11 +68,11 @@ type
Protocol* = enum ## third argument to `socket` proc Protocol* = enum ## third argument to `socket` proc
IPPROTO_TCP = 6, ## Transmission control protocol. IPPROTO_TCP = 6, ## Transmission control protocol.
IPPROTO_UDP = 17, ## User datagram protocol. IPPROTO_UDP = 17, ## User datagram protocol.
IPPROTO_IP, ## Internet protocol. Unsupported on Windows. IPPROTO_IP, ## Internet protocol.
IPPROTO_IPV6, ## Internet Protocol Version 6. Unsupported on Windows. IPPROTO_IPV6, ## Internet Protocol Version 6.
IPPROTO_RAW, ## Raw IP Packets Protocol. Unsupported on Windows. IPPROTO_RAW, ## Raw IP Packets Protocol. Unsupported on Windows.
IPPROTO_ICMP ## Control message protocol. Unsupported on Windows. IPPROTO_ICMP ## Control message protocol.
IPPROTO_ICMPV6 ## Control message protocol for IPv6. Unsupported on Windows. IPPROTO_ICMPV6 ## Control message protocol for IPv6.
Servent* = object ## information about a service Servent* = object ## information about a service
name*: string name*: string
@ -174,7 +174,21 @@ else:
result = cint(ord(typ)) result = cint(ord(typ))
proc toInt(p: Protocol): cint = proc toInt(p: Protocol): cint =
result = cint(ord(p)) case p
of IPPROTO_IP:
result = 0.cint
of IPPROTO_ICMP:
result = 1.cint
of IPPROTO_TCP:
result = 6.cint
of IPPROTO_UDP:
result = 17.cint
of IPPROTO_IPV6:
result = 41.cint
of IPPROTO_ICMPV6:
result = 58.cint
else:
result = cint(ord(p))
proc toSockType*(protocol: Protocol): SockType = proc toSockType*(protocol: Protocol): SockType =
result = case protocol result = case protocol

29
tests/stdlib/tnativesockets.nim Normal file
View file

@ -0,0 +1,29 @@
discard """
cmd: "nim c -r --styleCheck:hint --panics:on $options $file"
targets: "c"
nimout: ""
action: "run"
exitcode: 0
timeout: 60.0
"""
import nativesockets
when defined(windows):
doAssert toInt(IPPROTO_IP) == 0.cint
doAssert toInt(IPPROTO_ICMP) == 1.cint
doAssert toInt(IPPROTO_TCP) == 6.cint
doAssert toInt(IPPROTO_UDP) == 17.cint
doAssert toInt(IPPROTO_IPV6) == 41.cint
doAssert toInt(IPPROTO_ICMPV6) == 58.cint
doAssert toInt(IPPROTO_RAW) == 20.cint
# no changes to enum value
doAssert ord(IPPROTO_TCP) == 6
doAssert ord(IPPROTO_UDP) == 17
doAssert ord(IPPROTO_IP) == 18
doAssert ord(IPPROTO_IPV6) == 19
doAssert ord(IPPROTO_RAW) == 20
doAssert ord(IPPROTO_ICMP) == 21
doAssert ord(IPPROTO_ICMPV6) == 22