From a67083821a3009aec2b50948cdc1b3c9b178fc6e Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Mon, 13 Jan 2025 16:33:42 -0500 Subject: [PATCH 1/2] Android support --- Sources/NIOExtras/DebugInboundEventsHandler.swift | 2 ++ Sources/NIOExtras/DebugOutboundEventsHandler.swift | 2 ++ Sources/NIOExtras/WritePCAPHandler.swift | 2 ++ Sources/NIOSOCKS/Messages/SOCKSRequest.swift | 2 ++ Tests/NIOExtrasTests/SynchronizedFileSinkTests.swift | 2 ++ Tests/NIOExtrasTests/WritePCAPHandlerTest.swift | 3 +++ 6 files changed, 13 insertions(+) diff --git a/Sources/NIOExtras/DebugInboundEventsHandler.swift b/Sources/NIOExtras/DebugInboundEventsHandler.swift index 14ad1e47..1ebdb9a1 100644 --- a/Sources/NIOExtras/DebugInboundEventsHandler.swift +++ b/Sources/NIOExtras/DebugInboundEventsHandler.swift @@ -17,6 +17,8 @@ import NIOCore import Darwin #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #else import Glibc #endif diff --git a/Sources/NIOExtras/DebugOutboundEventsHandler.swift b/Sources/NIOExtras/DebugOutboundEventsHandler.swift index 13e9828f..86506f7d 100644 --- a/Sources/NIOExtras/DebugOutboundEventsHandler.swift +++ b/Sources/NIOExtras/DebugOutboundEventsHandler.swift @@ -18,6 +18,8 @@ import NIOCore import Darwin #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #else import Glibc #endif diff --git a/Sources/NIOExtras/WritePCAPHandler.swift b/Sources/NIOExtras/WritePCAPHandler.swift index cab5a649..451706ae 100644 --- a/Sources/NIOExtras/WritePCAPHandler.swift +++ b/Sources/NIOExtras/WritePCAPHandler.swift @@ -20,6 +20,8 @@ import NIOCore import Darwin #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #else import Glibc #endif diff --git a/Sources/NIOSOCKS/Messages/SOCKSRequest.swift b/Sources/NIOSOCKS/Messages/SOCKSRequest.swift index 8fc9b45c..c507e858 100644 --- a/Sources/NIOSOCKS/Messages/SOCKSRequest.swift +++ b/Sources/NIOSOCKS/Messages/SOCKSRequest.swift @@ -19,6 +19,8 @@ import NIOCore import Darwin #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #else import Glibc #endif diff --git a/Tests/NIOExtrasTests/SynchronizedFileSinkTests.swift b/Tests/NIOExtrasTests/SynchronizedFileSinkTests.swift index 5f806322..94508622 100644 --- a/Tests/NIOExtrasTests/SynchronizedFileSinkTests.swift +++ b/Tests/NIOExtrasTests/SynchronizedFileSinkTests.swift @@ -102,6 +102,8 @@ private func withTemporaryFile( private var temporaryDirectory: String { #if os(Linux) return "/tmp" + #elseif os(Android) + return "/data/local/tmp" #else if #available(macOS 10.12, iOS 10, tvOS 10, watchOS 3, *) { return FileManager.default.temporaryDirectory.path diff --git a/Tests/NIOExtrasTests/WritePCAPHandlerTest.swift b/Tests/NIOExtrasTests/WritePCAPHandlerTest.swift index 7d2173c1..1dedcf5a 100644 --- a/Tests/NIOExtrasTests/WritePCAPHandlerTest.swift +++ b/Tests/NIOExtrasTests/WritePCAPHandlerTest.swift @@ -16,6 +16,9 @@ import Foundation import NIOCore import NIOEmbedded import XCTest +#if canImport(Android) +import Android +#endif @testable import NIOExtras From 63cf347084824720c4212a83982233edfc344c26 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Tue, 14 Jan 2025 10:06:58 -0500 Subject: [PATCH 2/2] Update WritePCAPHandlerTest.swift with formatting fixes --- Tests/NIOExtrasTests/WritePCAPHandlerTest.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tests/NIOExtrasTests/WritePCAPHandlerTest.swift b/Tests/NIOExtrasTests/WritePCAPHandlerTest.swift index ab6c28a0..1489d5b3 100644 --- a/Tests/NIOExtrasTests/WritePCAPHandlerTest.swift +++ b/Tests/NIOExtrasTests/WritePCAPHandlerTest.swift @@ -16,12 +16,13 @@ import Foundation import NIOCore import NIOEmbedded import XCTest + +@testable import NIOExtras + #if canImport(Android) import Android #endif -@testable import NIOExtras - class WritePCAPHandlerTest: XCTestCase { private var accumulatedPackets: [ByteBuffer]! private var channel: EmbeddedChannel!