Joseph Henry
8e3e830e89
Working intercepted Apache
2015-09-28 17:47:38 -04:00
Joseph Henry
77b385fb12
Re-added Apache to Dockerfile
2015-09-28 17:30:18 -04:00
Joseph Henry
0b34d8e75e
New Dockerfile
2015-09-28 16:56:14 -04:00
Joseph Henry
0c3dd2be96
Fixed apache script
2015-09-27 21:48:38 -04:00
Joseph Henry
444481f6d9
Modified Dockerfile
2015-09-27 21:26:57 -04:00
Joseph Henry
299ec12b39
Added docker-test folder
2015-09-27 21:16:02 -04:00
Joseph Henry
b21c5d8e51
Added dockerfile
2015-09-27 20:51:32 -04:00
Adam Ierymenko
2d0adb562d
Specify circuit test messages.
2015-09-27 11:37:39 -07:00
Joseph Henry
3bc9530db7
Object-Model refactor: Removed notion of Client
2015-09-27 06:08:39 -04:00
Grant Limberg
75a191a856
don't create an InetSocketAddress on local address if it's equal to ZT_SOCKADDR_NULL
2015-09-26 14:10:45 -07:00
Grant Limberg
7c3be2b5c1
fix function signature in lookup for onSendPacketRequested function
2015-09-26 14:10:16 -07:00
Grant Limberg
0b9e5928d3
update PacketSender interface
2015-09-26 13:53:38 -07:00
Grant Limberg
e8cdff3eaf
Merge branch 'adamierymenko-dev' into android-jni-dev
...
also update for changed function calls that now accept a local address
# Conflicts:
# include/ZeroTierOne.h
# java/CMakeLists.txt
# java/jni/Android.mk
# java/jni/ZT1_jnicache.cpp
# java/jni/ZT1_jnilookup.h
# java/jni/ZT1_jniutils.cpp
# java/jni/com_zerotierone_sdk_Node.cpp
2015-09-26 13:47:55 -07:00
Joseph Henry
fe78eb77d4
Fixed another closure bug
2015-09-24 19:22:56 -04:00
Adam Ierymenko
f69454ec98
(1) Make ZT_ naming convention consistent (get rid of ZT1_), (2) Make local interface a full sockaddr_storage instead of an int identifier, which turns out to be better for multi-homing and other uses.
2015-09-24 16:21:36 -07:00
Joseph Henry
8a8264bc39
Fixed their_fd closure bug
2015-09-24 17:33:25 -04:00
Joseph Henry
1119f64a77
Fixed connection closure issue
2015-09-24 17:10:30 -04:00
Joseph Henry
c25ceaf06b
Fixed recursive lock problem in closeConnection
2015-09-24 16:15:14 -04:00
Adam Ierymenko
b263926ea6
thread fixes.
2015-09-24 13:02:10 -07:00
Adam Ierymenko
84747b1a14
thread fixes...
2015-09-24 13:01:19 -07:00
Joseph Henry
9396b8d53c
Minor debug changes
2015-09-24 15:56:48 -04:00
Joseph Henry
37497ec2a8
Minor changes
2015-09-24 15:31:11 -04:00
Joseph Henry
851e4c667f
Minor changes
2015-09-24 15:30:07 -04:00
Adam Ierymenko
9feeafd757
Make LWIPStack thread safe.
2015-09-24 12:29:10 -07:00
Joseph Henry
0027a1e152
Merge branch 'netcon' of http://10.6.6.2/zerotier/zerotierone into netcon
2015-09-24 14:33:49 -04:00
Joseph Henry
65af5af138
Added debug statements
2015-09-24 14:33:15 -04:00
Adam Ierymenko
557d2b3b0d
Make LWIPStack clean up properly.
2015-09-24 11:11:16 -07:00
Adam Ierymenko
fbde40d1fc
Merge branch 'adamierymenko-dev' into netcon
2015-09-24 11:00:22 -07:00
Joseph Henry
557c0c29b0
minor changes
2015-09-23 19:45:44 -04:00
Adam Ierymenko
0e5aac6a11
Prefer IPv6 paths if available.
2015-09-23 16:16:36 -07:00
Adam Ierymenko
b242216674
Version bump, preparing for a likely 1.0.6 soon.
2015-09-23 16:10:06 -07:00
Adam Ierymenko
423412df98
Pick a random secondary UDP port for uPnP mapped traffic because of broken routers.
2015-09-23 15:16:20 -07:00
Joseph Henry
c85dd262ed
moved lib files to ext
2015-09-23 18:03:21 -04:00
Joseph Henry
02d5a31822
added lwip unix port lib files
2015-09-23 17:55:15 -04:00
Adam Ierymenko
7821d1cbdd
.
2015-09-23 14:44:13 -07:00
Adam Ierymenko
80dc7fb675
Pick random port on -p0
2015-09-23 14:38:16 -07:00
Adam Ierymenko
a3ed5277ef
Make sure ZT_NO_TYPE_PUNNING also obeyed here.
2015-09-23 14:09:27 -07:00
Adam Ierymenko
2a527ea82e
Fix for timer jitter problem.
2015-09-23 14:01:41 -07:00
Adam Ierymenko
367ffde00c
Plumb through localInterfaceId to track local interfaces corresponding with remote addresses.
2015-09-23 13:49:56 -07:00
Joseph Henry
bbdb8eb0de
more commenting and cleaning
2015-09-23 15:23:26 -04:00
Joseph Henry
b6a6346405
commenting and cleanup
2015-09-23 14:23:36 -04:00
Adam Ierymenko
4464fa5d39
Eliminate another warning.
2015-09-23 10:29:05 -07:00
Adam Ierymenko
86996d4315
Eliminate compiler warning.
2015-09-23 10:27:53 -07:00
Joseph Henry
07cef1bdb8
misc cleanup
2015-09-22 19:53:36 -04:00
Adam Ierymenko
69f006f641
.
2015-09-22 16:02:02 -07:00
Adam Ierymenko
d656e87395
Send a random small payload for NAT keepalives, since zero byte packets seem to fail to keep associations alive behind some NATs.
2015-09-22 15:58:00 -07:00
Joseph Henry
3cb8070980
it's alive! -- hooked up new fd-handling code
2015-09-22 18:44:54 -04:00
Adam Ierymenko
ff7ac0487b
.
2015-09-22 15:16:38 -07:00
Adam Ierymenko
19c0923a86
Merge branch 'adamierymenko-dev' into netcon
2015-09-22 15:11:51 -07:00
Adam Ierymenko
6ce64c2557
Phy<> loses socketpair, gains raw FD monitoring.
2015-09-22 15:11:32 -07:00