1787 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joseph Henry	cb277f52e8	Merge branch 'netcon' of http://10.6.6.2/zerotier/zerotierone into netcon	2015-09-15 14:16:28 -04:00
Joseph Henry	8ea83c9548	netif code hooked up	2015-09-15 14:15:59 -04:00
Adam Ierymenko	d06499a50c	Merge branch 'adamierymenko-dev' of http://git.int.zerotier.com/zerotier/zerotierone into netcon	2015-09-14 12:00:03 -07:00
Adam Ierymenko	ef316ced3b	Fix JSON.	2015-09-14 11:59:43 -07:00
Adam Ierymenko	0617b17534	Merge branch 'netcon' of http://git.int.zerotier.com/zerotier/zerotierone into netcon	2015-09-14 11:36:01 -07:00
Grant Limberg	f7d3e262a9	ifdef default assignments	2015-09-11 17:16:38 -07:00
Joseph Henry	8189b2ba91	retval fix	2015-09-11 19:29:35 -04:00
Joseph Henry	e73868bc5a	various segfault fixes	2015-09-11 19:02:44 -04:00
Joseph Henry	6f0bc1f676	added debugs, fixed linux makefile	2015-09-11 18:22:41 -04:00
Adam Ierymenko	88898c68d7	Merge branch 'adamierymenko-dev' of http://git.int.zerotier.com/zerotier/zerotierone into netcon	2015-09-11 15:02:38 -07:00
Adam Ierymenko	cd005341c5	Extra statement to clean up Members -- cascade did not seem to work, possibly due to dual key.	2015-09-11 15:02:26 -07:00
Joseph Henry	bc666d0ab7	added pbuf alloc block	2015-09-11 15:26:39 -04:00
Adam Ierymenko	933b47389d	Add Arp to netcon build.	2015-09-11 12:19:48 -07:00
Adam Ierymenko	a8d7a31327	Integrate arp into NetconEthernetTap.	2015-09-11 12:12:45 -07:00
Joseph Henry	c2226cf0df	added TRACEs	2015-09-11 14:47:16 -04:00
Adam Ierymenko	5f6eb2ce98	Merge branch 'adamierymenko-dev' into netcon	2015-09-11 11:46:44 -07:00
Adam Ierymenko	c1a53a2653	ARP cache and responder agent code for use in netcon and iOS.	2015-09-11 11:45:04 -07:00
Joseph Henry	776f93e7be	closeConnection / closeClient changes	2015-09-11 14:12:27 -04:00
Joseph Henry	5a5a513b18	small method changes	2015-09-11 14:00:42 -04:00
Joseph Henry	cc4a2bb0c3	filled out hendlers	2015-09-10 20:34:48 -04:00
Joseph Henry	e4dc46741f	compiles, technically	2015-09-10 20:22:35 -04:00
Joseph Henry	20beafedc5	refactor almost complete	2015-09-10 20:02:13 -04:00
Adam Ierymenko	8d82ac5cc8	Merge branch 'adamierymenko-dev' into netcon	2015-09-10 15:56:15 -07:00
Adam Ierymenko	9dc2ef5549	Rename some stuff in Phy since it can be used with any stream socket.	2015-09-10 15:55:48 -07:00
Adam Ierymenko	cd3d77987c	.	2015-09-10 15:52:24 -07:00
Joseph Henry	b11d429bc0	refactor in progress	2015-09-10 18:48:45 -04:00
Joseph Henry	e391bc004b	refactor in progress	2015-09-10 18:19:43 -04:00
Adam Ierymenko	a35fa7ac93	Add expansion of netconf in _test field.	2015-09-10 15:14:10 -07:00
Adam Ierymenko	bebe3d7cfa	Fix deadlock in test mode.	2015-09-10 14:47:04 -07:00
Joseph Henry	c1f1530d54	refactor in progress	2015-09-10 17:44:01 -04:00
Adam Ierymenko	1f7a41cff8	Fix to allowing identity to be populated if not present.	2015-09-10 14:37:34 -07:00
Joseph Henry	f4d3c995bc	refactor in progress	2015-09-10 16:52:18 -04:00
Adam Ierymenko	637da383f5	Remove unnecessary accessors.	2015-09-10 13:22:44 -07:00
Adam Ierymenko	389ea272a0	Merge adamierymenko-dev	2015-09-10 13:20:00 -07:00
Adam Ierymenko	9a723be263	Add socketpair support to Phy.	2015-09-10 13:18:57 -07:00
Joseph Henry	3802d37d29	started refactor	2015-09-10 15:46:37 -04:00
Joseph Henry	750352836f	initial commit	2015-09-10 13:56:01 -04:00
Adam Ierymenko	a43c3fbf2e	Merge branch 'adamierymenko-dev' into netcon	2015-09-09 09:54:39 -07:00
Adam Ierymenko	4fbcad2468	Allow identity to be populated for newly inserted Member objects to permit transfer from old network controller and testing.	2015-09-08 13:02:42 -07:00
Adam Ierymenko	0d386f1c31	Add a bit of useful testing instrumentation to SqliteNetworkController.	2015-09-08 11:35:55 -07:00
Adam Ierymenko	85b90f122a	Final std::map<> from Switch, and add some smallish default values for hash size.	2015-09-04 15:35:43 -07:00
Adam Ierymenko	3dba016a93	Almost done... very few std::map<>s remaining in any spot that matters.	2015-09-04 15:21:22 -07:00
Adam Ierymenko	db0369e9b8	Remove way-overkill multimap from Switch.	2015-09-04 14:56:39 -07:00
Adam Ierymenko	0ab3e49be9	Starting in on Switch... kill map in defrag queue, which will probably improve performance pretty decently under high load with lots of peers.	2015-09-04 14:44:22 -07:00
Adam Ierymenko	f116c4b9c0	... and another ...	2015-09-04 14:24:31 -07:00
Adam Ierymenko	307e44f7c8	Two for one! (std::map removal)	2015-09-04 14:14:32 -07:00
Adam Ierymenko	d1341578d8	... and another one!	2015-09-04 13:53:48 -07:00
Adam Ierymenko	7b8ce16057	Another std::map<> dies.	2015-09-04 13:42:19 -07:00
Adam Ierymenko	3a959a7763	Swap out std::map<> for Hashtable<> for main peer database in Topology. (ongoing std::map-ectomy)	2015-09-04 12:14:21 -07:00
Adam Ierymenko	cfd101c9b8	Add entries() to go with keys() for future use.	2015-09-04 11:50:12 -07:00