Commit graph

  • f2db82940b Nginx patch. Verified to work in fc23 and ub14 Joseph Henry 2015-12-08 05:09:12 -08:00
  • a2837ccaa7 Fixed typo Joseph Henry 2015-12-07 08:36:13 -08:00
  • 284b37ccc0 Updated compatibility section Joseph Henry 2015-12-07 08:35:26 -08:00
  • 48d9708abe Combined make-linux.mk and make-intercept.mk's installer section Joseph Henry 2015-12-07 06:54:13 -08:00
  • b141026fc7 Replaced darkhttpd with httpd since darkhttpd is not currently supported and does not work Joseph Henry 2015-12-07 06:41:20 -08:00
  • c9bd0b3bf1 More concise unit test section Joseph Henry 2015-12-07 06:30:54 -08:00
  • 21b158cc48 Added unit test info to README.md Joseph Henry 2015-12-07 06:21:40 -08:00
  • dab13f59e5 Test updates Joseph Henry 2015-12-07 05:37:14 -08:00
  • 036bbfaff9 Modified test scripts to match new naming conventions root 2015-12-07 03:21:46 -08:00
  • afafde2571 Modified Nginx test scripts Joseph Henry 2015-12-06 22:37:23 -08:00
  • 1dec034f77 Added application-specific test arguments to test script Joseph Henry 2015-12-06 17:55:48 -08:00
  • 0df33485ca Merge remote-tracking branch 'origin/netcon' into edge Adam Ierymenko 2015-12-04 15:41:56 -08:00
  • 7ea53dd21b (WIP) Additional test script changes Joseph Henry 2015-12-04 15:39:35 -08:00
  • 3869d6257b Always Salsa20 encrypt the result of the system CSPRNG as a mitigation against various low-entropy bugs such as the recent Raspberry Pi one. Adam Ierymenko 2015-12-04 14:50:24 -08:00
  • 4e12899a8e docs Adam Ierymenko 2015-12-04 14:17:33 -08:00
  • cebced259e docs Adam Ierymenko 2015-12-04 13:48:53 -08:00
  • 425d311ce8 Merge of netcon with edge and unification of make processes. Adam Ierymenko 2015-12-04 13:19:31 -08:00
  • ac8918992b Merge dev. Adam Ierymenko 2015-12-04 12:45:21 -08:00
  • cbf8d9c45b . Adam Ierymenko 2015-12-04 12:43:48 -08:00
  • 905253b4f5 First draft (unfinished) of new README for netcon (original in README.orig.md). Adam Ierymenko 2015-12-04 12:43:21 -08:00
  • d9b12be697 ZT_NC_NWID patch + (WIP) test script modifications Joseph Henry 2015-12-04 12:39:54 -08:00
  • 2196d982c3 (fixed) nwid detection in test script Joseph Henry 2015-12-03 18:50:20 -08:00
  • 5c5943a00c (fixed) test script liblwip.so placement, also streamlined test logic Joseph Henry 2015-12-03 07:11:33 -08:00
  • a4cfe4cd16 Fix Linux init script to properly specify runlevels. Adam Ierymenko 2015-12-01 10:19:10 -08:00
  • ceaef19fb7 Fix for GitHub issue #260 -- fix for (non-exploitable) crash in network preferred relay code Adam Ierymenko 2015-11-30 17:20:12 -08:00
  • 944fdfb65e Low-impact sanity check against GitHub issue #247 -- will likely prevent other weird recursions too. Adam Ierymenko 2015-11-30 16:44:32 -08:00
  • be44b15eac Fix for GitHub issue #252 Adam Ierymenko 2015-11-30 16:15:23 -08:00
  • d73edfea56 GitHub issue #257 Adam Ierymenko 2015-11-30 16:12:03 -08:00
  • c21882da9c Put selftest back and turn off tracing in PortMapper. Adam Ierymenko 2015-11-30 16:07:02 -08:00
  • f260250580 Simplify IP assignment logic in OSXEthernetTap, also fix for GitHub issue #249 Adam Ierymenko 2015-11-30 15:39:34 -08:00
  • 201109a7a0 (fixed) make-linux.mk conflicts, updated clean logic Joseph Henry 2015-11-23 16:02:39 -08:00
  • 7e28161638 Merge dev Adam Ierymenko 2015-11-30 15:17:31 -08:00
  • 40a4ba6e39 indentation Adam Ierymenko 2015-11-30 15:15:43 -08:00
  • d862d2868c ... and here. Adam Ierymenko 2015-11-30 14:57:28 -08:00
  • 1e213b4d4c Need to close on premature abort too or resources are leaked. Adam Ierymenko 2015-11-30 14:56:36 -08:00
  • 3d66492828 Also add a timeout for the actual NAT-PMP port mapping step. Adam Ierymenko 2015-11-30 14:17:58 -08:00
  • 838fdf4d11 ifdef naming fix. Adam Ierymenko 2015-11-30 13:32:30 -08:00
  • 685c5e9ad1 Fix for uPnP Adam Ierymenko 2015-11-30 13:25:34 -08:00
  • 66a29a00ee Merge miniupnpc/libnatpmp build into main build by just adding flags, defs, and objs. Adam Ierymenko 2015-11-30 13:17:43 -08:00
  • 6768521330 Ton of uPnP work and adding NAT-PMP support, still testing... Adam Ierymenko 2015-11-30 13:10:22 -08:00
  • 6c0de526e8 Merge pull request #261 from janjaapbos/synology Adam Ierymenko 2015-11-30 11:07:20 -08:00
  • 4c812e3796 Merge pull request #259 from janjaapbos/jb-dev Adam Ierymenko 2015-11-30 10:53:22 -08:00
  • e6808c69f8 Increase maximum number of paths per IP scope to 4 Janjaap Bos 2015-11-30 19:48:38 +01:00
  • 75637f68b3 Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev Adam Ierymenko 2015-11-24 14:11:31 -08:00
  • 56cb2f43fa Merge pull request #254 from bonki/fix_iproute2_ip_handling Adam Ierymenko 2015-11-24 14:11:14 -08:00
  • 038476c412 Fix for GitHub issue #253. Adrian Frühwirth 2015-11-24 22:56:02 +01:00
  • ef4472e185 Intercept now checks ZT_NC_NWID environment variable for 16-digit network ID and does not initialize if not present. Adam Ierymenko 2015-11-23 13:59:38 -08:00
  • 4acb3d81f3 Rename Common to common.inc.c to indicate that this is an included C file not a primary build C file. Adam Ierymenko 2015-11-23 13:25:46 -08:00
  • bee44ae731 Merge Sendfd into Common.c Adam Ierymenko 2015-11-23 13:24:28 -08:00
  • 95106e2e30 Mare make-self-contained code cleanup. Adam Ierymenko 2015-11-23 13:18:46 -08:00
  • 2a6ea38718 More code cleanup, just moving some stuff into NetconEthernetTap that is not used elsewhere. Adam Ierymenko 2015-11-23 13:02:50 -08:00
  • d8d4cfbf01 Eliminate a few warnings and some small code reorg. Adam Ierymenko 2015-11-23 12:43:42 -08:00
  • 34404eb300 Ignore more DLL patterns. Adam Ierymenko 2015-11-23 12:34:46 -08:00
  • 7a84805824 Uncommit binary... :P Adam Ierymenko 2015-11-23 12:34:23 -08:00
  • 1d4563ac31 A few very tiny bits of dead code removal, etc. Adam Ierymenko 2015-11-23 12:32:20 -08:00
  • a18336fa18 MERGE current "dev" into "netcon" -- should not affect netcon itself but will retest -- brings ZeroTier core up to 1.1.0 Adam Ierymenko 2015-11-23 10:46:52 -08:00
  • 1e4a40e772 Reformat table. Adam Ierymenko 2015-11-23 10:11:46 -08:00
  • 6e5feaba3a Updated test files Joseph Henry 2015-11-23 07:08:07 -08:00
  • 71b38a48ac Replaced README Joseph Henry 2015-11-23 06:22:09 -08:00
  • 6a3f230555 Unit test info added to README Joseph Henry 2015-11-23 06:20:01 -08:00
  • a952ff2c61 Removed odd file Joseph Henry 2015-11-23 06:11:19 -08:00
  • 05e51f40b4 README formatting update. Removed odd files Joseph Henry 2015-11-23 06:07:48 -08:00
  • b83aefcf8f Updated README, fixed node.js test bug Joseph Henry 2015-11-23 05:59:05 -08:00
  • 8b9b593256 Removed old READMEs and OS files Joseph Henry 2015-11-23 05:21:20 -08:00
  • 275a76ff5c Test update Joseph Henry 2015-11-23 05:15:19 -08:00
  • 3d163f7044 Patch for Node.js -- accept() bug Joseph Henry 2015-11-23 01:14:17 -08:00
  • 764dd1c3d9 ARP packets do need the source IP address in them, as well as the MAC address. Grant Limberg 2015-11-21 19:14:59 -08:00
  • ac09c3569a ARP packet lengths are 28 bytes. This condition required the packet to be 29 or more bytes. Grant Limberg 2015-11-21 19:14:06 -08:00
  • ce5b7f0305 The World as of 2015-11-20 Adam Ierymenko 2015-11-20 12:49:23 -08:00
  • 1fde17bacb Update World to reflect Alice and Bob in their final glory. Will hot-push this soon. Adam Ierymenko 2015-11-20 11:46:10 -08:00
  • d472c59b8d Additional test files Joseph Henry 2015-11-20 02:41:27 -08:00
  • 126fc46dc4 Updated makefile, removed old results directory Joseph Henry 2015-11-20 01:22:15 -08:00
  • d2e624f301 Updated makefile, removed old results directory Joseph Henry 2015-11-20 01:19:16 -08:00
  • 7173b0124b Removed old test directory Joseph Henry 2015-11-20 01:13:04 -08:00
  • 1f27022fa7 Test/Code Refactor in preparation for merge Joseph Henry 2015-11-20 01:08:38 -08:00
  • 9a25a627bb WIP: Unit tests -- more generalization Joseph Henry 2015-11-19 17:34:56 -08:00
  • 375aae44e4 . Adam Ierymenko 2015-11-19 16:36:15 -08:00
  • 31bc5e1559 WIP: Unit tests Joseph Henry 2015-11-19 16:21:59 -08:00
  • b1100b3d13 WIP: Automated tests Joseph Henry 2015-11-19 16:14:27 -08:00
  • 399b2e9e26 forgot to submit this. Add DeferredPackets.cpp to the android makefile Grant Limberg 2015-11-17 19:16:10 -08:00
  • 6f16f44438 VERSION 1.1.0: Win/Mac UI improvements, improved NAT-t, CIRCUIT_TEST, and more! 1.1.0 Adam Ierymenko 2015-11-17 11:19:58 -08:00
  • 1c0c3e62dc Just add a launch prerequisite for .NET 4.5 -- it's usually there, and if not it can be easily installed. This is mostly an issue on old Windows Server systems, and in that case the admin will likely want to decide how to proceed. Adam Ierymenko 2015-11-17 11:13:44 -08:00
  • 9169b6c999 Fix crash on exit in Windows (does not affect other OSes) and revert debugging tweak in Windows version that prevented service from starting after real install. Adam Ierymenko 2015-11-17 09:56:19 -08:00
  • a660ec490e Started work on automated unit test scripts Joseph Henry 2015-11-17 02:28:23 -08:00
  • f5c2600ca4 Added symbol checks in intercept. This seems wise after all Joseph Henry 2015-11-16 23:57:19 -08:00
  • 48745eca57 Fix ARM dpkg build. Adam Ierymenko 2015-11-16 19:54:58 -08:00
  • b0f6dc43b4 Revised fd RX logic Joseph Henry 2015-11-16 19:53:59 -08:00
  • 456bfea58d Real World -- edge now talks to real net. Adam Ierymenko 2015-11-16 19:27:36 -08:00
  • 0f5fb48a0b Turns out it wasn't hard to add miniupnpc to the VS2012 project and just have it build with the rest of the code. Adam Ierymenko 2015-11-16 19:04:04 -08:00
  • dc8edea0c6 Linux make rules to make libminiupnpc from source. Adam Ierymenko 2015-11-16 18:33:52 -08:00
  • cf6164e847 Build libminiupnpc from source now, and update version. Adam Ierymenko 2015-11-16 18:28:55 -08:00
  • a13a21377c Delete pre-build miniupnpc for Linux and Mac -- will add Make rules to build from source and include source in ext/ Adam Ierymenko 2015-11-16 18:18:08 -08:00
  • 37acd375d6 Fix 64-bit int warning. Adam Ierymenko 2015-11-16 18:10:40 -08:00
  • f2289544b7 Check for fork/clone and re-initialize in close() -- for nginx Joseph Henry 2015-11-16 17:44:11 -08:00
  • 7a53ecac86 UI stuff. Adam Ierymenko 2015-11-16 17:18:44 -08:00
  • 906e49ff72 Add make option ZT_ENABLE_CLUSTER and disable it in default Linux build. Adam Ierymenko 2015-11-16 16:22:41 -08:00
  • e4d1aba3f8 Use new OSX tap version, and update OSX install scripts. Adam Ierymenko 2015-11-16 16:19:24 -08:00
  • 38fe77ecf2 WebUIWrapper is dead. Adam Ierymenko 2015-11-16 15:44:07 -08:00
  • 8fde33d87c . Adam Ierymenko 2015-11-16 14:45:17 -08:00
  • 220552af62 GitHub issue #241 -- and also some appearance updates. Eventually this might get replaced by a native Mac app. Adam Ierymenko 2015-11-16 14:30:25 -08:00