Commit Graph

2825 Commits

Author SHA1 Message Date
Joseph Henry
7107297c25 Merge branch 'edge' of http://10.6.6.2/zerotier/zerotierone into edge 2016-01-15 11:19:25 -08:00
Joseph Henry
35fb602dff Fixed pcb->state == CLOSE_WAIT bug 2016-01-15 11:18:26 -08:00
Adam Ierymenko
8af3d35234 Merge branch 'dev' into edge 2016-01-15 11:18:23 -08:00
Joseph Henry
323d40a560 Small formatting changes 2016-01-15 10:27:27 -08:00
Joseph Henry
321bca4bf7 Adjusted formatting/conventions to conform to rest of ZT codebase 2016-01-15 10:09:31 -08:00
Joseph Henry
7cb08630d0 Fixed RX race condition 2016-01-14 18:59:08 -08:00
Joseph Henry
45f0737a00 Naming convention update 2016-01-14 14:15:50 -08:00
Joseph Henry
6cf478c1b2 RX buffer update 2016-01-14 14:03:03 -08:00
Joseph Henry
f52a82d9f2 Updated RX buffer code 2016-01-14 13:23:01 -08:00
Grant Limberg
6dac0c8c4f C doesn't support default arguments 2016-01-13 17:47:34 -08:00
Joseph Henry
5e30eabd30 Updated getsockopt/setsockopt, removed unused code 2016-01-13 15:52:15 -08:00
Joseph Henry
7bba867ce8 Fixed double-close bug 2016-01-13 13:55:11 -08:00
Adam Ierymenko
e8e6a4702b Merge branch 'dev' into edge 2016-01-13 13:15:47 -08:00
Joseph Henry
c3e2cb9b8e Modified PCB/state management logic 2016-01-13 12:19:48 -08:00
Adam Ierymenko
2e5caa335a Old SF root is dead. Now we are just on Alice and Bob. (world update for 1.1.4) 2016-01-13 10:18:41 -08:00
Joseph Henry
bdabe40c65 Updated error reporting for sock_fd_read() 2016-01-12 14:25:30 -08:00
Adam Ierymenko
7991a7c50a Merge branch 'dev' into edge 2016-01-12 14:05:40 -08:00
Adam Ierymenko
4e4fd51117 boring doc stuff 2016-01-12 14:04:55 -08:00
Joseph Henry
e91322bd10 README update and example server port change 2016-01-12 14:04:55 -08:00
Joseph Henry
23cdb3aed5 Removed ztnc network config file 2016-01-12 13:58:15 -08:00
Joseph Henry
bd3d9ee356 Removed terminology changes 2016-01-12 13:55:46 -08:00
Adam Ierymenko
76f1ab33f0 Make clean rm .depend 2016-01-12 13:44:59 -08:00
Adam Ierymenko
61fd8463f8 Merge branch 'dev' into edge 2016-01-12 13:19:53 -08:00
Adam Ierymenko
3883ac08c7 Docs and cleanup. 2016-01-12 13:17:30 -08:00
Joseph Henry
dd233fdb8d Updated terminology. No functional change 2016-01-12 13:00:31 -08:00
Joseph Henry
18aea2d3d3 Removed unused code 2016-01-12 12:56:51 -08:00
Joseph Henry
74e22368b5 Fixed sketchy memcpy logic, also added checks for service RPC ACK 2016-01-12 12:42:46 -08:00
Adam Ierymenko
d03a63e055 Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge 2016-01-12 12:25:19 -08:00
Adam Ierymenko
93ab8d46b9 Merge branch 'dev' into edge 2016-01-12 12:25:15 -08:00
Adam Ierymenko
740eb6ebc4 Simplify Peer locking to eliminate deadlock with new path recursion check code (and also probably improve performance). 2016-01-12 12:12:25 -08:00
Adam Ierymenko
d6f0f1a82a Use network user ptr in lookup for Ethernet frame handling to eliminate map lookup. 2016-01-12 11:34:22 -08:00
Adam Ierymenko
83ef98a9dc Add a network-associated user ptr in API. 2016-01-12 11:04:35 -08:00
Adam Ierymenko
3edfbfec93 Merge branch 'master' into dev 2016-01-12 09:50:19 -08:00
Adam Ierymenko
68c004ef68 Merge pull request #291 from JackyRen/patch-1
Update controller README.md
2016-01-12 09:49:54 -08:00
Joseph Henry
e2ae9165c6 RPC update 2016-01-12 09:46:49 -08:00
Adam Ierymenko
704205c5f7 Dead code removal. 2016-01-12 09:33:14 -08:00
Ren Jie
21656ba015 Update controller README.md
Sync make parameter with code.
2016-01-12 22:51:08 +08:00
Adam Ierymenko
bbcc3304a0 Check shouldUsePathForZeroTierTraffic in legacy beacon responder. 2016-01-11 15:57:58 -08:00
Adam Ierymenko
c6571073fe Get rid of constructor/destructor in libzerotierintercept, and simplify a few things. 2016-01-11 15:27:22 -08:00
Adam Ierymenko
ba9fcb31d0 Merge branch 'dev' into edge 2016-01-11 14:30:24 -08:00
Joseph Henry
78c0f0a443 RPC detection fix 2016-01-11 13:23:43 -08:00
Joseph Henry
7656e6b9f8 Transfer tune-up 2016-01-11 11:37:04 -08:00
Joseph Henry
39d79f34ab Added RPC ACK 2016-01-11 10:35:02 -08:00
Adam Ierymenko
b3e3d4cacc Instead of using binary packet comparison, add a callback to the API to explicitly check whether paths should be used. Check in with this callback (if present) when learning new paths or sending initial packets. 2016-01-11 10:17:44 -08:00
Joseph Henry
3e65ecb93d Stateless RPC rework 2016-01-11 10:12:59 -08:00
Adam Ierymenko
ba2a89c760 docs 2016-01-11 09:13:41 -08:00
Adam Ierymenko
eea634a432 Refactor to eliminate copypasta. 2016-01-11 09:11:35 -08:00
Adam Ierymenko
ab19e19f00 Fix a bug that we visually found in Windows code -- it was not advertising uPnP addresses?!? 2016-01-11 09:09:24 -08:00
Adam Ierymenko
1023ef23b7 Remove somewhat ugly and costly anti-recursion hack -- we will switch to more explicit methods. 2016-01-11 09:06:10 -08:00
Adam Ierymenko
a56fbc1929 Close another potential anti-recursion loophole. 2016-01-06 15:35:27 -08:00