diff --git a/MessagesBridge.xcodeproj/project.pbxproj b/MessagesBridge.xcodeproj/project.pbxproj index 996e108..24692bb 100644 --- a/MessagesBridge.xcodeproj/project.pbxproj +++ b/MessagesBridge.xcodeproj/project.pbxproj @@ -66,7 +66,7 @@ 1ACFCFD9219EB2AC00E2C237 /* DDASLLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACFCF19219EB2AC00E2C237 /* DDASLLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1ACFCFDA219EB2AC00E2C237 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACFCF1B219EB2AC00E2C237 /* GCDAsyncSocket.m */; }; 1ACFCFDC219EB2AC00E2C237 /* GCDAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACFCF1D219EB2AC00E2C237 /* GCDAsyncSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1ACFCFDF219EB31400E2C237 /* CocoaHTTPServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ACFCDE2219EB28A00E2C237 /* CocoaHTTPServer.framework */; }; + 1ACFCFDF219EB31400E2C237 /* libCocoaHTTPServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ACFCDE2219EB28A00E2C237 /* libCocoaHTTPServer.a */; }; 1AD8936E21EFD986009B599A /* MBIMUploadAttachmentOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AD8936D21EFD986009B599A /* MBIMUploadAttachmentOperation.m */; }; CD14F18E219E2DB400E7DD22 /* CryptoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CD14F18D219E2DB400E7DD22 /* CryptoTests.m */; }; CD14F1A1219FE7D600E7DD22 /* MBIMUpdatePollOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = CD14F1A0219FE7D600E7DD22 /* MBIMUpdatePollOperation.m */; }; @@ -157,7 +157,7 @@ 1AAB32AF21F82EB7004A2A72 /* MBIMLogging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBIMLogging.h; sourceTree = ""; }; 1AAB32B021F82EB7004A2A72 /* MBIMLogging.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBIMLogging.m; sourceTree = ""; }; 1AAB32B221F835BD004A2A72 /* KPServer.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPServer.pch; sourceTree = ""; }; - 1ACFCDE2219EB28A00E2C237 /* CocoaHTTPServer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CocoaHTTPServer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1ACFCDE2219EB28A00E2C237 /* libCocoaHTTPServer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCocoaHTTPServer.a; sourceTree = BUILT_PRODUCTS_DIR; }; 1ACFCDFC219EB2AB00E2C237 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = ""; }; 1ACFCDFE219EB2AB00E2C237 /* README.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.markdown; sourceTree = ""; }; 1ACFCE00219EB2AB00E2C237 /* HTTPConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPConnection.h; sourceTree = ""; }; @@ -308,7 +308,7 @@ CD2782BC29527FE500C0C030 /* IMSharedUtilities.framework in Frameworks */, 1A257CCB23A8681200A4A2C8 /* Security.framework in Frameworks */, CD2783002952876700C0C030 /* ImageIO.framework in Frameworks */, - 1ACFCFDF219EB31400E2C237 /* CocoaHTTPServer.framework in Frameworks */, + 1ACFCFDF219EB31400E2C237 /* libCocoaHTTPServer.a in Frameworks */, CD2782FE2952875F00C0C030 /* CoreGraphics.framework in Frameworks */, 1A257CC923A867EF00A4A2C8 /* IMCore.framework in Frameworks */, ); @@ -337,7 +337,7 @@ CDF62332219A895D00690038 /* kordophoned */, CD83E161219BE91500F4CCEA /* libagentHook.dylib */, CD14F18B219E2DB400E7DD22 /* Tests.xctest */, - 1ACFCDE2219EB28A00E2C237 /* CocoaHTTPServer.framework */, + 1ACFCDE2219EB28A00E2C237 /* libCocoaHTTPServer.a */, ); name = Products; sourceTree = ""; @@ -680,8 +680,6 @@ buildPhases = ( 1ACFCDDD219EB28A00E2C237 /* Sources */, 1ACFCDDE219EB28A00E2C237 /* Frameworks */, - 1ACFCDDF219EB28A00E2C237 /* Headers */, - 1ACFCDE0219EB28A00E2C237 /* Resources */, ); buildRules = ( ); @@ -689,8 +687,8 @@ ); name = CocoaHTTPServer; productName = CocoaHTTPServer; - productReference = 1ACFCDE2219EB28A00E2C237 /* CocoaHTTPServer.framework */; - productType = "com.apple.product-type.framework"; + productReference = 1ACFCDE2219EB28A00E2C237 /* libCocoaHTTPServer.a */; + productType = "com.apple.product-type.library.static"; }; CD14F18A219E2DB400E7DD22 /* Tests */ = { isa = PBXNativeTarget; @@ -1057,27 +1055,10 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/Frameworks", - ); MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.github.CocoaHTTPServer; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; @@ -1085,26 +1066,9 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.github.CocoaHTTPServer; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; diff --git a/kordophone/Bridge/MBIMBridge.m b/kordophone/Bridge/MBIMBridge.m index f1cbe26..95315f5 100644 --- a/kordophone/Bridge/MBIMBridge.m +++ b/kordophone/Bridge/MBIMBridge.m @@ -14,7 +14,7 @@ #import "MBIMUpdateQueue.h" #import "hooking.h" -#import +#import "HTTPServer.h" #import "IMCore_ClassDump.h" #import "IMFoundation_ClassDump.h" diff --git a/kordophone/Bridge/MBIMConcurrentHTTPServer.h b/kordophone/Bridge/MBIMConcurrentHTTPServer.h index e19cc43..dc41b4d 100644 --- a/kordophone/Bridge/MBIMConcurrentHTTPServer.h +++ b/kordophone/Bridge/MBIMConcurrentHTTPServer.h @@ -6,7 +6,7 @@ // Copyright © 2018 James Magahern. All rights reserved. // -#import +#import "HTTPServer.h" NS_ASSUME_NONNULL_BEGIN diff --git a/kordophone/Bridge/MBIMHTTPConnection.h b/kordophone/Bridge/MBIMHTTPConnection.h index de4f094..703f3c7 100644 --- a/kordophone/Bridge/MBIMHTTPConnection.h +++ b/kordophone/Bridge/MBIMHTTPConnection.h @@ -6,7 +6,7 @@ // Copyright © 2018 James Magahern. All rights reserved. // -#import +#import "HTTPConnection.h" @interface MBIMHTTPConnection : HTTPConnection diff --git a/kordophone/Bridge/MBIMHTTPConnection.m b/kordophone/Bridge/MBIMHTTPConnection.m index c7fc2d0..5507df8 100644 --- a/kordophone/Bridge/MBIMHTTPConnection.m +++ b/kordophone/Bridge/MBIMHTTPConnection.m @@ -16,7 +16,7 @@ #import "MBIMURLUtilities.h" #import -#import +#import "HTTPMessage.h" @interface HTTPConnection (/* INTERNAL */) - (BOOL)isAuthenticated; diff --git a/kordophone/Bridge/MBIMPingPongWebSocket.h b/kordophone/Bridge/MBIMPingPongWebSocket.h index 66a3734..54f3989 100644 --- a/kordophone/Bridge/MBIMPingPongWebSocket.h +++ b/kordophone/Bridge/MBIMPingPongWebSocket.h @@ -6,7 +6,7 @@ // Copyright © 2025 James Magahern. All rights reserved. // -#import +#import "WebSocket.h" NS_ASSUME_NONNULL_BEGIN diff --git a/kordophone/Bridge/MBIMUpdateQueue.m b/kordophone/Bridge/MBIMUpdateQueue.m index 3dafdf9..e9b62eb 100644 --- a/kordophone/Bridge/MBIMUpdateQueue.m +++ b/kordophone/Bridge/MBIMUpdateQueue.m @@ -13,9 +13,9 @@ #import "MBIMURLUtilities.h" #import "MBIMPingPongWebSocket.h" -#import -#import -#import +#import "GCDAsyncSocket.h" +#import "HTTPMessage.h" +#import "WebSocket.h" static const NSUInteger kUpdateItemsCullingLength = 100; diff --git a/kordophone/Bridge/Operations/MBIMBridgeOperation.h b/kordophone/Bridge/Operations/MBIMBridgeOperation.h index 2bea21b..595d090 100644 --- a/kordophone/Bridge/Operations/MBIMBridgeOperation.h +++ b/kordophone/Bridge/Operations/MBIMBridgeOperation.h @@ -7,9 +7,9 @@ // #import -#import -#import -#import +#import "HTTPMessage.h" +#import "HTTPResponse.h" +#import "HTTPErrorResponse.h" #import "MBIMJSONDataResponse.h" diff --git a/kordophone/Bridge/Operations/Utilities/MBIMDataResponse.h b/kordophone/Bridge/Operations/Utilities/MBIMDataResponse.h index b47d77d..cf7ded9 100644 --- a/kordophone/Bridge/Operations/Utilities/MBIMDataResponse.h +++ b/kordophone/Bridge/Operations/Utilities/MBIMDataResponse.h @@ -7,7 +7,7 @@ // #import -#import +#import "HTTPDataResponse.h" NS_ASSUME_NONNULL_BEGIN