diff --git a/docs/img/api_diagram.png b/docs/img/api_diagram.png index 98793d0..8c8118d 100644 Binary files a/docs/img/api_diagram.png and b/docs/img/api_diagram.png differ diff --git a/docs/img/api_diagram.png.old b/docs/img/api_diagram.png.old new file mode 100644 index 0000000..98793d0 Binary files /dev/null and b/docs/img/api_diagram.png.old differ diff --git a/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.pbxproj b/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.pbxproj index 3fb2713..b4d3810 100644 --- a/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.pbxproj +++ b/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.pbxproj @@ -7,9 +7,25 @@ objects = { /* Begin PBXBuildFile section */ - 7C0252A51D62945B005D5FD8 /* SDK_Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA03DE1D628E88003F9B1A /* SDK_Service.cpp */; }; - 7C6F654E1D6F6BA1004F6CDF /* SDK_Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA03DE1D628E88003F9B1A /* SDK_Service.cpp */; }; - 7C9587951D6FB4C80014AF6B /* SDK_Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA03DE1D628E88003F9B1A /* SDK_Service.cpp */; }; + 7C7D52831DBEADD200896C93 /* intercept.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D52791DBEADD200896C93 /* intercept.c */; }; + 7C7D52841DBEADD200896C93 /* proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D527A1DBEADD200896C93 /* proxy.cpp */; }; + 7C7D52851DBEADD200896C93 /* rpc.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D527B1DBEADD200896C93 /* rpc.c */; }; + 7C7D52861DBEADD200896C93 /* service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D527D1DBEADD200896C93 /* service.cpp */; }; + 7C7D52871DBEADD200896C93 /* sockets.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D527F1DBEADD200896C93 /* sockets.c */; }; + 7C7D52881DBEADD200896C93 /* tap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D52801DBEADD200896C93 /* tap.cpp */; }; + 7C7D52891DBEADE600896C93 /* debug.h in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D52771DBEADD200896C93 /* debug.h */; }; + 7C7D528A1DBEADE600896C93 /* defs.h in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D52781DBEADD200896C93 /* defs.h */; }; + 7C7D528B1DBEADE600896C93 /* intercept.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D52791DBEADD200896C93 /* intercept.c */; }; + 7C7D528C1DBEADE600896C93 /* proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D527A1DBEADD200896C93 /* proxy.cpp */; }; + 7C7D528D1DBEADE600896C93 /* rpc.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D527B1DBEADD200896C93 /* rpc.c */; }; + 7C7D528E1DBEADE600896C93 /* rpc.h in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D527C1DBEADD200896C93 /* rpc.h */; }; + 7C7D528F1DBEADE600896C93 /* service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D527D1DBEADD200896C93 /* service.cpp */; }; + 7C7D52901DBEADE600896C93 /* signatures.h in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D527E1DBEADD200896C93 /* signatures.h */; }; + 7C7D52911DBEADE600896C93 /* sockets.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D527F1DBEADD200896C93 /* sockets.c */; }; + 7C7D52921DBEADE600896C93 /* tap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D52801DBEADD200896C93 /* tap.cpp */; }; + 7C7D52931DBEADE600896C93 /* tap.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D52811DBEADD200896C93 /* tap.hpp */; }; + 7C7D52941DBEADE600896C93 /* utils.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D52821DBEADD200896C93 /* utils.hpp */; }; + 7C7D52951DBEADE600896C93 /* SDK.h in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0034F1D12178D003E68DC /* SDK.h */; }; 7C969B4D1DB99E7900BD3F7F /* def.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C969B3C1DB99E7900BD3F7F /* def.c */; }; 7C969B4E1DB99E7900BD3F7F /* dns.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C969B3D1DB99E7900BD3F7F /* dns.c */; }; 7C969B4F1DB99E7900BD3F7F /* inet_chksum.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C969B3E1DB99E7900BD3F7F /* inet_chksum.c */; }; @@ -71,34 +87,13 @@ 7C969BD11DB99F9E00BD3F7F /* timeouts.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C969B4B1DB99E7900BD3F7F /* timeouts.c */; }; 7C969BD21DB99F9E00BD3F7F /* udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C969B4C1DB99E7900BD3F7F /* udp.c */; }; 7C969C7C1DBAA61700BD3F7F /* tcpip.c in Sources */ = {isa = PBXBuildFile; fileRef = 7C969C7B1DBAA61700BD3F7F /* tcpip.c */; }; - 7CAA03DF1D628E88003F9B1A /* SDK_Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA03DE1D628E88003F9B1A /* SDK_Service.cpp */; }; 7CC003261D1216E3003E68DC /* ZeroTierSDK_iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CC003251D1216E3003E68DC /* ZeroTierSDK_iOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 7CC003511D12178D003E68DC /* SDK_EthernetTap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */; }; - 7CC003521D12178D003E68DC /* SDK_Intercept.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003461D12178D003E68DC /* SDK_Intercept.c */; }; - 7CC003531D12178D003E68DC /* SDK_Proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003481D12178D003E68DC /* SDK_Proxy.cpp */; }; - 7CC003541D12178D003E68DC /* SDK_RPC.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003491D12178D003E68DC /* SDK_RPC.c */; }; - 7CC003561D12178D003E68DC /* SDK_Sockets.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0034E1D12178D003E68DC /* SDK_Sockets.c */; }; 7CC003591D1217A1003E68DC /* http_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003571D1217A1003E68DC /* http_parser.c */; }; 7CC0035C1D1217B2003E68DC /* lz4.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0035A1D1217B2003E68DC /* lz4.c */; }; - 7CC0043D1D1316BF003E68DC /* SDK_EthernetTap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */; }; - 7CC0043E1D1316BF003E68DC /* SDK_Intercept.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003461D12178D003E68DC /* SDK_Intercept.c */; }; - 7CC0043F1D1316BF003E68DC /* SDK_Proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003481D12178D003E68DC /* SDK_Proxy.cpp */; }; - 7CC004401D1316BF003E68DC /* SDK_RPC.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003491D12178D003E68DC /* SDK_RPC.c */; }; - 7CC004421D1316BF003E68DC /* SDK_Sockets.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0034E1D12178D003E68DC /* SDK_Sockets.c */; }; 7CC004851D1318DA003E68DC /* lz4.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0035A1D1217B2003E68DC /* lz4.c */; }; 7CC004861D1318DA003E68DC /* http_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003571D1217A1003E68DC /* http_parser.c */; }; - 7CC004881D131E21003E68DC /* SDK_EthernetTap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */; }; - 7CC004891D131E21003E68DC /* SDK_Intercept.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003461D12178D003E68DC /* SDK_Intercept.c */; }; - 7CC0048A1D131E21003E68DC /* SDK_Proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003481D12178D003E68DC /* SDK_Proxy.cpp */; }; - 7CC0048B1D131E21003E68DC /* SDK_RPC.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003491D12178D003E68DC /* SDK_RPC.c */; }; - 7CC0048D1D131E21003E68DC /* SDK_Sockets.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0034E1D12178D003E68DC /* SDK_Sockets.c */; }; 7CC004D01D131E37003E68DC /* lz4.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0035A1D1217B2003E68DC /* lz4.c */; }; 7CC004D11D131E37003E68DC /* http_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003571D1217A1003E68DC /* http_parser.c */; }; - 7CC004D81D13247A003E68DC /* SDK_EthernetTap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */; }; - 7CC004D91D13247A003E68DC /* SDK_Intercept.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003461D12178D003E68DC /* SDK_Intercept.c */; }; - 7CC004DA1D13247A003E68DC /* SDK_Proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003481D12178D003E68DC /* SDK_Proxy.cpp */; }; - 7CC004DB1D13247A003E68DC /* SDK_RPC.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003491D12178D003E68DC /* SDK_RPC.c */; }; - 7CC004DD1D13247A003E68DC /* SDK_Sockets.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0034E1D12178D003E68DC /* SDK_Sockets.c */; }; 7CC005201D1324B3003E68DC /* lz4.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0035A1D1217B2003E68DC /* lz4.c */; }; 7CC005211D1324B3003E68DC /* http_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003571D1217A1003E68DC /* http_parser.c */; }; 7CEAF4F61DBAC80C006585E7 /* ControlPlane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF4F11DBAC80C006585E7 /* ControlPlane.cpp */; }; @@ -167,11 +162,20 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 7C969B301DB99DA700BD3F7F /* SDK_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDK_defs.h; path = ../../../src/SDK_defs.h; sourceTree = ""; }; - 7C969B311DB99DA700BD3F7F /* SDK_jip.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SDK_jip.hpp; path = ../../../src/SDK_jip.hpp; sourceTree = ""; }; - 7C969B321DB99DA700BD3F7F /* SDK_lwIP.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SDK_lwIP.hpp; path = ../../../src/SDK_lwIP.hpp; sourceTree = ""; }; - 7C969B331DB99DA700BD3F7F /* SDK_picoTCP.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SDK_picoTCP.hpp; path = ../../../src/SDK_picoTCP.hpp; sourceTree = ""; }; - 7C969B341DB99DA700BD3F7F /* SDK_Utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SDK_Utils.hpp; path = ../../../src/SDK_Utils.hpp; sourceTree = ""; }; + 7C7D52771DBEADD200896C93 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debug.h; path = ../../../src/debug.h; sourceTree = ""; }; + 7C7D52781DBEADD200896C93 /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = defs.h; path = ../../../src/defs.h; sourceTree = ""; }; + 7C7D52791DBEADD200896C93 /* intercept.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = intercept.c; path = ../../../src/intercept.c; sourceTree = ""; }; + 7C7D527A1DBEADD200896C93 /* proxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = proxy.cpp; path = ../../../src/proxy.cpp; sourceTree = ""; }; + 7C7D527B1DBEADD200896C93 /* rpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rpc.c; path = ../../../src/rpc.c; sourceTree = ""; }; + 7C7D527C1DBEADD200896C93 /* rpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rpc.h; path = ../../../src/rpc.h; sourceTree = ""; }; + 7C7D527D1DBEADD200896C93 /* service.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = service.cpp; path = ../../../src/service.cpp; sourceTree = ""; }; + 7C7D527E1DBEADD200896C93 /* signatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = signatures.h; path = ../../../src/signatures.h; sourceTree = ""; }; + 7C7D527F1DBEADD200896C93 /* sockets.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sockets.c; path = ../../../src/sockets.c; sourceTree = ""; }; + 7C7D52801DBEADD200896C93 /* tap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tap.cpp; path = ../../../src/tap.cpp; sourceTree = ""; }; + 7C7D52811DBEADD200896C93 /* tap.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = tap.hpp; path = ../../../src/tap.hpp; sourceTree = ""; }; + 7C7D52821DBEADD200896C93 /* utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = utils.hpp; path = ../../../src/utils.hpp; sourceTree = ""; }; + 7C7D52961DBEADFF00896C93 /* lwip.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = lwip.hpp; path = ../../../src/stack_drivers/lwip.hpp; sourceTree = ""; }; + 7C7D52971DBEAE2500896C93 /* jip.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = jip.hpp; path = ../../../src/stack_drivers/jip.hpp; sourceTree = ""; }; 7C969B3C1DB99E7900BD3F7F /* def.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = def.c; path = ../../../ext/lwip/src/core/def.c; sourceTree = ""; }; 7C969B3D1DB99E7900BD3F7F /* dns.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dns.c; path = ../../../ext/lwip/src/core/dns.c; sourceTree = ""; }; 7C969B3E1DB99E7900BD3F7F /* inet_chksum.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = inet_chksum.c; path = ../../../ext/lwip/src/core/inet_chksum.c; sourceTree = ""; }; @@ -259,7 +263,6 @@ 7C969C791DBAA5FF00BD3F7F /* ip4_frag.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ip4_frag.c; path = ../../../ext/lwip/src/core/ipv4/ip4_frag.c; sourceTree = ""; }; 7C969C7A1DBAA5FF00BD3F7F /* ip4.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ip4.c; path = ../../../ext/lwip/src/core/ipv4/ip4.c; sourceTree = ""; }; 7C969C7B1DBAA61700BD3F7F /* tcpip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tcpip.c; path = ../../../ext/lwip/src/api/tcpip.c; sourceTree = ""; }; - 7CAA03DE1D628E88003F9B1A /* SDK_Service.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SDK_Service.cpp; path = ../../../src/SDK_Service.cpp; sourceTree = ""; }; 7CC003181D1216B0003E68DC /* ZeroTierSDK_Unity3D_iOS.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ZeroTierSDK_Unity3D_iOS.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 7CC0031A1D1216B0003E68DC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7CC003231D1216E3003E68DC /* ZeroTierSDK_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ZeroTierSDK_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -270,15 +273,6 @@ 7CC003341D1216F8003E68DC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7CC0033C1D121741003E68DC /* ZeroTierSDK_Unity3D_OSX.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ZeroTierSDK_Unity3D_OSX.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 7CC0033E1D121742003E68DC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 7CC003431D12178D003E68DC /* SDK_Debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDK_Debug.h; path = ../../../src/SDK_Debug.h; sourceTree = ""; }; - 7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SDK_EthernetTap.cpp; path = ../../../src/SDK_EthernetTap.cpp; sourceTree = ""; }; - 7CC003451D12178D003E68DC /* SDK_EthernetTap.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SDK_EthernetTap.hpp; path = ../../../src/SDK_EthernetTap.hpp; sourceTree = ""; }; - 7CC003461D12178D003E68DC /* SDK_Intercept.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDK_Intercept.c; path = ../../../src/SDK_Intercept.c; sourceTree = ""; }; - 7CC003481D12178D003E68DC /* SDK_Proxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SDK_Proxy.cpp; path = ../../../src/SDK_Proxy.cpp; sourceTree = ""; }; - 7CC003491D12178D003E68DC /* SDK_RPC.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDK_RPC.c; path = ../../../src/SDK_RPC.c; sourceTree = ""; }; - 7CC0034A1D12178D003E68DC /* SDK_RPC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDK_RPC.h; path = ../../../src/SDK_RPC.h; sourceTree = ""; }; - 7CC0034D1D12178D003E68DC /* SDK_Signatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDK_Signatures.h; path = ../../../src/SDK_Signatures.h; sourceTree = ""; }; - 7CC0034E1D12178D003E68DC /* SDK_Sockets.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDK_Sockets.c; path = ../../../src/SDK_Sockets.c; sourceTree = ""; }; 7CC0034F1D12178D003E68DC /* SDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDK.h; path = ../../../src/SDK.h; sourceTree = ""; }; 7CC003571D1217A1003E68DC /* http_parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = http_parser.c; path = "../../../zerotierone/ext/http-parser/http_parser.c"; sourceTree = ""; }; 7CC003581D1217A1003E68DC /* http_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = http_parser.h; path = "../../../zerotierone/ext/http-parser/http_parser.h"; sourceTree = ""; }; @@ -637,21 +631,20 @@ 7CC003131D12167D003E68DC /* SDK */ = { isa = PBXGroup; children = ( - 7C969B301DB99DA700BD3F7F /* SDK_defs.h */, - 7C969B311DB99DA700BD3F7F /* SDK_jip.hpp */, - 7C969B321DB99DA700BD3F7F /* SDK_lwIP.hpp */, - 7C969B331DB99DA700BD3F7F /* SDK_picoTCP.hpp */, - 7C969B341DB99DA700BD3F7F /* SDK_Utils.hpp */, - 7CAA03DE1D628E88003F9B1A /* SDK_Service.cpp */, - 7CC003431D12178D003E68DC /* SDK_Debug.h */, - 7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */, - 7CC003451D12178D003E68DC /* SDK_EthernetTap.hpp */, - 7CC003461D12178D003E68DC /* SDK_Intercept.c */, - 7CC003481D12178D003E68DC /* SDK_Proxy.cpp */, - 7CC003491D12178D003E68DC /* SDK_RPC.c */, - 7CC0034A1D12178D003E68DC /* SDK_RPC.h */, - 7CC0034D1D12178D003E68DC /* SDK_Signatures.h */, - 7CC0034E1D12178D003E68DC /* SDK_Sockets.c */, + 7C7D52971DBEAE2500896C93 /* jip.hpp */, + 7C7D52961DBEADFF00896C93 /* lwip.hpp */, + 7C7D52771DBEADD200896C93 /* debug.h */, + 7C7D52781DBEADD200896C93 /* defs.h */, + 7C7D52791DBEADD200896C93 /* intercept.c */, + 7C7D527A1DBEADD200896C93 /* proxy.cpp */, + 7C7D527B1DBEADD200896C93 /* rpc.c */, + 7C7D527C1DBEADD200896C93 /* rpc.h */, + 7C7D527D1DBEADD200896C93 /* service.cpp */, + 7C7D527E1DBEADD200896C93 /* signatures.h */, + 7C7D527F1DBEADD200896C93 /* sockets.c */, + 7C7D52801DBEADD200896C93 /* tap.cpp */, + 7C7D52811DBEADD200896C93 /* tap.hpp */, + 7C7D52821DBEADD200896C93 /* utils.hpp */, 7CC0034F1D12178D003E68DC /* SDK.h */, ); name = SDK; @@ -874,15 +867,17 @@ 7CEAF58B1DBAD0BF006585E7 /* DeferredPackets.cpp in Sources */, 7CEAF55C1DBAC872006585E7 /* Salsa20.cpp in Sources */, 7CEAF5071DBAC841006585E7 /* Arp.cpp in Sources */, + 7C7D52861DBEADD200896C93 /* service.cpp in Sources */, 7CEAF5551DBAC872006585E7 /* NetworkConfig.cpp in Sources */, 7C969B561DB99E7900BD3F7F /* raw.c in Sources */, 7CEAF5541DBAC872006585E7 /* Network.cpp in Sources */, - 7CC003531D12178D003E68DC /* SDK_Proxy.cpp in Sources */, 7CEAF5571DBAC872006585E7 /* OutboundMulticast.cpp in Sources */, + 7C7D52831DBEADD200896C93 /* intercept.c in Sources */, 7C969B581DB99E7900BD3F7F /* sys.c in Sources */, 7CEAF54B1DBAC872006585E7 /* C25519.cpp in Sources */, 7C969B4D1DB99E7900BD3F7F /* def.c in Sources */, 7C969B5B1DB99E7900BD3F7F /* tcp.c in Sources */, + 7C7D52881DBEADD200896C93 /* tap.cpp in Sources */, 7CEAF5841DBACB3E006585E7 /* OneService.cpp in Sources */, 7CEAF5091DBAC841006585E7 /* Http.cpp in Sources */, 7C969B6B1DB99E8E00BD3F7F /* ip4_addr.c in Sources */, @@ -890,7 +885,6 @@ 7C969B5C1DB99E7900BD3F7F /* timeouts.c in Sources */, 7CEAF50A1DBAC841006585E7 /* OSUtils.cpp in Sources */, 7C969B511DB99E7900BD3F7F /* ip.c in Sources */, - 7CAA03DF1D628E88003F9B1A /* SDK_Service.cpp in Sources */, 7C969B551DB99E7900BD3F7F /* pbuf.c in Sources */, 7C969B7E1DB99E9A00BD3F7F /* mld6.c in Sources */, 7C969B661DB99E8E00BD3F7F /* autoip.c in Sources */, @@ -903,18 +897,19 @@ 7C969B671DB99E8E00BD3F7F /* dhcp.c in Sources */, 7CEAF54F1DBAC872006585E7 /* Dictionary.cpp in Sources */, 7C969B771DB99E9A00BD3F7F /* dhcp6.c in Sources */, + 7C7D52851DBEADD200896C93 /* rpc.c in Sources */, + 7C7D52871DBEADD200896C93 /* sockets.c in Sources */, 7CEAF5561DBAC872006585E7 /* Node.cpp in Sources */, + 7C7D52841DBEADD200896C93 /* proxy.cpp in Sources */, 7CC003591D1217A1003E68DC /* http_parser.c in Sources */, 7C969B6A1DB99E8E00BD3F7F /* igmp.c in Sources */, 7C969B5D1DB99E7900BD3F7F /* udp.c in Sources */, - 7CC003561D12178D003E68DC /* SDK_Sockets.c in Sources */, 7C969B7D1DB99E9A00BD3F7F /* ip6.c in Sources */, 7C969B4E1DB99E7900BD3F7F /* dns.c in Sources */, 7CEAF55E1DBAC872006585E7 /* SHA512.cpp in Sources */, 7CEAF5511DBAC872006585E7 /* IncomingPacket.cpp in Sources */, 7C969B501DB99E7900BD3F7F /* init.c in Sources */, 7C969B7A1DB99E9A00BD3F7F /* inet6.c in Sources */, - 7CC003511D12178D003E68DC /* SDK_EthernetTap.cpp in Sources */, 7C969B591DB99E7900BD3F7F /* tcp_in.c in Sources */, 7C969B7C1DB99E9A00BD3F7F /* ip6_frag.c in Sources */, 7CEAF5611DBAC872006585E7 /* Utils.cpp in Sources */, @@ -933,8 +928,6 @@ 7C969B6C1DB99E8E00BD3F7F /* ip4_frag.c in Sources */, 7CC0035C1D1217B2003E68DC /* lz4.c in Sources */, 7CEAF55F1DBAC872006585E7 /* Switch.cpp in Sources */, - 7CC003541D12178D003E68DC /* SDK_RPC.c in Sources */, - 7CC003521D12178D003E68DC /* SDK_Intercept.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -942,14 +935,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7C0252A51D62945B005D5FD8 /* SDK_Service.cpp in Sources */, 7CC004851D1318DA003E68DC /* lz4.c in Sources */, 7CC004861D1318DA003E68DC /* http_parser.c in Sources */, - 7CC0043D1D1316BF003E68DC /* SDK_EthernetTap.cpp in Sources */, - 7CC0043E1D1316BF003E68DC /* SDK_Intercept.c in Sources */, - 7CC0043F1D1316BF003E68DC /* SDK_Proxy.cpp in Sources */, - 7CC004401D1316BF003E68DC /* SDK_RPC.c in Sources */, - 7CC004421D1316BF003E68DC /* SDK_Sockets.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -957,6 +944,19 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 7C7D52891DBEADE600896C93 /* debug.h in Sources */, + 7C7D528A1DBEADE600896C93 /* defs.h in Sources */, + 7C7D528B1DBEADE600896C93 /* intercept.c in Sources */, + 7C7D528C1DBEADE600896C93 /* proxy.cpp in Sources */, + 7C7D528D1DBEADE600896C93 /* rpc.c in Sources */, + 7C7D528E1DBEADE600896C93 /* rpc.h in Sources */, + 7C7D528F1DBEADE600896C93 /* service.cpp in Sources */, + 7C7D52901DBEADE600896C93 /* signatures.h in Sources */, + 7C7D52911DBEADE600896C93 /* sockets.c in Sources */, + 7C7D52921DBEADE600896C93 /* tap.cpp in Sources */, + 7C7D52931DBEADE600896C93 /* tap.hpp in Sources */, + 7C7D52941DBEADE600896C93 /* utils.hpp in Sources */, + 7C7D52951DBEADE600896C93 /* SDK.h in Sources */, 7C969BCE1DB99F9E00BD3F7F /* tcp_in.c in Sources */, 7C969BCF1DB99F9E00BD3F7F /* tcp_out.c in Sources */, 7C969BD01DB99F9E00BD3F7F /* tcp.c in Sources */, @@ -1016,14 +1016,8 @@ 7C969BCD1DB99F9E00BD3F7F /* sys.c in Sources */, 7C969BD11DB99F9E00BD3F7F /* timeouts.c in Sources */, 7C969BD21DB99F9E00BD3F7F /* udp.c in Sources */, - 7C6F654E1D6F6BA1004F6CDF /* SDK_Service.cpp in Sources */, 7CC004D01D131E37003E68DC /* lz4.c in Sources */, 7CC004D11D131E37003E68DC /* http_parser.c in Sources */, - 7CC004881D131E21003E68DC /* SDK_EthernetTap.cpp in Sources */, - 7CC004891D131E21003E68DC /* SDK_Intercept.c in Sources */, - 7CC0048A1D131E21003E68DC /* SDK_Proxy.cpp in Sources */, - 7CC0048B1D131E21003E68DC /* SDK_RPC.c in Sources */, - 7CC0048D1D131E21003E68DC /* SDK_Sockets.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1031,14 +1025,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7C9587951D6FB4C80014AF6B /* SDK_Service.cpp in Sources */, 7CC005201D1324B3003E68DC /* lz4.c in Sources */, 7CC005211D1324B3003E68DC /* http_parser.c in Sources */, - 7CC004D81D13247A003E68DC /* SDK_EthernetTap.cpp in Sources */, - 7CC004D91D13247A003E68DC /* SDK_Intercept.c in Sources */, - 7CC004DA1D13247A003E68DC /* SDK_Proxy.cpp in Sources */, - 7CC004DB1D13247A003E68DC /* SDK_RPC.c in Sources */, - 7CC004DD1D13247A003E68DC /* SDK_Sockets.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.pbxproj b/integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.pbxproj index 4d06790..ec5d8f0 100644 --- a/integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.pbxproj +++ b/integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.pbxproj @@ -7,11 +7,12 @@ objects = { /* Begin PBXBuildFile section */ - 7C0C03D51D832599009C0827 /* ZTSDK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C0C03D41D832599009C0827 /* ZTSDK.swift */; }; - 7C74DACF1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C74DACD1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.cpp */; }; 7C74DAD21D3C47D300A6C0B9 /* ZeroTierSDK_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */; }; 7C74DAD31D3C485800A6C0B9 /* ZeroTierSDK_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */; }; 7C74DAD41D3C485800A6C0B9 /* ZeroTierSDK_OSX.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 7C7D529B1DBEAED300896C93 /* XcodeWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D52981DBEAED300896C93 /* XcodeWrapper.cpp */; }; + 7C7D529C1DBEAED300896C93 /* ztsdk.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D529A1DBEAED300896C93 /* ztsdk.swift */; }; + 7C7D529E1DBEAF0000896C93 /* Apple-Bridging-Header.h in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D529D1DBEAEE500896C93 /* Apple-Bridging-Header.h */; }; 7CFCB4311D1AFEE800D3E66C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CFCB4301D1AFEE800D3E66C /* AppDelegate.swift */; }; 7CFCB4331D1AFEE800D3E66C /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CFCB4321D1AFEE800D3E66C /* ViewController.swift */; }; 7CFCB4351D1AFEE800D3E66C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7CFCB4341D1AFEE800D3E66C /* Assets.xcassets */; }; @@ -33,10 +34,11 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 7C0C03D41D832599009C0827 /* ZTSDK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ZTSDK.swift; path = ../../../../../src/ZTSDK.swift; sourceTree = ""; }; - 7C74DACD1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SDK_XcodeWrapper.cpp; path = ../../../../../src/SDK_XcodeWrapper.cpp; sourceTree = ""; }; - 7C74DACE1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SDK_XcodeWrapper.hpp; path = ../../../../../src/SDK_XcodeWrapper.hpp; sourceTree = ""; }; 7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZeroTierSDK_OSX.framework; path = ../../../../build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework; sourceTree = ""; }; + 7C7D52981DBEAED300896C93 /* XcodeWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XcodeWrapper.cpp; path = ../../../../../src/wrappers/swift/XcodeWrapper.cpp; sourceTree = ""; }; + 7C7D52991DBEAED300896C93 /* XcodeWrapper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = XcodeWrapper.hpp; path = ../../../../../src/wrappers/swift/XcodeWrapper.hpp; sourceTree = ""; }; + 7C7D529A1DBEAED300896C93 /* ztsdk.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ztsdk.swift; path = ../../../../../src/wrappers/swift/ztsdk.swift; sourceTree = ""; }; + 7C7D529D1DBEAEE500896C93 /* Apple-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Apple-Bridging-Header.h"; path = "../../../../../src/wrappers/swift/Apple-Bridging-Header.h"; sourceTree = ""; }; 7CFCB42D1D1AFEE800D3E66C /* Example_OSX_App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example_OSX_App.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7CFCB4301D1AFEE800D3E66C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7CFCB4321D1AFEE800D3E66C /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -78,9 +80,10 @@ 7CFCB42F1D1AFEE800D3E66C /* Example_OSX_App */ = { isa = PBXGroup; children = ( - 7C0C03D41D832599009C0827 /* ZTSDK.swift */, - 7C74DACD1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.cpp */, - 7C74DACE1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.hpp */, + 7C7D529D1DBEAEE500896C93 /* Apple-Bridging-Header.h */, + 7C7D52981DBEAED300896C93 /* XcodeWrapper.cpp */, + 7C7D52991DBEAED300896C93 /* XcodeWrapper.hpp */, + 7C7D529A1DBEAED300896C93 /* ztsdk.swift */, 7CFCB4301D1AFEE800D3E66C /* AppDelegate.swift */, 7CFCB4321D1AFEE800D3E66C /* ViewController.swift */, 7CFCB4341D1AFEE800D3E66C /* Assets.xcassets */, @@ -161,9 +164,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 7C7D529E1DBEAF0000896C93 /* Apple-Bridging-Header.h in Sources */, + 7C7D529B1DBEAED300896C93 /* XcodeWrapper.cpp in Sources */, 7CFCB4331D1AFEE800D3E66C /* ViewController.swift in Sources */, - 7C74DACF1D3C46EB00A6C0B9 /* SDK_XcodeWrapper.cpp in Sources */, - 7C0C03D51D832599009C0827 /* ZTSDK.swift in Sources */, + 7C7D529C1DBEAED300896C93 /* ztsdk.swift in Sources */, 7CFCB4311D1AFEE800D3E66C /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -273,13 +277,16 @@ CLANG_ENABLE_MODULES = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../../../../build/OSX_app_framework/Release"; - HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../../src"; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../../../src", + "$(SRCROOT)/../../../../src/wrappers/swift", + ); INFOPLIST_FILE = Example_OSX_App/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "zerotier.Example-OSX-App"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/../../../../src/SDK_Apple-Bridging-Header.h"; - "SWIFT_OBJC_BRIDGING_HEADER[arch=*]" = "$(PROJECT_DIR)/../../../../src/SDK_Apple-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/../../../../src/wrappers/swift/Apple-Bridging-Header.h"; + "SWIFT_OBJC_BRIDGING_HEADER[arch=*]" = "$(PROJECT_DIR)/../../../../src/wrappers/swift/Apple-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; @@ -291,12 +298,15 @@ CLANG_ENABLE_MODULES = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../../../../build/OSX_app_framework/Release"; - HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../../src"; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../../../src", + "$(SRCROOT)/../../../../src/wrappers/swift", + ); INFOPLIST_FILE = Example_OSX_App/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "zerotier.Example-OSX-App"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/../../../../src/SDK_Apple-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/../../../../src/wrappers/swift/Apple-Bridging-Header.h"; }; name = Release; }; diff --git a/src/wrappers/README.md b/src/wrappers/README.md index 2909c56..09f7b7e 100644 --- a/src/wrappers/README.md +++ b/src/wrappers/README.md @@ -1,3 +1,3 @@ Language/Framework Wrappers ==== -These wrappers are designed to abstract the ZeroTierSDK Sockets API (implemented in `src/Sockets.c`) to your native language of choice. Specific examples of how to use these are located in the `integrations` directory.. +These wrappers are designed to abstract the ZeroTierSDK Sockets API (implemented in `src/sockets.c`) to your native language of choice. Specific examples of how to use these are located in the `integrations` directory.. diff --git a/src/wrappers/swift/Apple-Bridging-Header.h b/src/wrappers/swift/Apple-Bridging-Header.h index 34c4552..f5686d7 100644 --- a/src/wrappers/swift/Apple-Bridging-Header.h +++ b/src/wrappers/swift/Apple-Bridging-Header.h @@ -6,7 +6,7 @@ #define Example_OSX_Bridging_Header_h #include -#include "SDK_Signatures.h" +#include "signatures.h" // ZT INTERCEPT/RPC CONTROLS int zt_init_rpc(const char *path, const char *nwid); diff --git a/src/wrappers/swift/XcodeWrapper.cpp b/src/wrappers/swift/XcodeWrapper.cpp index e0fc807..4196985 100755 --- a/src/wrappers/swift/XcodeWrapper.cpp +++ b/src/wrappers/swift/XcodeWrapper.cpp @@ -25,9 +25,9 @@ * LLC. Start here: http://www.zerotier.com/ */ -#include "SDK.h" -#include "SDK_XcodeWrapper.hpp" -#include "SDK_Signatures.h" +#include "sdk.h" +#include "XcodeWrapper.hpp" +#include "signatures.h" #define INTERCEPT_ENABLED 111 #define INTERCEPT_DISABLED 222