Remove our custom sockaddr* objects

Use the ones in nativesockets instead.

build.sh

@@ -27,6 +27,7 @@ toast \
   --preprocess \
   --noHeader \
   --defines=NGTCP2_STATICLIB \
+  --replace=sockaddr=SockAddr,sockaddr_storage=Sockaddr_storage \
   --includeDirs="${root}/sources/lib/includes" \
   --includeDirs="${root}/build/lib/includes" \
   "${root}/sources/lib/includes/ngtcp2/ngtcp2.h" >> "${root}/ngtcp2.nim"

ngtcp2.nim

@@ -1,9 +1,11 @@
 import os
 import strformat
-import ngtcp2/sockets
 
 # Socket definitions
-export sockets
+import nativesockets
+
+when defined(windows):
+  {.passL: "-lws2_32".}
 
 # C include directories
 const root = currentSourcePath.parentDir
@@ -12,9 +14,9 @@ const buildInclude = root/"build"/"lib"/"includes"
 
 {.passC: fmt"-I{sourceInclude} -I{buildInclude}".}
 
-# Generated @ 2020-09-10T17:06:23+02:00
+# Generated @ 2020-10-07T16:35:19+02:00
 # Command line:
-#   /home/user/.nimble/pkgs/nimterop-0.6.11/nimterop/toast --compile=./sources/lib/ngtcp2_acktr.c --compile=./sources/lib/ngtcp2_addr.c --compile=./sources/lib/ngtcp2_buf.c --compile=./sources/lib/ngtcp2_cc.c --compile=./sources/lib/ngtcp2_cid.c --compile=./sources/lib/ngtcp2_conn.c --compile=./sources/lib/ngtcp2_conv.c --compile=./sources/lib/ngtcp2_crypto.c --compile=./sources/lib/ngtcp2_err.c --compile=./sources/lib/ngtcp2_gaptr.c --compile=./sources/lib/ngtcp2_idtr.c --compile=./sources/lib/ngtcp2_ksl.c --compile=./sources/lib/ngtcp2_log.c --compile=./sources/lib/ngtcp2_map.c --compile=./sources/lib/ngtcp2_mem.c --compile=./sources/lib/ngtcp2_path.c --compile=./sources/lib/ngtcp2_pkt.c --compile=./sources/lib/ngtcp2_ppe.c --compile=./sources/lib/ngtcp2_pq.c --compile=./sources/lib/ngtcp2_pv.c --compile=./sources/lib/ngtcp2_qlog.c --compile=./sources/lib/ngtcp2_range.c --compile=./sources/lib/ngtcp2_ringbuf.c --compile=./sources/lib/ngtcp2_rob.c --compile=./sources/lib/ngtcp2_rst.c --compile=./sources/lib/ngtcp2_rtb.c --compile=./sources/lib/ngtcp2_str.c --compile=./sources/lib/ngtcp2_strm.c --compile=./sources/lib/ngtcp2_vec.c --compile=./sources/lib/ngtcp2_version.c --pnim --preprocess --noHeader --defines=NGTCP2_STATICLIB --includeDirs=./sources/lib/includes --includeDirs=./build/lib/includes ./sources/lib/includes/ngtcp2/ngtcp2.h
+#   /home/user/.nimble/pkgs/nimterop-0.6.11/nimterop/toast --compile=./sources/lib/ngtcp2_acktr.c --compile=./sources/lib/ngtcp2_addr.c --compile=./sources/lib/ngtcp2_buf.c --compile=./sources/lib/ngtcp2_cc.c --compile=./sources/lib/ngtcp2_cid.c --compile=./sources/lib/ngtcp2_conn.c --compile=./sources/lib/ngtcp2_conv.c --compile=./sources/lib/ngtcp2_crypto.c --compile=./sources/lib/ngtcp2_err.c --compile=./sources/lib/ngtcp2_gaptr.c --compile=./sources/lib/ngtcp2_idtr.c --compile=./sources/lib/ngtcp2_ksl.c --compile=./sources/lib/ngtcp2_log.c --compile=./sources/lib/ngtcp2_map.c --compile=./sources/lib/ngtcp2_mem.c --compile=./sources/lib/ngtcp2_path.c --compile=./sources/lib/ngtcp2_pkt.c --compile=./sources/lib/ngtcp2_ppe.c --compile=./sources/lib/ngtcp2_pq.c --compile=./sources/lib/ngtcp2_pv.c --compile=./sources/lib/ngtcp2_qlog.c --compile=./sources/lib/ngtcp2_range.c --compile=./sources/lib/ngtcp2_ringbuf.c --compile=./sources/lib/ngtcp2_rob.c --compile=./sources/lib/ngtcp2_rst.c --compile=./sources/lib/ngtcp2_rtb.c --compile=./sources/lib/ngtcp2_str.c --compile=./sources/lib/ngtcp2_strm.c --compile=./sources/lib/ngtcp2_vec.c --compile=./sources/lib/ngtcp2_version.c --pnim --preprocess --noHeader --defines=NGTCP2_STATICLIB --replace=sockaddr=SockAddr,sockaddr_storage=Sockaddr_storage --includeDirs=./sources/lib/includes --includeDirs=./build/lib/includes ./sources/lib/includes/ngtcp2/ngtcp2.h
 
 # const 'NGTCP2_PROTO_VER_MAX' has unsupported value 'NGTCP2_PROTO_VER'
 # const 'NGTCP2_INITIAL_SALT' has unsupported value '"\xaf\xbf\xec\x28\x99\x93\xd2\x4c\x9e\x97\x86\xf1\x9c\x61\x11\xe0\x43\x90" "\xa8\x99"'
