Commit graph

  • 1387e15c1b Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev Adam Ierymenko 2017-08-16 14:14:56 -07:00
  • 50e7ea088b More work on controller for new Central harnessed mode, remove old http mode. Adam Ierymenko 2017-08-16 14:14:49 -07:00
  • 59b7cbb591 Rename SocketTap to VirtualTap to prevent confusion on role Joseph Henry 2017-08-15 16:22:28 -07:00
  • 23fe8975e7 . Adam Ierymenko 2017-08-14 11:44:07 -07:00
  • a4bc40542b GCC/G++ build fixes, GitHub issue #563 Adam Ierymenko 2017-08-14 11:43:39 -07:00
  • 7a62206fd1 Merge 18925e9a88 into ee1dc16e8f janjaapbos 2017-08-10 10:06:29 +00:00
  • ee1dc16e8f Added getRoutes() for libzt Joseph Henry 2017-08-10 00:59:15 -07:00
  • 1c04cc0485 . Adam Ierymenko 2017-08-09 17:42:35 -07:00
  • 2c682b4d1c Small controller revisions, first run of controller API model JavaScript. Adam Ierymenko 2017-08-09 14:37:19 -07:00
  • 6842490c1f Add menu option to open ZeroTier Central in the system default browser Grant Limberg 2017-08-09 14:19:37 -07:00
  • ff5e22031a Small fix: should expire packets to prevent repeated WHOISes. Adam Ierymenko 2017-08-08 13:24:37 -07:00
  • e3cf756785 Make rxQueue lock-free using an atomic counter ring buffer. Adam Ierymenko 2017-08-08 13:21:10 -07:00
  • 7e6598e9ca Possible deadlock fix. Adam Ierymenko 2017-08-07 14:13:08 -07:00
  • 48d2017629 Add ppc64le arch Dezhi “Andy” Fang 2017-08-06 02:06:00 -07:00
  • 7df309b5b0 Merge 6e07add4e6 into 782b2b1514 Dezhi “Andy” Fang 2017-08-06 09:02:48 +00:00
  • 6e07add4e6 Add ppc64le arch Dezhi “Andy” Fang 2017-08-06 02:02:41 -07:00
  • e4823381c6 . Adam Ierymenko 2017-07-19 15:16:15 -07:00
  • 66feaeb519 . Adam Ierymenko 2017-07-19 15:06:23 -07:00
  • 8c6b833fb3 Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev Adam Ierymenko 2017-07-19 14:13:23 -07:00
  • b62296a40b Bug fixes in new harness mode. Adam Ierymenko 2017-07-19 14:13:17 -07:00
  • fc7728212f Fix ifndef on Windows Grant Limberg 2017-07-18 15:59:11 -07:00
  • 31785f7f6e Automatic periodic status dump from controller. Adam Ierymenko 2017-07-18 15:36:33 -07:00
  • ae65eb5105 Cleanup and replace trace field names with sane ones because usability > a few bytes. Adam Ierymenko 2017-07-18 14:28:38 -07:00
  • 727ccb1125 Cleanup and stdin/stdout harness mode for controller. Adam Ierymenko 2017-07-18 13:57:37 -07:00
  • 18925e9a88 Merge remote-tracking branch 'upstream/dev' into dev Janjaap Bos 2017-07-18 14:30:47 +00:00
  • 77ce238457 Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev Adam Ierymenko 2017-07-17 17:02:57 -07:00
  • 1685659e37 Remote tracing works. Adam Ierymenko 2017-07-17 17:02:50 -07:00
  • 0f03d4ef51 Update Jenkinsfile for new NDK in Jenkins Grant Limberg 2017-07-17 16:55:00 -07:00
  • bcf697cc2b Wire up PortMapper in Android Grant Limberg 2017-07-17 16:15:13 -07:00
  • 5e2ea4a81a Cleanup. Adam Ierymenko 2017-07-17 14:24:57 -07:00
  • b9e1d53d7a Minor cleanup. Adam Ierymenko 2017-07-17 14:21:09 -07:00
  • ab0806a036 Cleanup. Adam Ierymenko 2017-07-17 13:48:39 -07:00
  • 3a1ec07db0 Remove some exception copypasta. Adam Ierymenko 2017-07-17 10:43:28 -07:00
  • 9d37d77e9c Merge remote-tracking branch 'upstream/dev' into dev Janjaap Bos 2017-07-15 19:58:13 +00:00
  • d939d8d21d A bit more remote tracing stuff. Adam Ierymenko 2017-07-14 14:57:40 -07:00
  • d9552fb120 Add remoteTraceTarget to network and member configs in controller. Adam Ierymenko 2017-07-14 14:33:36 -07:00
  • 4ecc0c59ca Plumbing through of remote trace into controller code. Adam Ierymenko 2017-07-14 13:03:16 -07:00
  • cc4b41e6f5 compiler warnings on ubuntu Janjaap Bos 2017-07-14 17:16:40 +00:00
  • fa5a550363 Merge pull request #1 from zerotier/dev janjaapbos 2017-07-14 09:01:41 +02:00
  • 0655a1fcbe Move old cluster code into attic. Adam Ierymenko 2017-07-13 16:42:43 -07:00
  • c8d0cf2c40 Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev Adam Ierymenko 2017-07-13 16:31:30 -07:00
  • c692f2e740 Fix for new identity generation bug. Adam Ierymenko 2017-07-13 16:31:16 -07:00
  • a83c7c0d07 remove debugging flag Alex 2017-07-13 15:13:12 -07:00
  • ba6fd16823 More tracing stuff. Adam Ierymenko 2017-07-13 15:08:57 -07:00
  • 54893c35c1 Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev Adam Ierymenko 2017-07-13 10:51:19 -07:00
  • 495c5ce81d Bunch of remote tracing work. Adam Ierymenko 2017-07-13 10:51:05 -07:00
  • 4cc773ec1b fix Windows build Grant Limberg 2017-07-12 13:52:45 -07:00
  • 69ae35494e put the correct file extensions on data written to disk in JNI Grant Limberg 2017-07-12 13:36:08 -07:00
  • 512c3af4ea fix packet sending functions Grant Limberg 2017-07-12 13:12:45 -07:00
  • d8f1c3dff7 Update JNI code to reflect new ZeroTier API Grant Limberg 2017-07-12 11:34:53 -07:00
  • 3b498abc68 fix for make ZT_DEBUG=0 ZT_STATIC=0 Janjaap Bos 2017-07-12 16:03:44 +00:00
  • 0a11dd2d24 Fix NeighborDiscovery code now that ZT_SOCKADDR_NULL doesn’t exist Grant Limberg 2017-07-11 15:45:36 -07:00
  • 35354908f2 Enable shared libzerotiercore build Janjaap Bos 2017-07-11 18:09:13 +00:00
  • 78ee7f6573 Peer's role misses a PLANET role Monty A 2017-07-09 15:39:49 +01:00
  • ecc9659dc8 Merge 907f7ff0ba into 782b2b1514 Monty A 2017-07-08 20:11:38 +00:00
  • 907f7ff0ba Null ref fix Monty A 2017-07-08 21:10:41 +01:00
  • dab0fb9e05 Remote trace: plumbing, replace old TRACE with calls to Trace object. Adam Ierymenko 2017-07-07 16:58:05 -07:00
  • e14d5d49a1 Merge branch 'master' into dev Adam Ierymenko 2017-07-07 09:36:54 -07:00
  • 782b2b1514 Merge pull request #537 from laduke/patch-1 Adam Ierymenko 2017-07-07 09:32:37 -07:00
  • a9582417e2 Merge pull request #547 from surgicalcoder/patch-1 Adam Ierymenko 2017-07-07 09:32:23 -07:00
  • 69922b6c39 BSD build fix. Adam Ierymenko 2017-07-07 09:29:24 -07:00
  • 6fc70f7c16 More cleanup, Linux build fixes. Adam Ierymenko 2017-07-07 06:50:40 -07:00
  • a274e774ee Clarification on how to use JSON API with secret Monty A 2017-07-07 10:11:21 +01:00
  • f23a43fb81 More cleanup. Adam Ierymenko 2017-07-06 17:32:41 -07:00
  • 88997a0314 Windows build fixes. Adam Ierymenko 2017-07-06 16:29:11 -07:00
  • d2415dee00 Cleanup. Adam Ierymenko 2017-07-06 16:11:11 -07:00
  • 53728b79b4 . Adam Ierymenko 2017-07-06 12:35:23 -07:00
  • dff8c02cfe Pull out and deprecate old cluster code. New cluster code will not be merged yet. Adam Ierymenko 2017-07-06 12:33:00 -07:00
  • 640ad577d1 . Adam Ierymenko 2017-07-06 11:56:46 -07:00
  • cd63ecd3f3 . Adam Ierymenko 2017-07-06 11:45:48 -07:00
  • f18158a52d . Adam Ierymenko 2017-07-06 11:45:22 -07:00
  • 84748aab51 Merge branch 'dev' into edge Adam Ierymenko 2017-07-06 10:26:04 -07:00
  • 3fadc64ee0 Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev Adam Ierymenko 2017-07-06 10:25:58 -07:00
  • 47594f7c99 Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge Adam Ierymenko 2017-07-06 10:25:44 -07:00
  • 2f20258807 . Adam Ierymenko 2017-07-06 10:25:36 -07:00
  • 47122a3804 Merge branch 'dev' into edge Grant Limberg 2017-07-03 13:29:54 -07:00
  • 1730f8f5b7 also cluster.hpp Grant Limberg 2017-07-03 13:04:11 -07:00
  • d258a75cd3 remove Cluster.cpp from build list as it's been removed Grant Limberg 2017-07-03 13:03:28 -07:00
  • baa10c2995 . Adam Ierymenko 2017-06-30 17:32:07 -07:00
  • 207d6572e0 fix for changelist posting to mattermost Grant Limberg 2017-06-30 14:24:40 -07:00
  • 10264cec2f slackSend -> mattermostSend Grant Limberg 2017-06-30 13:43:39 -07:00
  • 0ea1749c59 Merge pull request #540 from skunkwerks/master Adam Ierymenko 2017-06-30 09:55:43 -07:00
  • dd83c680e5 build: all BSDs expect gmake here Dave Cottlehuber 2017-06-30 13:10:34 +00:00
  • 1a40f35fd4 Merge branch 'dev' into edge Adam Ierymenko 2017-06-27 11:32:14 -07:00
  • 8a99113c88 Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev Adam Ierymenko 2017-06-27 11:32:07 -07:00
  • ada2ea3a6b Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into edge Adam Ierymenko 2017-06-27 11:31:39 -07:00
  • 355cce3938 Rename Utils::snprintf due to it being a #define on one platform. Adam Ierymenko 2017-06-27 11:31:29 -07:00
  • 9b2e08dd09 Update README.md Travis LaDuke 2017-06-26 11:27:07 -07:00
  • 04cee3b8d3 Merge branch 'dev' of https://github.com/zerotier/ZeroTierOne into dev Joseph Henry 2017-06-26 02:13:40 -07:00
  • c61440efea Detect platformDefaultHomePath on QNAP systems Joseph Henry 2017-06-25 20:20:30 -07:00
  • 02d18af57d Remove Cluster.hpp Adam Ierymenko 2017-06-23 16:10:26 -07:00
  • 2225bb093a Merge branch 'edge' into dev Adam Ierymenko 2017-06-23 16:06:38 -07:00
  • 75a6a7baca Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev Adam Ierymenko 2017-06-23 16:05:58 -07:00
  • 971c64122e Merge 303050da0b into 6b130e8311 Yegor Timoshenko 2017-06-21 23:00:59 +00:00
  • 6b130e8311 fix for windows compilation (related to SDK implementation) Alex 2017-06-21 14:58:39 -07:00
  • 1b18923824 except wondows/lib Alex 2017-06-13 14:25:53 -07:00
  • fc2ce439e2 remove unneeded files Alex 2017-06-13 14:23:11 -07:00
  • 2cfef67522 Merge 2ec88e8008 into fe5257df81 asidorenko 2017-06-13 20:41:21 +00:00
  • 5b3d9f9184 added Windows SDK in form of dlls Alex 2017-06-13 13:28:23 -07:00
  • dd68c207f4 Stuff old Cluster code in attic. Adam Ierymenko 2017-06-08 08:51:49 -07:00