4178 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jeff Becker	ec6a1cfddc	make it compile	2019-07-09 09:58:16 -04:00
Jeff Becker	84407b3557	make it compile	2019-07-09 09:54:13 -04:00
Jeff Becker	fb803cfe11	lel	2019-07-09 09:50:50 -04:00
Jeff Becker	8ac9ef6f18	Merge remote-tracking branch 'origin/master' into ipv6-tun	2019-07-09 09:48:15 -04:00
Jeff Becker	b9bcc2b775	make threadpool consice	2019-07-09 09:47:24 -04:00
Jeff	777f2fefc6	Merge pull request #688 from michael-loki/thread_name ... Add function to set threadname, and use from threadpool impl	2019-07-08 20:44:51 -04:00
Michael	b01e5accbb	Add function to set threadname, and use from threadpool impl	2019-07-09 01:06:22 +01:00
Michael	3ce90b678e	Allow override of the rest of the config	2019-07-09 00:29:43 +01:00
Michael	fbb83704a0	Allow override of some config via env variables	2019-07-09 00:29:43 +01:00
Michael	08d306f6e9	Have fromSection return void	2019-07-09 00:29:43 +01:00
Michael	937f28f75d	Move router config to be encapsulated	2019-07-09 00:29:43 +01:00
Jeff Becker	0eb6431eb1	initialize tun with 0 and set defaults in correct places	2019-07-08 11:26:06 -04:00
Jeff Becker	134d36eb02	whitespace fix	2019-07-08 10:23:26 -04:00
Jeff Becker	fd911d0c52	make format	2019-07-08 10:22:47 -04:00
Jeff Becker	4edb9d9b45	fix	2019-07-08 10:22:25 -04:00
Jeff Becker	58005c5f81	Merge remote-tracking branch 'origin/master' into ipv6-tun	2019-07-08 10:17:21 -04:00
Jeff	7ce742622e	Merge pull request #685 from michael-loki/refactor_config_redux ... Refactor config redux	2019-07-08 08:27:31 -04:00
Michael	6418c67f75	Set netid before doing anything else	2019-07-07 12:29:44 +01:00
Michael	661a8b6537	Fix macos build after rebase	2019-07-06 15:59:13 +01:00
Michael	f310160065	Fixup and add tests	2019-07-06 14:46:25 +01:00
Michael	2acb163083	Fix llvm 8 build	2019-07-06 14:46:25 +01:00
Michael	a2326efa37	Revert "Merge pull request #679 from tewinget/revert-config-refactor" ... This reverts commit 2996a7f29c, reversing changes made to 10df3bd4b3.	2019-07-06 14:46:25 +01:00
Jeff	c15fc4c8fb	Merge pull request #684 from majestrate/fix-mac-os-tun-pi ... Fix mac os tun pi	2019-07-05 11:50:15 -04:00
Jeff Becker	89a3e375d2	fix last commit	2019-07-05 10:48:10 -04:00
Jeff Becker	a781589b52	try fix for localhost.loki	2019-07-05 10:41:26 -04:00
Jeff	ce034b3dff	make it work	2019-07-05 10:14:07 -04:00
Jeff Becker	6467d21ba0	* fix testnet codepath ... * add packet info for osx	2019-07-05 10:13:58 -04:00
Jeff	adcc866478	make it work	2019-07-05 08:51:54 -04:00
Jeff	0c5ee8a5a5	Merge remote-tracking branch 'origin/master' into ipv6-tun	2019-07-05 08:33:13 -04:00
Jeff Becker	81cab62bb9	* fix testnet codepath ... * add packet info for osx	2019-07-05 08:07:06 -04:00
Jeff Becker	c4aaa80e75	use sane defaults and deprecated "auto" as it's horribly bad style	2019-07-03 10:32:51 -04:00
Jeff Becker	3638496e8d	Merge remote-tracking branch 'origin/master' into ipv6-tun	2019-07-03 09:43:34 -04:00
Jeff	7a4b48ca05	Merge pull request #682 from majestrate/fix-locking ... don't lock when visiting links	2019-07-03 09:09:28 -04:00
Jeff Becker	fdfd8c6150	don't lock when visiting links	2019-07-03 08:42:11 -04:00
Jeff	b1fa0135ba	Merge pull request #681 from majestrate/fix-locking ... fix locking types	2019-07-02 20:13:19 -04:00
Jeff	3b006e67e8	Merge pull request #680 from loki-project/api-docs ... update LTRP docs	2019-07-02 15:16:27 -04:00
Jeff Becker	ec1910b8ca	remove threadpool.hpp ... make link layer not use null lock and null mutex	2019-07-02 15:01:14 -04:00
Jeff Becker	fc8f58822c	remove threadpool.hpp ... make link layer not use null lock and null mutex	2019-07-02 15:00:24 -04:00
Jeff	17c1ab689e	Update api_v0.txt	2019-07-02 14:51:17 -04:00
Jeff	0b4cb50ac1	Update readme.md	2019-07-02 11:29:28 -04:00
Jeff Becker	04c9c61dfb	Merge remote-tracking branch 'origin/master' into ipv6-tun	2019-07-02 11:25:10 -04:00
Jeff	2996a7f29c	Merge pull request #679 from tewinget/revert-config-refactor ... Reverts #678 #677 and #669 with hashes:	2019-07-02 11:07:01 -04:00
Thomas Winget	d044d60101	Reverts #678 #677 and #669 with hashes: ... 10df3bd 766ece8 979f095 See those commits for further details	2019-07-02 11:02:20 -04:00
Jeff	10df3bd4b3	Merge pull request #678 from majestrate/disable-rpc ... actually set config for network	2019-07-02 09:38:37 -04:00
Jeff Becker	191ebe32ce	actually set config for network	2019-07-02 09:33:36 -04:00
Jeff	766ece8355	Merge pull request #677 from majestrate/disable-rpc ... disable rpc by default	2019-07-02 09:23:15 -04:00
Jeff Becker	a82be1d040	disable rpc by default	2019-07-02 09:19:28 -04:00
Jeff	979f095415	Merge pull request #669 from michael-loki/refactor_config ... Refactor config	2019-07-02 09:09:10 -04:00
Michael	8c2d67f8f1	Fix tests	2019-07-02 10:06:29 +01:00
Michael	b51f7d8015	Convert to load config in config loader	2019-07-02 01:58:39 +01:00