use new SocketAddress package

PADL · May 17, 2024 · ded2937 · ded2937
1 parent ea8a9d2
commit ded2937
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 612 deletions.
diff --git a/Examples/IORingUDPClient/IORingUDPClient.swift b/Examples/IORingUDPClient/IORingUDPClient.swift
@@ -18,6 +18,7 @@ import AsyncExtensions
 import Glibc
 import IORing
 import IORingUtils
+import SocketAddress
 import SystemPackage
 
 @main

diff --git a/Package.resolved b/Package.resolved
@@ -6,7 +6,16 @@
       "location" : "https://github.com/lhoward/AsyncExtensions",
       "state" : {
         "branch" : "linux",
-        "revision" : "2218eaa30dbdb39b063e92644fc28ed22e2cb942"
+        "revision" : "0d96d3550ef94f83c2f300021f9985e4fb44f7af"
+      }
+    },
+    {
+      "identity" : "socketaddress",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/padl/SocketAddress",
+      "state" : {
+        "revision" : "c771792fdc45fecd0f84388ca4182205de54612c",
+        "version" : "0.0.1"
       }
     },
     {
@@ -23,17 +32,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/dfed/swift-async-queue",
       "state" : {
-        "revision" : "a232ddbfb776a3d3e380dce30e7d5f617cffcf82",
-        "version" : "0.4.0"
+        "revision" : "90c0ac3661a4fae9f7b94f45316046805f5b2478",
+        "version" : "0.5.2"
       }
     },
     {
       "identity" : "swift-collections",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections.git",
       "state" : {
-        "revision" : "937e904258d22af6e447a0b72c0bc67583ef64a2",
-        "version" : "1.0.4"
+        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
+        "version" : "1.1.0"
       }
     },
     {
@@ -50,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-system",
       "state" : {
-        "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496",
-        "version" : "1.2.1"
+        "revision" : "f9266c85189c2751589a50ea5aec72799797e471",
+        "version" : "1.3.0"
       }
     }
   ],

diff --git a/Package.swift b/Package.swift
@@ -55,26 +55,20 @@ let package = Package(
       name: "IORingFoundation",
       targets: ["IORingFoundation"]
     ),
-    .library(
-      name: "CLinuxSockAddr",
-      targets: ["CLinuxSockAddr"]
-    ),
   ],
   dependencies: [
     .package(url: "https://github.com/apple/swift-async-algorithms", from: "1.0.0"),
     .package(url: "https://github.com/lhoward/AsyncExtensions", branch: "linux"),
     .package(url: "https://github.com/dfed/swift-async-queue", from: "0.4.0"),
     .package(url: "https://github.com/apple/swift-log", from: "1.5.4"),
     .package(url: "https://github.com/apple/swift-system", from: "1.0.0"),
+    .package(url: "https://github.com/padl/SocketAddress", from: "0.0.1"),
   ],
   targets: [
     .systemLibrary(
       name: "CIOURing",
       providers: [.apt(["liburing-dev"])]
     ),
-    .systemLibrary(
-      name: "CLinuxSockAddr"
-    ),
     .target(
       name: "CIORingShims",
       dependencies: ["CIOURing"],
@@ -120,7 +114,7 @@ let package = Package(
       name: "IORingUtils",
       dependencies: ["IORing",
                      "AsyncExtensions",
-                     "CLinuxSockAddr",
+                     "SocketAddress",
                      .product(name: "AsyncAlgorithms", package: "swift-async-algorithms")],
       swiftSettings: [
         .enableExperimentalFeature("StrictConcurrency"),

diff --git a/Sources/CLinuxSockAddr/CLinuxSockAddr.h b/Sources/CLinuxSockAddr/CLinuxSockAddr.h
diff --git a/Sources/CLinuxSockAddr/module.modulemap b/Sources/CLinuxSockAddr/module.modulemap
diff --git a/Sources/IORingFoundation/FoundationExtras.swift b/Sources/IORingFoundation/FoundationExtras.swift
@@ -17,6 +17,7 @@
 import Foundation
 import IORing
 import IORingUtils
+import SocketAddress
 import SystemPackage
 
 public extension Data {

diff --git a/Sources/IORingUtils/Extensions.swift b/Sources/IORingUtils/Extensions.swift
@@ -17,6 +17,7 @@
 import AsyncExtensions
 import Glibc
 import IORing
+import SocketAddress
 import SystemPackage
 
 private func hexDescription(_ bytes: [UInt8]) -> String {