diff options
| -rw-r--r-- | Makefile.mac | 16 | ||||
| -rw-r--r-- | ext/bin/tap-mac/tap.kext/Contents/Info.plist | 36 | ||||
| -rwxr-xr-x | ext/bin/tap-mac/tap.kext/Contents/MacOS/tap | bin | 0 -> 81288 bytes | |||
| -rw-r--r-- | tap-mac/README.txt (renamed from mac-tap/README.txt) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/Changelog (renamed from mac-tap/tuntap/Changelog) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/INSTALL (renamed from mac-tap/tuntap/INSTALL) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/Makefile (renamed from mac-tap/tuntap/Makefile) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/README (renamed from mac-tap/tuntap/README) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/README.installer (renamed from mac-tap/tuntap/README.installer) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/README.zerotier-build | 18 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/res/License.rtfd/TXT.rtf (renamed from mac-tap/tuntap/pkg/res/License.rtfd/TXT.rtf) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/res/Welcome.rtfd/TXT.rtf (renamed from mac-tap/tuntap/pkg/res/Welcome.rtfd/TXT.rtf) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/res/Welcome.rtfd/paypal_button.gif (renamed from mac-tap/tuntap/pkg/res/Welcome.rtfd/paypal_button.gif) | bin | 2128 -> 2128 bytes | |||
| -rwxr-xr-x | tap-mac/tuntap/pkg/scripts/startup_item_tap/postflight (renamed from mac-tap/tuntap/pkg/scripts/startup_item_tap/postflight) | 0 | ||||
| -rwxr-xr-x | tap-mac/tuntap/pkg/scripts/startup_item_tun/postflight (renamed from mac-tap/tuntap/pkg/scripts/startup_item_tun/postflight) | 0 | ||||
| -rwxr-xr-x | tap-mac/tuntap/pkg/scripts/tap/postflight (renamed from mac-tap/tuntap/pkg/scripts/tap/postflight) | 0 | ||||
| -rwxr-xr-x | tap-mac/tuntap/pkg/scripts/tun/postflight (renamed from mac-tap/tuntap/pkg/scripts/tun/postflight) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/tuntap.pmdoc/01tun-contents.xml (renamed from mac-tap/tuntap/pkg/tuntap.pmdoc/01tun-contents.xml) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/tuntap.pmdoc/01tun.xml (renamed from mac-tap/tuntap/pkg/tuntap.pmdoc/01tun.xml) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/tuntap.pmdoc/02tap-contents.xml (renamed from mac-tap/tuntap/pkg/tuntap.pmdoc/02tap-contents.xml) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/tuntap.pmdoc/02tap.xml (renamed from mac-tap/tuntap/pkg/tuntap.pmdoc/02tap.xml) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/tuntap.pmdoc/03tap-contents.xml (renamed from mac-tap/tuntap/pkg/tuntap.pmdoc/03tap-contents.xml) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/tuntap.pmdoc/03tap.xml (renamed from mac-tap/tuntap/pkg/tuntap.pmdoc/03tap.xml) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/tuntap.pmdoc/04tun-contents.xml (renamed from mac-tap/tuntap/pkg/tuntap.pmdoc/04tun-contents.xml) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/tuntap.pmdoc/04tun.xml (renamed from mac-tap/tuntap/pkg/tuntap.pmdoc/04tun.xml) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/pkg/tuntap.pmdoc/index.xml (renamed from mac-tap/tuntap/pkg/tuntap.pmdoc/index.xml) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/lock.cc (renamed from mac-tap/tuntap/src/lock.cc) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/lock.h (renamed from mac-tap/tuntap/src/lock.h) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/mem.cc (renamed from mac-tap/tuntap/src/mem.cc) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/mem.h (renamed from mac-tap/tuntap/src/mem.h) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tap/Info.plist (renamed from mac-tap/tuntap/src/tap/Info.plist) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tap/Makefile (renamed from mac-tap/tuntap/src/tap/Makefile) | 6 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tap/kmod.cc (renamed from mac-tap/tuntap/src/tap/kmod.cc) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tap/tap.cc (renamed from mac-tap/tuntap/src/tap/tap.cc) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tap/tap.h (renamed from mac-tap/tuntap/src/tap/tap.h) | 3 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tun/Info.plist (renamed from mac-tap/tuntap/src/tun/Info.plist) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tun/Makefile (renamed from mac-tap/tuntap/src/tun/Makefile) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tun/kmod.cc (renamed from mac-tap/tuntap/src/tun/kmod.cc) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tun/tun.cc (renamed from mac-tap/tuntap/src/tun/tun.cc) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tun/tun.h (renamed from mac-tap/tuntap/src/tun/tun.h) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tun/tun_inet6_proto.c (renamed from mac-tap/tuntap/src/tun/tun_inet6_proto.c) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tun/tun_inet_proto.c (renamed from mac-tap/tuntap/src/tun/tun_inet_proto.c) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tun/tun_ioctls.h (renamed from mac-tap/tuntap/src/tun/tun_ioctls.h) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tuntap.cc (renamed from mac-tap/tuntap/src/tuntap.cc) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tuntap.h (renamed from mac-tap/tuntap/src/tuntap.h) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/tuntap_mgr.cc (renamed from mac-tap/tuntap/src/tuntap_mgr.cc) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/src/util.h (renamed from mac-tap/tuntap/src/util.h) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/startup_item/tap/Resources/English.lproj/Localizable.strings (renamed from mac-tap/tuntap/startup_item/tap/Resources/English.lproj/Localizable.strings) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/startup_item/tap/StartupParameters.plist (renamed from mac-tap/tuntap/startup_item/tap/StartupParameters.plist) | 0 | ||||
| -rwxr-xr-x | tap-mac/tuntap/startup_item/tap/tap (renamed from mac-tap/tuntap/startup_item/tap/tap) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/startup_item/tun/Resources/English.lproj/Localizable.strings (renamed from mac-tap/tuntap/startup_item/tun/Resources/English.lproj/Localizable.strings) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/startup_item/tun/StartupParameters.plist (renamed from mac-tap/tuntap/startup_item/tun/StartupParameters.plist) | 0 | ||||
| -rwxr-xr-x | tap-mac/tuntap/startup_item/tun/tun (renamed from mac-tap/tuntap/startup_item/tun/tun) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/__init__.py (renamed from mac-tap/tuntap/test/tuntap/__init__.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/char_dev_harness.py (renamed from mac-tap/tuntap/test/tuntap/char_dev_harness.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/interface_harness.py (renamed from mac-tap/tuntap/test/tuntap/interface_harness.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/ioctl.py (renamed from mac-tap/tuntap/test/tuntap/ioctl.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/packet.py (renamed from mac-tap/tuntap/test/tuntap/packet.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/packet_codec.py (renamed from mac-tap/tuntap/test/tuntap/packet_codec.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/packet_reader.py (renamed from mac-tap/tuntap/test/tuntap/packet_reader.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/route.py (renamed from mac-tap/tuntap/test/tuntap/route.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/sockaddr.py (renamed from mac-tap/tuntap/test/tuntap/sockaddr.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/test_char_dev.py (renamed from mac-tap/tuntap/test/tuntap/test_char_dev.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/test_interface.py (renamed from mac-tap/tuntap/test/tuntap/test_interface.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/test_ip.py (renamed from mac-tap/tuntap/test/tuntap/test_ip.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/tun_tap_harness.py (renamed from mac-tap/tuntap/test/tuntap/tun_tap_harness.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/tun_tap_test_case.py (renamed from mac-tap/tuntap/test/tuntap/tun_tap_test_case.py) | 0 | ||||
| -rw-r--r-- | tap-mac/tuntap/test/tuntap/tuntap_tests.py (renamed from mac-tap/tuntap/test/tuntap/tuntap_tests.py) | 0 |
68 files changed, 67 insertions, 12 deletions
diff --git a/Makefile.mac b/Makefile.mac index 33535798..25bfab11 100644 --- a/Makefile.mac +++ b/Makefile.mac @@ -35,18 +35,18 @@ idtool: $(OBJS) $(CXX) $(CXXFLAGS) -o zerotier-idtool idtool.cpp $(OBJS) $(LIBS) $(STRIP) zerotier-idtool -mac-tap: FORCE - cd mac-tap/tuntap ; make tap.kext +#mac-tap: FORCE +# cd mac-tap/tuntap ; make tap.kext -install-mac-tap: FORCE - mkdir -p /Library/Application\ Support/ZeroTier/One - rm -rf /Library/Application\ Support/ZeroTier/One/tap.kext - cp -R mac-tap/tuntap/tap.kext /Library/Application\ Support/ZeroTier/One - chown -R root:wheel /Library/Application\ Support/ZeroTier/One/tap.kext +#install-mac-tap: FORCE +# mkdir -p /Library/Application\ Support/ZeroTier/One +# rm -rf /Library/Application\ Support/ZeroTier/One/tap.kext +# cp -R mac-tap/tuntap/tap.kext /Library/Application\ Support/ZeroTier/One +# chown -R root:wheel /Library/Application\ Support/ZeroTier/One/tap.kext clean: rm -rf *.dSYM rm -f $(OBJS) zerotier-* - cd mac-tap/tuntap ; make clean + cd tap-mac/tuntap ; make clean FORCE: diff --git a/ext/bin/tap-mac/tap.kext/Contents/Info.plist b/ext/bin/tap-mac/tap.kext/Contents/Info.plist new file mode 100644 index 00000000..3cc41b07 --- /dev/null +++ b/ext/bin/tap-mac/tap.kext/Contents/Info.plist @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>tap</string> + <key>CFBundleIdentifier</key> + <string>com.zerotier.tap</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>tap</string> + <key>CFBundlePackageType</key> + <string>KEXT</string> + <key>CFBundleShortVersionString</key> + <string>20111101</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleVersion</key> + <string>1.0</string> + <key>OSBundleLibraries</key> + <dict> + <key>com.apple.kpi.mach</key> + <string>8.0</string> + <key>com.apple.kpi.bsd</key> + <string>8.0</string> + <key>com.apple.kpi.libkern</key> + <string>8.0</string> + <key>com.apple.kpi.unsupported</key> + <string>8.0</string> + </dict> +</dict> +</plist> + diff --git a/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap b/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap Binary files differnew file mode 100755 index 00000000..d464702f --- /dev/null +++ b/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap diff --git a/mac-tap/README.txt b/tap-mac/README.txt index 177b936f..177b936f 100644 --- a/mac-tap/README.txt +++ b/tap-mac/README.txt diff --git a/mac-tap/tuntap/Changelog b/tap-mac/tuntap/Changelog index 4599a132..4599a132 100644 --- a/mac-tap/tuntap/Changelog +++ b/tap-mac/tuntap/Changelog diff --git a/mac-tap/tuntap/INSTALL b/tap-mac/tuntap/INSTALL index ec7107ef..ec7107ef 100644 --- a/mac-tap/tuntap/INSTALL +++ b/tap-mac/tuntap/INSTALL diff --git a/mac-tap/tuntap/Makefile b/tap-mac/tuntap/Makefile index 1bac05e1..1bac05e1 100644 --- a/mac-tap/tuntap/Makefile +++ b/tap-mac/tuntap/Makefile diff --git a/mac-tap/tuntap/README b/tap-mac/tuntap/README index 6a9e526b..6a9e526b 100644 --- a/mac-tap/tuntap/README +++ b/tap-mac/tuntap/README diff --git a/mac-tap/tuntap/README.installer b/tap-mac/tuntap/README.installer index 8728da1a..8728da1a 100644 --- a/mac-tap/tuntap/README.installer +++ b/tap-mac/tuntap/README.installer diff --git a/tap-mac/tuntap/README.zerotier-build b/tap-mac/tuntap/README.zerotier-build new file mode 100644 index 00000000..20d6d461 --- /dev/null +++ b/tap-mac/tuntap/README.zerotier-build @@ -0,0 +1,18 @@ +Building the tap for both x86_64 and i386 requires an older version of the +Xcode tools than what now ships for Mavericks (10.9). The newer version +does not support creating i386 kernel images. + +These can be obtained from: + +https://developer.apple.com/downloads + +It requires a bit of a dance to unpack the package and obtain an unpacked +tree, but once it's there you can change the line in tap/Makefile and +build for both architectures. + +This will go on until i386 is thoroughly legacy, at which point we'll +probably start just supporting x86_64. But that might be a while. We want +to support old Macs through their entire useful life. + +Since this build is irritating, a pre-built copy is packaged in ext/ and +is installed by 'make install'. So users shouldn't have to build this. diff --git a/mac-tap/tuntap/pkg/res/License.rtfd/TXT.rtf b/tap-mac/tuntap/pkg/res/License.rtfd/TXT.rtf index 79b50dc5..79b50dc5 100644 --- a/mac-tap/tuntap/pkg/res/License.rtfd/TXT.rtf +++ b/tap-mac/tuntap/pkg/res/License.rtfd/TXT.rtf diff --git a/mac-tap/tuntap/pkg/res/Welcome.rtfd/TXT.rtf b/tap-mac/tuntap/pkg/res/Welcome.rtfd/TXT.rtf index feba31fc..feba31fc 100644 --- a/mac-tap/tuntap/pkg/res/Welcome.rtfd/TXT.rtf +++ b/tap-mac/tuntap/pkg/res/Welcome.rtfd/TXT.rtf diff --git a/mac-tap/tuntap/pkg/res/Welcome.rtfd/paypal_button.gif b/tap-mac/tuntap/pkg/res/Welcome.rtfd/paypal_button.gif Binary files differindex 14c37d37..14c37d37 100644 --- a/mac-tap/tuntap/pkg/res/Welcome.rtfd/paypal_button.gif +++ b/tap-mac/tuntap/pkg/res/Welcome.rtfd/paypal_button.gif diff --git a/mac-tap/tuntap/pkg/scripts/startup_item_tap/postflight b/tap-mac/tuntap/pkg/scripts/startup_item_tap/postflight index f7d20893..f7d20893 100755 --- a/mac-tap/tuntap/pkg/scripts/startup_item_tap/postflight +++ b/tap-mac/tuntap/pkg/scripts/startup_item_tap/postflight diff --git a/mac-tap/tuntap/pkg/scripts/startup_item_tun/postflight b/tap-mac/tuntap/pkg/scripts/startup_item_tun/postflight index 63373f38..63373f38 100755 --- a/mac-tap/tuntap/pkg/scripts/startup_item_tun/postflight +++ b/tap-mac/tuntap/pkg/scripts/startup_item_tun/postflight diff --git a/mac-tap/tuntap/pkg/scripts/tap/postflight b/tap-mac/tuntap/pkg/scripts/tap/postflight index 6c8b5c9f..6c8b5c9f 100755 --- a/mac-tap/tuntap/pkg/scripts/tap/postflight +++ b/tap-mac/tuntap/pkg/scripts/tap/postflight diff --git a/mac-tap/tuntap/pkg/scripts/tun/postflight b/tap-mac/tuntap/pkg/scripts/tun/postflight index a3228eb0..a3228eb0 100755 --- a/mac-tap/tuntap/pkg/scripts/tun/postflight +++ b/tap-mac/tuntap/pkg/scripts/tun/postflight diff --git a/mac-tap/tuntap/pkg/tuntap.pmdoc/01tun-contents.xml b/tap-mac/tuntap/pkg/tuntap.pmdoc/01tun-contents.xml index bc1e5a79..bc1e5a79 100644 --- a/mac-tap/tuntap/pkg/tuntap.pmdoc/01tun-contents.xml +++ b/tap-mac/tuntap/pkg/tuntap.pmdoc/01tun-contents.xml diff --git a/mac-tap/tuntap/pkg/tuntap.pmdoc/01tun.xml b/tap-mac/tuntap/pkg/tuntap.pmdoc/01tun.xml index 11e74b88..11e74b88 100644 --- a/mac-tap/tuntap/pkg/tuntap.pmdoc/01tun.xml +++ b/tap-mac/tuntap/pkg/tuntap.pmdoc/01tun.xml diff --git a/mac-tap/tuntap/pkg/tuntap.pmdoc/02tap-contents.xml b/tap-mac/tuntap/pkg/tuntap.pmdoc/02tap-contents.xml index bc1e5a79..bc1e5a79 100644 --- a/mac-tap/tuntap/pkg/tuntap.pmdoc/02tap-contents.xml +++ b/tap-mac/tuntap/pkg/tuntap.pmdoc/02tap-contents.xml diff --git a/mac-tap/tuntap/pkg/tuntap.pmdoc/02tap.xml b/tap-mac/tuntap/pkg/tuntap.pmdoc/02tap.xml index b77fe7ce..b77fe7ce 100644 --- a/mac-tap/tuntap/pkg/tuntap.pmdoc/02tap.xml +++ b/tap-mac/tuntap/pkg/tuntap.pmdoc/02tap.xml diff --git a/mac-tap/tuntap/pkg/tuntap.pmdoc/03tap-contents.xml b/tap-mac/tuntap/pkg/tuntap.pmdoc/03tap-contents.xml index bc1e5a79..bc1e5a79 100644 --- a/mac-tap/tuntap/pkg/tuntap.pmdoc/03tap-contents.xml +++ b/tap-mac/tuntap/pkg/tuntap.pmdoc/03tap-contents.xml diff --git a/mac-tap/tuntap/pkg/tuntap.pmdoc/03tap.xml b/tap-mac/tuntap/pkg/tuntap.pmdoc/03tap.xml index 016180ef..016180ef 100644 --- a/mac-tap/tuntap/pkg/tuntap.pmdoc/03tap.xml +++ b/tap-mac/tuntap/pkg/tuntap.pmdoc/03tap.xml diff --git a/mac-tap/tuntap/pkg/tuntap.pmdoc/04tun-contents.xml b/tap-mac/tuntap/pkg/tuntap.pmdoc/04tun-contents.xml index bc1e5a79..bc1e5a79 100644 --- a/mac-tap/tuntap/pkg/tuntap.pmdoc/04tun-contents.xml +++ b/tap-mac/tuntap/pkg/tuntap.pmdoc/04tun-contents.xml diff --git a/mac-tap/tuntap/pkg/tuntap.pmdoc/04tun.xml b/tap-mac/tuntap/pkg/tuntap.pmdoc/04tun.xml index 0ea8c24e..0ea8c24e 100644 --- a/mac-tap/tuntap/pkg/tuntap.pmdoc/04tun.xml +++ b/tap-mac/tuntap/pkg/tuntap.pmdoc/04tun.xml diff --git a/mac-tap/tuntap/pkg/tuntap.pmdoc/index.xml b/tap-mac/tuntap/pkg/tuntap.pmdoc/index.xml index be0eed18..be0eed18 100644 --- a/mac-tap/tuntap/pkg/tuntap.pmdoc/index.xml +++ b/tap-mac/tuntap/pkg/tuntap.pmdoc/index.xml diff --git a/mac-tap/tuntap/src/lock.cc b/tap-mac/tuntap/src/lock.cc index 0da48be2..0da48be2 100644 --- a/mac-tap/tuntap/src/lock.cc +++ b/tap-mac/tuntap/src/lock.cc diff --git a/mac-tap/tuntap/src/lock.h b/tap-mac/tuntap/src/lock.h index 51d3299a..51d3299a 100644 --- a/mac-tap/tuntap/src/lock.h +++ b/tap-mac/tuntap/src/lock.h diff --git a/mac-tap/tuntap/src/mem.cc b/tap-mac/tuntap/src/mem.cc index cd3264fa..cd3264fa 100644 --- a/mac-tap/tuntap/src/mem.cc +++ b/tap-mac/tuntap/src/mem.cc diff --git a/mac-tap/tuntap/src/mem.h b/tap-mac/tuntap/src/mem.h index 4d06fd8c..4d06fd8c 100644 --- a/mac-tap/tuntap/src/mem.h +++ b/tap-mac/tuntap/src/mem.h diff --git a/mac-tap/tuntap/src/tap/Info.plist b/tap-mac/tuntap/src/tap/Info.plist index bb9b03fd..bb9b03fd 100644 --- a/mac-tap/tuntap/src/tap/Info.plist +++ b/tap-mac/tuntap/src/tap/Info.plist diff --git a/mac-tap/tuntap/src/tap/Makefile b/tap-mac/tuntap/src/tap/Makefile index 428555d0..a69b967e 100644 --- a/mac-tap/tuntap/src/tap/Makefile +++ b/tap-mac/tuntap/src/tap/Makefile @@ -19,7 +19,7 @@ BUNDLE_SIGNATURE = ???? BUNDLE_PACKAGETYPE = KEXT BUNDLE_VERSION = $(TAP_KEXT_VERSION) -INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers +INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \ -fno-builtin -fno-stack-protector -arch i386 -arch x86_64 \ -DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \ @@ -27,7 +27,9 @@ CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \ CCFLAGS = $(CFLAGS) LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch i386 -arch x86_64 -Xlinker -kext -CCP = $(shell if [ -f /usr/bin/llvm-g++ ]; then echo llvm-g++; else echo g++; fi) +#CCP = g++ +CCP = $(HOME)/Code/llvm-g++-Xcode4.6.2/bin/llvm-g++ + CC = gcc all: $(KMOD_BIN) bundle diff --git a/mac-tap/tuntap/src/tap/kmod.cc b/tap-mac/tuntap/src/tap/kmod.cc index f9c4a40e..f9c4a40e 100644 --- a/mac-tap/tuntap/src/tap/kmod.cc +++ b/tap-mac/tuntap/src/tap/kmod.cc diff --git a/mac-tap/tuntap/src/tap/tap.cc b/tap-mac/tuntap/src/tap/tap.cc index 149f1e71..149f1e71 100644 --- a/mac-tap/tuntap/src/tap/tap.cc +++ b/tap-mac/tuntap/src/tap/tap.cc diff --git a/mac-tap/tuntap/src/tap/tap.h b/tap-mac/tuntap/src/tap/tap.h index 95e2f13f..b3070676 100644 --- a/mac-tap/tuntap/src/tap/tap.h +++ b/tap-mac/tuntap/src/tap/tap.h @@ -34,8 +34,7 @@ #define TAP_IF_COUNT 16 /* max number of tap interfaces */ -// ZeroTier default MTU, see Constants.hpp -#define TAP_MTU 2800 +#define TAP_MTU 4000 #define TAP_LLADDR tap_lladdr diff --git a/mac-tap/tuntap/src/tun/Info.plist b/tap-mac/tuntap/src/tun/Info.plist index bb9b03fd..bb9b03fd 100644 --- a/mac-tap/tuntap/src/tun/Info.plist +++ b/tap-mac/tuntap/src/tun/Info.plist diff --git a/mac-tap/tuntap/src/tun/Makefile b/tap-mac/tuntap/src/tun/Makefile index 9ca6794d..9ca6794d 100644 --- a/mac-tap/tuntap/src/tun/Makefile +++ b/tap-mac/tuntap/src/tun/Makefile diff --git a/mac-tap/tuntap/src/tun/kmod.cc b/tap-mac/tuntap/src/tun/kmod.cc index 1c085506..1c085506 100644 --- a/mac-tap/tuntap/src/tun/kmod.cc +++ b/tap-mac/tuntap/src/tun/kmod.cc diff --git a/mac-tap/tuntap/src/tun/tun.cc b/tap-mac/tuntap/src/tun/tun.cc index 91694388..91694388 100644 --- a/mac-tap/tuntap/src/tun/tun.cc +++ b/tap-mac/tuntap/src/tun/tun.cc diff --git a/mac-tap/tuntap/src/tun/tun.h b/tap-mac/tuntap/src/tun/tun.h index 8546dc8f..8546dc8f 100644 --- a/mac-tap/tuntap/src/tun/tun.h +++ b/tap-mac/tuntap/src/tun/tun.h diff --git a/mac-tap/tuntap/src/tun/tun_inet6_proto.c b/tap-mac/tuntap/src/tun/tun_inet6_proto.c index 4461d4d9..4461d4d9 100644 --- a/mac-tap/tuntap/src/tun/tun_inet6_proto.c +++ b/tap-mac/tuntap/src/tun/tun_inet6_proto.c diff --git a/mac-tap/tuntap/src/tun/tun_inet_proto.c b/tap-mac/tuntap/src/tun/tun_inet_proto.c index 38ecd26b..38ecd26b 100644 --- a/mac-tap/tuntap/src/tun/tun_inet_proto.c +++ b/tap-mac/tuntap/src/tun/tun_inet_proto.c diff --git a/mac-tap/tuntap/src/tun/tun_ioctls.h b/tap-mac/tuntap/src/tun/tun_ioctls.h index 13501e53..13501e53 100644 --- a/mac-tap/tuntap/src/tun/tun_ioctls.h +++ b/tap-mac/tuntap/src/tun/tun_ioctls.h diff --git a/mac-tap/tuntap/src/tuntap.cc b/tap-mac/tuntap/src/tuntap.cc index 941de94c..941de94c 100644 --- a/mac-tap/tuntap/src/tuntap.cc +++ b/tap-mac/tuntap/src/tuntap.cc diff --git a/mac-tap/tuntap/src/tuntap.h b/tap-mac/tuntap/src/tuntap.h index f10d4a06..f10d4a06 100644 --- a/mac-tap/tuntap/src/tuntap.h +++ b/tap-mac/tuntap/src/tuntap.h diff --git a/mac-tap/tuntap/src/tuntap_mgr.cc b/tap-mac/tuntap/src/tuntap_mgr.cc index f41394e9..f41394e9 100644 --- a/mac-tap/tuntap/src/tuntap_mgr.cc +++ b/tap-mac/tuntap/src/tuntap_mgr.cc diff --git a/mac-tap/tuntap/src/util.h b/tap-mac/tuntap/src/util.h index 0f6955e8..0f6955e8 100644 --- a/mac-tap/tuntap/src/util.h +++ b/tap-mac/tuntap/src/util.h diff --git a/mac-tap/tuntap/startup_item/tap/Resources/English.lproj/Localizable.strings b/tap-mac/tuntap/startup_item/tap/Resources/English.lproj/Localizable.strings index 4d3b29ca..4d3b29ca 100644 --- a/mac-tap/tuntap/startup_item/tap/Resources/English.lproj/Localizable.strings +++ b/tap-mac/tuntap/startup_item/tap/Resources/English.lproj/Localizable.strings diff --git a/mac-tap/tuntap/startup_item/tap/StartupParameters.plist b/tap-mac/tuntap/startup_item/tap/StartupParameters.plist index fe9cf001..fe9cf001 100644 --- a/mac-tap/tuntap/startup_item/tap/StartupParameters.plist +++ b/tap-mac/tuntap/startup_item/tap/StartupParameters.plist diff --git a/mac-tap/tuntap/startup_item/tap/tap b/tap-mac/tuntap/startup_item/tap/tap index d7600991..d7600991 100755 --- a/mac-tap/tuntap/startup_item/tap/tap +++ b/tap-mac/tuntap/startup_item/tap/tap diff --git a/mac-tap/tuntap/startup_item/tun/Resources/English.lproj/Localizable.strings b/tap-mac/tuntap/startup_item/tun/Resources/English.lproj/Localizable.strings index 054790e7..054790e7 100644 --- a/mac-tap/tuntap/startup_item/tun/Resources/English.lproj/Localizable.strings +++ b/tap-mac/tuntap/startup_item/tun/Resources/English.lproj/Localizable.strings diff --git a/mac-tap/tuntap/startup_item/tun/StartupParameters.plist b/tap-mac/tuntap/startup_item/tun/StartupParameters.plist index 71a92626..71a92626 100644 --- a/mac-tap/tuntap/startup_item/tun/StartupParameters.plist +++ b/tap-mac/tuntap/startup_item/tun/StartupParameters.plist diff --git a/mac-tap/tuntap/startup_item/tun/tun b/tap-mac/tuntap/startup_item/tun/tun index 40b1b411..40b1b411 100755 --- a/mac-tap/tuntap/startup_item/tun/tun +++ b/tap-mac/tuntap/startup_item/tun/tun diff --git a/mac-tap/tuntap/test/tuntap/__init__.py b/tap-mac/tuntap/test/tuntap/__init__.py index 664bdaae..664bdaae 100644 --- a/mac-tap/tuntap/test/tuntap/__init__.py +++ b/tap-mac/tuntap/test/tuntap/__init__.py diff --git a/mac-tap/tuntap/test/tuntap/char_dev_harness.py b/tap-mac/tuntap/test/tuntap/char_dev_harness.py index 515e50bf..515e50bf 100644 --- a/mac-tap/tuntap/test/tuntap/char_dev_harness.py +++ b/tap-mac/tuntap/test/tuntap/char_dev_harness.py diff --git a/mac-tap/tuntap/test/tuntap/interface_harness.py b/tap-mac/tuntap/test/tuntap/interface_harness.py index fe4f1fc5..fe4f1fc5 100644 --- a/mac-tap/tuntap/test/tuntap/interface_harness.py +++ b/tap-mac/tuntap/test/tuntap/interface_harness.py diff --git a/mac-tap/tuntap/test/tuntap/ioctl.py b/tap-mac/tuntap/test/tuntap/ioctl.py index 641ddf24..641ddf24 100644 --- a/mac-tap/tuntap/test/tuntap/ioctl.py +++ b/tap-mac/tuntap/test/tuntap/ioctl.py diff --git a/mac-tap/tuntap/test/tuntap/packet.py b/tap-mac/tuntap/test/tuntap/packet.py index 6fbbb736..6fbbb736 100644 --- a/mac-tap/tuntap/test/tuntap/packet.py +++ b/tap-mac/tuntap/test/tuntap/packet.py diff --git a/mac-tap/tuntap/test/tuntap/packet_codec.py b/tap-mac/tuntap/test/tuntap/packet_codec.py index 09095966..09095966 100644 --- a/mac-tap/tuntap/test/tuntap/packet_codec.py +++ b/tap-mac/tuntap/test/tuntap/packet_codec.py diff --git a/mac-tap/tuntap/test/tuntap/packet_reader.py b/tap-mac/tuntap/test/tuntap/packet_reader.py index b92d3ac8..b92d3ac8 100644 --- a/mac-tap/tuntap/test/tuntap/packet_reader.py +++ b/tap-mac/tuntap/test/tuntap/packet_reader.py diff --git a/mac-tap/tuntap/test/tuntap/route.py b/tap-mac/tuntap/test/tuntap/route.py index b59707ec..b59707ec 100644 --- a/mac-tap/tuntap/test/tuntap/route.py +++ b/tap-mac/tuntap/test/tuntap/route.py diff --git a/mac-tap/tuntap/test/tuntap/sockaddr.py b/tap-mac/tuntap/test/tuntap/sockaddr.py index 59edbfc0..59edbfc0 100644 --- a/mac-tap/tuntap/test/tuntap/sockaddr.py +++ b/tap-mac/tuntap/test/tuntap/sockaddr.py diff --git a/mac-tap/tuntap/test/tuntap/test_char_dev.py b/tap-mac/tuntap/test/tuntap/test_char_dev.py index ae34bf7c..ae34bf7c 100644 --- a/mac-tap/tuntap/test/tuntap/test_char_dev.py +++ b/tap-mac/tuntap/test/tuntap/test_char_dev.py diff --git a/mac-tap/tuntap/test/tuntap/test_interface.py b/tap-mac/tuntap/test/tuntap/test_interface.py index 7cf19b20..7cf19b20 100644 --- a/mac-tap/tuntap/test/tuntap/test_interface.py +++ b/tap-mac/tuntap/test/tuntap/test_interface.py diff --git a/mac-tap/tuntap/test/tuntap/test_ip.py b/tap-mac/tuntap/test/tuntap/test_ip.py index b910785c..b910785c 100644 --- a/mac-tap/tuntap/test/tuntap/test_ip.py +++ b/tap-mac/tuntap/test/tuntap/test_ip.py diff --git a/mac-tap/tuntap/test/tuntap/tun_tap_harness.py b/tap-mac/tuntap/test/tuntap/tun_tap_harness.py index cb07638e..cb07638e 100644 --- a/mac-tap/tuntap/test/tuntap/tun_tap_harness.py +++ b/tap-mac/tuntap/test/tuntap/tun_tap_harness.py diff --git a/mac-tap/tuntap/test/tuntap/tun_tap_test_case.py b/tap-mac/tuntap/test/tuntap/tun_tap_test_case.py index 28edc467..28edc467 100644 --- a/mac-tap/tuntap/test/tuntap/tun_tap_test_case.py +++ b/tap-mac/tuntap/test/tuntap/tun_tap_test_case.py diff --git a/mac-tap/tuntap/test/tuntap/tuntap_tests.py b/tap-mac/tuntap/test/tuntap/tuntap_tests.py index fb5a431c..fb5a431c 100644 --- a/mac-tap/tuntap/test/tuntap/tuntap_tests.py +++ b/tap-mac/tuntap/test/tuntap/tuntap_tests.py |
