From b6ba9c436833e5b0f96e280ca05dc38d219b5caa Mon Sep 17 00:00:00 2001 From: Simon Whitty Date: Fri, 22 Nov 2024 09:02:41 +1100 Subject: [PATCH] SocketOption level --- FlyingSocks/Sources/Socket.swift | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/FlyingSocks/Sources/Socket.swift b/FlyingSocks/Sources/Socket.swift index 467ce598..48ee2407 100644 --- a/FlyingSocks/Sources/Socket.swift +++ b/FlyingSocks/Sources/Socket.swift @@ -147,7 +147,7 @@ public struct Socket: Sendable, Hashable { public func setValue(_ value: O.Value, for option: O) throws { var value = option.makeSocketValue(from: value) let result = withUnsafeBytes(of: &value) { - Socket.setsockopt(file.rawValue, SOL_SOCKET, option.name, $0.baseAddress!, socklen_t($0.count)) + Socket.setsockopt(file.rawValue, option.level, option.name, $0.baseAddress!, socklen_t($0.count)) } guard result >= 0 else { throw SocketError.makeFailed("SetOption") @@ -157,7 +157,7 @@ public struct Socket: Sendable, Hashable { public func getValue(for option: O) throws -> O.Value { let valuePtr = UnsafeMutablePointer.allocate(capacity: 1) var length = socklen_t(MemoryLayout.size) - guard Socket.getsockopt(file.rawValue, SOL_SOCKET, option.name, valuePtr, &length) >= 0 else { + guard Socket.getsockopt(file.rawValue, option.level, option.name, valuePtr, &length) >= 0 else { throw SocketError.makeFailed("GetOption") } return option.makeValue(from: valuePtr.pointee) @@ -522,15 +522,22 @@ public protocol SocketOption { associatedtype Value associatedtype SocketValue + var level: Int32 { get } var name: Int32 { get } func makeValue(from socketValue: SocketValue) -> Value func makeSocketValue(from value: Value) -> SocketValue } +public extension SocketOption { + var level: Int32 { SOL_SOCKET } +} + public struct BoolSocketOption: SocketOption { + public var level: Int32 public var name: Int32 - public init(name: Int32) { + public init(level: Int32 = SOL_SOCKET, name: Int32) { + self.level = level self.name = name } @@ -544,9 +551,11 @@ public struct BoolSocketOption: SocketOption { } public struct Int32SocketOption: SocketOption { + public var level: Int32 public var name: Int32 - public init(name: Int32) { + public init(level: Int32 = SOL_SOCKET, name: Int32) { + self.level = level self.name = name }