2660 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jeff Becker	eecc00211f	squash commits and make convotags more "reliable" (probably)	2019-02-21 12:47:35 -05:00
Jeff Becker	5dde4e6351	use source path's intro as being able to reply on convo tags	2019-02-21 12:46:08 -05:00
Ryan Tharp	06af3ca95b	Merge pull request #332 from neuroscr/master ... make macos 10.12 happy	2019-02-20 05:47:10 -08:00
Ryan Tharp	547cf96606	make macos 10.12 happy	2019-02-20 05:46:23 -08:00
Jeff	264ecacfdb	Merge pull request #331 from majestrate/fix-convotag-issue ... increment sequence number on good send only	2019-02-20 08:43:05 -05:00
Jeff Becker	b511242632	increment sequence number on good send only	2019-02-20 08:42:50 -05:00
Jeff	652d8cd036	Merge pull request #330 from majestrate/unfuck-dht ... unbreak dht	2019-02-20 08:30:17 -05:00
Jeff Becker	b9a0531057	make dht work again ._.	2019-02-20 08:29:12 -05:00
Ryan Tharp	2b433f046d	Oh it was a typo	2019-02-19 16:13:16 -08:00
Ryan Tharp	8e000c8321	linux gcc 7.3 support	2019-02-19 16:10:19 -08:00
Ryan Tharp	f06b275193	make macos happy	2019-02-19 16:03:20 -08:00
Ryan Tharp	411ea072c3	Merge pull request #323 from despair86/dev ... fix windows build	2019-02-19 14:10:55 -08:00
Ryan Tharp	413843bab1	Merge branch 'staging' into dev	2019-02-19 14:10:35 -08:00
Jeff	9ddc74fc3f	Merge pull request #317 from neuroscr/master ... Fix undefined behaviors and misaligned member access / macos compile fix	2019-02-19 17:09:56 -05:00
Rick V	5a3947ca5c	clang-format	2019-02-18 17:58:12 -06:00
Rick V	0f45e286ff	XXX: the inline string_view constructors *should* be harmless on pre-C++17 platforms... ... fix windows build	2019-02-18 17:50:04 -06:00
Ryan Tharp	98e3753764	fix typo	2019-02-18 05:12:13 -08:00
Jeff	f941025d7c	Merge pull request #319 from majestrate/staging ... Staging	2019-02-18 07:09:55 -05:00
Jeff	97396571df	Merge pull request #318 from michael-loki:emplace_insert ... Replace insert(make_pair()) with emplace()	2019-02-18 06:51:11 -05:00
Jeff Becker	0f3a26fe12	update license copyright dates	2019-02-18 06:45:37 -05:00
Jeff Becker	a23a61717b	Merge remote-tracking branch 'origin/staging' into staging	2019-02-18 06:44:43 -05:00
Michael	887fb4ac62	Replace insert(make_pair()) with emplace()	2019-02-18 10:35:23 +00:00
Ryan Tharp	f247a3623c	So lu on linux gcc 7.3 but llu everywhere else?	2019-02-18 02:13:42 -08:00
Ryan Tharp	25d00e2974	Merge remote-tracking branch 'origin/master'	2019-02-18 02:00:36 -08:00
Ryan Tharp	ad91071633	Fix undefined behaviors and misaligned member access	2019-02-18 01:59:33 -08:00
Ryan Tharp	1f11559e74	Merge branch 'staging' of https://github.com/loki-project/loki-network	2019-02-18 09:57:50 +00:00
Ryan Tharp	8e51d3a491	fix linux gcc 7.3 error (warning)	2019-02-18 09:39:18 +00:00
Jeff Becker	8d96c0945e	Merge remote-tracking branch 'origin/staging' into staging	2019-02-17 17:02:01 -05:00
Jeff	bbbad826ef	Merge pull request #316 from michael-loki:buffer_obj ... Convert llarp_buffer_t to be a class with methods	2019-02-17 16:59:31 -05:00
Jeff	524cb3138c	Merge pull request #315 from michael-loki:move_json ... Move abyss/json to llarp/util/json	2019-02-17 16:56:30 -05:00
Jeff Becker	90507337ce	compute number of connected routers	2019-02-17 16:08:14 -05:00
Michael	a00d6afc5e	Convert llarp_buffer_t to be a class with methods	2019-02-17 13:09:48 +00:00
Michael	a0125ffe86	Move abyss/json to llarp/util/json	2019-02-15 23:43:26 +00:00
Jeff	7df2a227d3	Merge pull request #314 from majestrate/staging ... make shared lib compile	2019-02-15 17:56:49 -05:00
Jeff Becker	b5a1637224	make shared lib compile	2019-02-15 17:55:52 -05:00
Jeff	02c6f2c08d	Merge pull request #313 from majestrate/staging ... merge staging	2019-02-15 17:21:29 -05:00
Jeff Becker	1d958d95de	* make rpc compile right ... * make link sessions introspectable * make utp write buffers fully flush each tick	2019-02-15 17:19:19 -05:00
Jeff	d75e925bda	Merge pull request #312 from michael-loki/fix_log_tag ... Fix log tag after cmake changes	2019-02-15 15:51:08 -05:00
Michael	90373b806c	Fix log tag after cmake changes	2019-02-15 20:49:10 +00:00
Jeff	f7b16c7a98	Merge pull request #306 from michael-loki/abstract_router_replacement ... Abstract router replacement	2019-02-15 12:10:26 -05:00
Jeff	cdc19c52fa	Merge branch 'staging' into abstract_router_replacement	2019-02-15 12:10:18 -05:00
Jeff	03b8f1429e	Merge pull request #311 from majestrate/staging ... Staging	2019-02-15 08:48:32 -05:00
Jeff Becker	22b63fba38	close and shutdown utp socket on timeout	2019-02-15 08:45:56 -05:00
Jeff	fdcc3f64b0	Merge pull request #310 from despair86/dev ... win32 libabyss patch	2019-02-15 06:59:41 -05:00
Michael	048fa83c39	Finish replacement of Router with AbstractRouter	2019-02-14 22:31:31 +00:00
Rick V	e9048559b2	late-breaking hotfix patch for libabyss-win32	2019-02-14 15:10:56 -06:00
Rick V	1bb441a367	fix clang cross-compile nt shared lib	2019-02-14 14:30:18 -06:00
Jeff Becker	c6b3fa25ff	update proposed new wire protocol docs	2019-02-14 13:13:45 -05:00
Jeff	a204d7c42e	Merge pull request #309 from majestrate/staging ... Staging	2019-02-14 08:50:25 -05:00
Jeff Becker	550fc3c439	Revert "tweaking handover logic" ... This reverts commit 50bfe5d810.	2019-02-14 08:49:07 -05:00