mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-29 01:14:41 +00:00
more Protocol supports in windows (#15274) [backport:1.2]
(cherry picked from commit e08b802d79)
This commit is contained in:
@@ -68,11 +68,11 @@ type
|
||||
Protocol* = enum ## third argument to `socket` proc
|
||||
IPPROTO_TCP = 6, ## Transmission control protocol.
|
||||
IPPROTO_UDP = 17, ## User datagram protocol.
|
||||
IPPROTO_IP, ## Internet protocol. Unsupported on Windows.
|
||||
IPPROTO_IPV6, ## Internet Protocol Version 6. Unsupported on Windows.
|
||||
IPPROTO_IP, ## Internet protocol.
|
||||
IPPROTO_IPV6, ## Internet Protocol Version 6.
|
||||
IPPROTO_RAW, ## Raw IP Packets Protocol. Unsupported on Windows.
|
||||
IPPROTO_ICMP ## Control message protocol. Unsupported on Windows.
|
||||
IPPROTO_ICMPV6 ## Control message protocol for IPv6. Unsupported on Windows.
|
||||
IPPROTO_ICMP ## Control message protocol.
|
||||
IPPROTO_ICMPV6 ## Control message protocol for IPv6.
|
||||
|
||||
Servent* = object ## information about a service
|
||||
name*: string
|
||||
@@ -174,7 +174,21 @@ else:
|
||||
result = cint(ord(typ))
|
||||
|
||||
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 =
|
||||
result = case protocol
|
||||
|
||||
29
tests/stdlib/tnativesockets.nim
Normal file
29
tests/stdlib/tnativesockets.nim
Normal 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
|
||||
Reference in New Issue
Block a user