@@ -750,7 +752,7 @@ type
     addrlen*: uint             ## ```
                  ##   addrlen is the length of addr.
                  ## ```
-    `addr`*: ptr sockaddr ## ```
+    `addr`*: ptr SockAddr ## ```
                        ##   addr points to the buffer which contains endpoint address.  It
                        ##        must not be NULL.
                        ## ```
@@ -777,8 +779,8 @@ type
                                        ##    ngtcp2_path_storage is a convenient struct to have buffers to store
                                        ##    the longest addresses.
                                        ## ```
-    local_addrbuf*: sockaddr_storage
-    remote_addrbuf*: sockaddr_storage
+    local_addrbuf*: SockAddr_storage
+    remote_addrbuf*: SockAddr_storage
     path*: ngtcp2_path
 
   ngtcp2_crypto_md* {.bycopy.} = object ## ```
@@ -2593,7 +2595,7 @@ proc ngtcp2_err_infer_quic_transport_error_code*(liberr: cint): uint64 {.importc
   ##    ngtcp2_err_infer_quic_transport_error_code returns a QUIC
   ##    transport error code which corresponds to |liberr|.
   ## ```
-proc ngtcp2_addr_init*(dest: ptr ngtcp2_addr; `addr`: ptr sockaddr; addrlen: uint;
+proc ngtcp2_addr_init*(dest: ptr ngtcp2_addr; `addr`: ptr SockAddr; addrlen: uint;
                       user_data: pointer): ptr ngtcp2_addr {.importc, cdecl.}
   ## ```
   ##   @function
@@ -2602,8 +2604,8 @@ proc ngtcp2_addr_init*(dest: ptr ngtcp2_addr; `addr`: ptr sockaddr; addrlen: uin
   ##    returns |dest|.
   ## ```
 proc ngtcp2_path_storage_init*(ps: ptr ngtcp2_path_storage;
-                              local_addr: ptr sockaddr; local_addrlen: uint;
-                              local_user_data: pointer; remote_addr: ptr sockaddr;
+                              local_addr: ptr SockAddr; local_addrlen: uint;
+                              local_user_data: pointer; remote_addr: ptr SockAddr;
                               remote_addrlen: uint; remote_user_data: pointer) {.
     importc, cdecl.}
   ## ```

ngtcp2.nimble

@@ -3,7 +3,7 @@ version = "0.1.0"
 author = "Status Research & Development GmbH"
 description = "Nim wrapper around the ngtcp2 library"
 license = "MIT"
-installDirs = @["sources", "build", "ngtcp2"]
+installDirs = @["sources", "build"]
 installFiles = @["ngtcp2.nim"]
 
 requires "nim >= 1.2.6"

ngtcp2/sockets.nim

@@ -1,96 +0,0 @@
-# Import socket definitions from system
-import nativesockets
-export Port
-
-when defined(windows):
-  {.passL: "-lws2_32".}
-  {.
-    pragma: import_in_addr,
-    importc: "struct in_addr",
-    header: "<winsock2.h>"
-  .}
-  {.
-    pragma: import_in6_addr,
-    importc: "struct in6_addr",
-    header: "<in6addr.h>"
-  .}
-  {.
-    pragma: import_sockaddr,
-    importc: "struct sockaddr",
-    header: "<ws2tcpip.h>"
-  .}
-  {.
-    pragma: import_sockaddr_in,
-    importc: "struct sockaddr_in",
-    header: "<ws2tcpip.h>"
-  .}
-  {.
-    pragma: import_sockaddr_in6,
-    importc: "struct sockaddr_in6",
-    header: "<ws2tcpip.h>"
-  .}
-  {.
-    pragma: import_sockaddr_storage,
-    importc: "struct sockaddr_storage",
-    header: "<ws2tcpip.h>"
-  .}
-else:
-  {.
-    pragma: import_in_addr,
-    importc: "struct in_addr",
-    header: "<netinet/in.h>"
-  .}
-  {.
-    pragma: import_in6_addr,
-    importc: "struct in6_addr",
-    header: "<netinet/in.h>"
-  .}
-  {.
-    pragma: import_sockaddr
-    importc: "struct sockaddr",
-    header: "<sys/socket.h>"
-  .}
-  {.
-    pragma: import_sockaddr_in,
-    importc: "struct sockaddr_in",
-    header: "<netinet/in.h>"
-  .}
-  {.
-    pragma: import_sockaddr_in6,
-    importc: "struct sockaddr_in6",
-    header: "<netinet/in.h>"
-  .}
-  {.
-    pragma: import_sockaddr_storage,
-    importc: "struct sockaddr_storage",
-    header: "<sys/socket.h>"
-  .}
-
-type
-  AddressFamily* {.size: sizeof(uint16).} = enum
-    AF_INET = nativesockets.AF_INET
-    AF_INET6 = nativesockets.AF_INET6
-  in_addr* {.import_in_addr.} = object
-    s_addr*: uint32
-  in6_addr* {.import_in6_addr.} = object
-    s6_addr*: array[16, uint8]
-  sockaddr_storage* {.import_sockaddr_storage.} = object
-  sockaddr_in* {.import_sockaddr_in.} = object
-    sin_family*: AddressFamily
-    sin_port*: Port
-    sin_addr*: in_addr
-    sin_zero*: array[8, char]
-  sockaddr_in6* {.import_sockaddr_in6.} = object
-    sin6_family*: AddressFamily
-    sin6_port*: Port
-    sin6_flowinfo*: uint32
-    sin6_addr*: in6_addr
-    sin6_scope_id*: uint32
-  sockaddr* {.import_sockaddr.} = object
-    sa_family*: AddressFamily
-    sa_data*: array[14, char]
-  SocketAddress* {.union.} = object
-    address*: sockaddr
-    ipv4*: sockaddr_in
-    ipv6*: sockaddr_in6
-    storage*: sockaddr_storage

prelude.nim

@@ -1,9 +1,11 @@
 import os
 import strformat
-import ngtcp2/sockets
 
 # Socket definitions
-export sockets
+import nativesockets
+
+when defined(windows):
+  {.passL: "-lws2_32".}
 
 # C include directories
 const root = currentSourcePath.parentDir

tests/testSockets.nim

@@ -1,22 +0,0 @@
-import unittest
-import ngtcp2
-
-test "BSD socket addresses":
-  check sizeof(in_addr) == 4
-  check sizeof(in6_addr) == 16
-  check sizeof(sockaddr) < sizeof(sockaddr_storage)
-  check sizeof(sockaddr_in) < sizeof(sockaddr_storage)
-  check sizeof(sockaddr_in6) < sizeof(sockaddr_storage)
-  check sizeof(sockaddr_in.sin_family) == 2
-  check sizeof(sockaddr_in.sin_port) == 2
-  check cast[uint16](AF_INET) == 2
-
-test "SocketAddress union":
-  var address: SocketAddress
-  check sizeof(address) == sizeof(sockaddr_storage)
-  address.address.sa_family = AF_INET
-  check address.ipv4.sin_family == AF_INET
-  check address.ipv6.sin6_family == AF_INET
-
-test "Socketaddress can be converted to string":
-  discard $SocketAddress()