10559 Commits

Author	SHA1	Message	Date
Nick Mathewson	fbc20294aa	Merge branch 'backtrace_squashed' ... Conflicts: src/common/sandbox.c src/common/sandbox.h src/common/util.c src/or/main.c src/test/include.am src/test/test.c	2013-11-18 11:00:16 -05:00
Nick Mathewson	0cf234317f	Unit tests for new functions in log.c	2013-11-18 10:43:15 -05:00
Nick Mathewson	bd8ad674b9	Add a sighandler-safe logging mechanism ... We had accidentially grown two fake ones: one for backtrace.c, and one for sandbox.c. Let's do this properly instead. Now, when we configure logs, we keep track of fds that should get told about bad stuff happening from signal handlers. There's another entry point for these that avoids using non-signal-handler-safe functions.	2013-11-18 10:43:15 -05:00
Nick Mathewson	063bea58bc	Basic backtrace ability ... On platforms with the backtrace/backtrace_symbols_fd interface, Tor can now dump stack traces on assertion failure. By default, I log them to DataDir/stack_dump and to stderr.	2013-11-18 10:43:14 -05:00
Nick Mathewson	91ec6f7269	Have the OOM handler also count the age the data in a stream buffer	2013-11-15 18:38:52 -05:00
Nick Mathewson	7a2b30fe16	Merge remote-tracking branch 'origin/maint-0.2.4' ... Conflicts: src/or/relay.c Conflict changes were easy; compilation fixes required were using using TOR_SIMPLEQ_FIRST to get head of cell queue.	2013-11-15 15:35:00 -05:00
Nick Mathewson	59f50c80d4	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 ... Conflicts: src/or/or.h src/or/relay.c Conflicts were simple to resolve. More fixes were needed for compilation, including: reinstating the tv_to_msec function, and renaming *_conn_cells to *_chan_cells.	2013-11-15 15:29:24 -05:00
Nick Mathewson	f6e07c158f	Make the dir-key-crosscert element required ... In proposal 157, we added a cross-certification element for directory authority certificates. We implemented it in 0.2.1.9-alpha. All Tor directory authorities now generate it. Here, as planned, make it required, so that we can finally close proposal 157. The biggest change in the code is in the unit test data, where some old hardcoded certs that we made long ago have become no longer valid and now need to be replaced.	2013-11-14 09:37:41 -05:00
Nick Mathewson	fc5a881bd3	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-11-10 12:24:12 -05:00
Nick Mathewson	8bfa596c15	Fix two more DirServer mentions in log	2013-11-10 12:23:56 -05:00
Nick Mathewson	56ac75b265	Fix a wide line	2013-11-10 12:22:34 -05:00
Nick Mathewson	532f70a807	Change documentation DirServer->DirAuthority ... We renamed the option, but we didn't actually fix it in the log messages or the docs. This patch does that. For #10124. Patch by sqrt2.	2013-11-10 12:21:23 -05:00
rl1987	86cfc64d45	Implementing --allow-missing-torrc CLI option.	2013-11-07 14:26:05 -05:00
Nick Mathewson	1b8ceb83c9	Improved circuit queue out-of-memory handler ... Previously, when we ran low on memory, we'd close whichever circuits had the most queued cells. Now, we close those that have the *oldest* queued cells, on the theory that those are most responsible for us running low on memory, and that those are the least likely to actually drain on their own if we wait a little longer. Based on analysis from a forthcoming paper by Jansen, Tschorsch, Johnson, and Scheuermann. Fixes bug 9093.	2013-11-07 12:15:30 -05:00
Nick Mathewson	12dc55f487	Merge branch 'prop221_squashed_024' ... Conflicts: src/or/or.h	2013-11-01 10:28:01 -04:00
Nick Mathewson	5de88dda0a	circuit_build_failed: distinguish "got DESTROY" case ... Roger spotted this on tor-dev in his comments on proposal 221. We etect DESTROY vs everything else, since arma likes network timeout indicating failure but not overload indicating failure.	2013-11-01 10:04:48 -04:00
Nick Mathewson	0de71bf8eb	Implement proposal 221: Stop sending CREATE_FAST ... This makes FastFirstHopPK an AUTOBOOL; makes the default "auto"; and makes the behavior of "auto" be "look at the consensus."	2013-11-01 10:04:48 -04:00
Nick Mathewson	5cc155e02a	Merge remote-tracking branch 'public/bug9645' into maint-0.2.4	2013-10-31 16:09:41 -04:00
Nick Mathewson	275ab61ad4	Appease make check-spaces	2013-10-31 14:45:20 -04:00
Nick Mathewson	9bcd93a364	Merge remote-tracking branch 'public/bug10063'	2013-10-31 14:43:20 -04:00
Nick Mathewson	761ee93c69	Add missing includes for circpathbias.h	2013-10-31 14:33:34 -04:00
Nick Mathewson	8f793c38fb	Move other #9731 check to start of its functions ... At arma's suggestion. Looks like I missed this one.	2013-10-31 14:29:18 -04:00
Nick Mathewson	5cba0ddfc4	Make circpathbias and circuitbuild compile. ... That was the tricky part	2013-10-31 14:28:49 -04:00
Nick Mathewson	b4ebf8421a	Move pathbias functions into a new file. ... Does not compile yet. This is the "no code changed" diff.	2013-10-31 14:17:49 -04:00
Nick Mathewson	96f92f2062	Move #9731 checks to start of their functions ... At arma's suggestion.	2013-10-31 14:10:23 -04:00
Nick Mathewson	702c0502cf	Merge remote-tracking branch 'public/bug9731'	2013-10-31 14:09:18 -04:00
Nick Mathewson	db2c2a6909	Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4	2013-10-31 14:08:28 -04:00
Nick Mathewson	f6fee77375	Add some clarity and checks to cell_queue_append_packed_copy ... It's not cool to have "circ may be NULL if use_stats false, but otherwise we crash" as an undocumented API constraint. :)	2013-10-30 23:03:20 -04:00
Nick Mathewson	83d9d72bf3	Merge remote-tracking branch 'karsten/morestats5'	2013-10-30 22:53:05 -04:00
George Kadianakis	9e0ed8136a	Fix an always-true assert in PT code.	2013-10-29 22:49:37 +00:00
Nick Mathewson	4b6f074df9	Merge remote-tracking branch 'public/bug5018' ... Conflicts: src/or/entrynodes.c	2013-10-29 01:29:59 -04:00
David Fifield	2235d65240	Document that unneeded transports are ignored. ... Suggested by Roger in https://trac.torproject.org/projects/tor/ticket/5018#comment:11.	2013-10-29 01:06:03 -04:00
David Fifield	e6e6c245c8	Simplify transport_is_needed. ... By Roger at https://trac.torproject.org/projects/tor/ticket/5018#comment:11.	2013-10-29 01:05:57 -04:00
George Kadianakis	6f33dffec1	Only launch transport proxies that provide useful transports.	2013-10-29 01:05:56 -04:00
Karsten Loesing	2e0fad542c	Merge branch 'morestats4' into morestats5 ... Conflicts: doc/tor.1.txt src/or/config.c src/or/connection.h src/or/control.c src/or/control.h src/or/or.h src/or/relay.c src/or/relay.h src/test/test.c	2013-10-28 12:09:42 +01:00
Karsten Loesing	e46de82c97	squash! Pass const uint64_t pointers, document array length. ... Don't cast uint64_t * to const uint64_t * explicitly. The cast is always safe, so C does it for us. Doing the cast explitictly can hide bugs if the input is secretly the wrong type. Suggested by Nick.	2013-10-28 10:48:18 +01:00
Nick Mathewson	7578606a22	Merge remote-tracking branch 'public/bug9934_nm'	2013-10-25 12:15:31 -04:00
Nick Mathewson	f249074e41	Merge remote-tracking branch 'Ryman/bug5605'	2013-10-25 12:03:42 -04:00
Nick Mathewson	4b8282e50c	Log the origin address of controller connections ... Resolves 9698; patch from "sigpipe".	2013-10-25 11:52:45 -04:00
Matthew Finkel	b36f93a671	A Bridge Authority should compute flag thresholds ... As a bridge authority, before we create our networkstatus document, we should compute the thresholds needed for the various status flags assigned to each bridge based on the status of all other bridges. We then add these thresholds to the networkstatus document for easy access. Fixes for #1117 and #9859.	2013-10-21 17:49:33 +00:00
Nick Mathewson	71bd100976	DROPGUARDS controller command ... Implements ticket 9934; patch from "ra"	2013-10-21 13:02:25 -04:00
Nick Mathewson	17d368281a	Merge remote-tracking branch 'linus/bug9206_option'	2013-10-16 11:20:43 -04:00
Nick Mathewson	7f2415683a	Merge remote-tracking branch 'asn/bug9651'	2013-10-14 11:43:33 -04:00
Roger Dingledine	a26a5794a3	Merge branch 'maint-0.2.4'	2013-10-12 10:48:30 -04:00
Roger Dingledine	8f9fb63cdb	be willing to bootstrap from all three of our directory guards ... Also fix a bug where if the guard we choose first doesn't answer, we would try the second guard, but once we connected to the second guard we would abandon it and retry the first one, slowing down bootstrapping. The fix in both cases is to treat all our initially chosen guards as acceptable to use. Fixes bug 9946.	2013-10-12 10:42:27 -04:00
Nick Mathewson	0546edde66	Merge branch 'bug1376'	2013-10-11 12:51:15 -04:00
Nick Mathewson	6f9584b3fd	Make --version, --help, etc incremement quiet level, never decrease it ... Fixes other case of #9578	2013-10-11 12:32:59 -04:00
Roger Dingledine	f96a8d5fa3	Report bootstrapping progress correctly when downloading microdescs ... We had updated our "do we have enough microdescs to begin building circuits?" logic most recently in 0.2.4.10-alpha (see bug 5956), but we left the bootstrap status event logic at "how far through getting 1/4 of them are we?" Fixes bug 9958; bugfix on 0.2.2.36, which is where they diverged (see bug 5343).	2013-10-10 21:39:21 -04:00
Nick Mathewson	43f95e38ab	Merge remote-tracking branch 'sysrqb/bug9950'	2013-10-10 11:27:28 -04:00
Nick Mathewson	df4693fed5	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-10-10 11:24:16 -04:00
Nick Mathewson	2c7ed0406f	Merge branch 'bug9644_024' into maint-0.2.4	2013-10-10 11:23:46 -04:00
Matthew Finkel	528e3bf892	Free the smartlist after parsing csv config option ... Bugfix on 1293835440, which implemented 6752: Not in any released tor.	2013-10-09 23:16:57 +00:00
Nick Mathewson	66624ded39	Merge remote-tracking branch 'origin/maint-0.2.4' ... Conflicts: src/or/relay.c	2013-10-08 13:38:47 -04:00
Nick Mathewson	50fc8fb5c5	Merge remote-tracking branch 'public/bug9927' into maint-0.2.4	2013-10-08 13:37:13 -04:00
Nick Mathewson	b571b966f2	Tweak a comment	2013-10-08 12:18:31 -04:00
Nick Mathewson	1060688d2a	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-10-08 12:17:14 -04:00
Nick Mathewson	7e0f1fa52a	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2013-10-08 12:16:42 -04:00
Nick Mathewson	5e0404265f	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-10-08 12:11:37 -04:00
Nick Mathewson	0c3c47565d	Merge remote-tracking branch 'public/bug9596' into maint-0.2.4	2013-10-08 12:10:47 -04:00
Nick Mathewson	63234b1839	Merge branch 'bug9922'	2013-10-08 12:03:09 -04:00
Roger Dingledine	5f13ae4b03	don't lie about bootstrap progress when clients use bridges ... we were listing 50% as soon as we got a bridge's relay descriptor, even if we didn't have any consensus, certificates, etc yet.	2013-10-08 11:50:53 -04:00
Nick Mathewson	c8c2298015	Simply route length generation code. ... The old code had logic to use a shorter path length if we didn't have enough nodes. But we don't support 2-node networks anwyay. Fix for #9926. I'm not calling this a bugfix on any particular version, since a 2-node network would fail to work for you for a lot of other reasons too, and it's not clear to me when that began, or if 2-node networks would ever have worked.	2013-10-08 11:48:33 -04:00
Nick Mathewson	c7c24785ee	Generate bootstrapping status messages for microdescs too ... Fix for 9927.	2013-10-08 11:32:02 -04:00
Linus Nordberg	fab8fd2c18	Add TestingDirAuthVoteGuard option for specifying relays to vote Guard on. ... Addresses ticket 9206.	2013-10-07 13:33:42 +02:00
Nick Mathewson	566645b5ed	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-10-02 22:40:01 -04:00
Nick Mathewson	557f332957	Fix a bug in our bug 9776 fix. ... By calling circuit_n_chan_done() unconditionally on close, we were closing pending connections that might not have been pending quite for the connection we were closing. Fix for bug 9880. Thanks to skruffy for finding this and explaining it patiently until we understood.	2013-10-02 22:20:18 -04:00
Roger Dingledine	a980d844cd	what is logging "above" notice?	2013-10-01 08:55:57 -04:00
Roger Dingledine	0d8632e585	fix another confusing whitespace instance	2013-09-30 01:47:24 -04:00
Roger Dingledine	2cf41cc70d	fix confusing whitespace	2013-09-30 01:41:48 -04:00
Roger Dingledine	1b6ea92a57	fix whitespace in log message	2013-09-29 06:15:00 -04:00
Roger Dingledine	c902b4981b	fix two cases where we were printing unsigned int as %d	2013-09-29 06:13:59 -04:00
Nick Mathewson	759de9f756	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-09-24 10:47:26 -04:00
Andrea Shepard	938ee9b24d	Always call circuit_n_chan_done(chan, 0) from channel_closed()	2013-09-24 10:42:12 -04:00
George Kadianakis	43b9b51389	Warn when the Extended ORPort should be on but it's not.	2013-09-24 12:30:25 +01:00
Nick Mathewson	5b1c257d9a	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-09-23 01:48:30 -04:00
Nick Mathewson	116e6af7a7	Fix a compilation warning with older gcc	2013-09-23 01:47:52 -04:00
Nick Mathewson	c4031ee847	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-09-21 08:55:45 -04:00
Nick Mathewson	d1dbaf2473	Relays should send timestamp in NETINFO. ... This avoids skew warnings as authorities test reachability. Fix 9798; fix not on any released Tor.	2013-09-21 08:54:42 -04:00
Roger Dingledine	99703c9b31	Merge branch 'maint-0.2.4'	2013-09-21 02:21:15 -04:00
Roger Dingledine	4f036acd27	back out most of 1d0ba9a ... this was causing directory authorities to send a time of 0 on all connections they generated themselves, which means everybody reachability test caused a time skew warning in the log for that relay. (i didn't just revert, because the changes file has been modified by other later commits.)	2013-09-21 02:11:51 -04:00
Nick Mathewson	6178aaea06	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-09-20 11:01:10 -04:00
Nick Mathewson	fd2954d06d	Round down hidden service descriptor publication times to nearest hour ... Implements part of proposal 222. We can do this safely, since REND_CACHE_MAX_SKEW is 24 hours.	2013-09-20 11:00:27 -04:00
Nick Mathewson	accadd8752	Remove the timestamp from AUTHENTICATE cells; replace with random bytes ... This isn't actually much of an issue, since only relays send AUTHENTICATE cells, but while we're removing timestamps, we might as well do this too. Part of proposal 222. I didn't take the approach in the proposal of using a time-based HMAC, since that was a bad-prng-mitigation hack from SSL3, and in real life, if you don't have a good RNG, you're hopeless as a Tor server.	2013-09-20 11:00:27 -04:00
Nick Mathewson	f8b44eedf7	Get ready to stop sending timestamps in INTRODUCE cells ... For now, round down to the nearest 10 minutes. Later, eliminate entirely by setting a consensus parameter. (This rounding is safe because, in 0.2.2, where the timestamp mattered, REND_REPLAY_TIME_INTERVAL was a nice generous 60 minutes.)	2013-09-20 11:00:27 -04:00
Nick Mathewson	1d0ba9a61f	Stop sending the current time in client NETINFO handshakes. ... Implements part of proposal 222.	2013-09-20 11:00:27 -04:00
Nick Mathewson	ee01e41937	Fix compilation with libevent 1 ... a9910d89 added trickery to make us work with interned strings and seccomp; it requires libevent 2. Fix for 9785; bug not in any released tor.	2013-09-19 20:25:05 -04:00
Nick Mathewson	7dbf66713f	When freeing a cert_list_t, avoid memory leak. ... We were freeing these on exit, but when we added the dl_status_map field to them in fddb814f, we forgot to arrange for it to be freed. I've moved the cert_list_free() code into its own function, and added an appropriate dsmap_free() call. Fixes bug 9644; bugfix on 0.2.4.13-alpha.	2013-09-19 12:22:49 -04:00
Nick Mathewson	67bb1a44bd	Merge remote-tracking branch 'public/bug9716_024'	2013-09-19 10:50:34 -04:00
Nick Mathewson	dece40fd77	Fix an assert when disabling ORPort with accounting disabled. ... The problem was that the server_identity_key_is_set() function could return true under conditions where we don't really have an identity key -- specifically, where we used to have one, but we stopped being a server. This is a fix for 6979; bugfix on 0.2.2.18-alpha where we added that assertion to get_server_identity_key().	2013-09-18 10:26:32 -04:00
Nick Mathewson	15b9a1ff10	Correctly re-process non-option cmdline args on sighup ... Whenever we had an non-option commandline arguments *and* option-bearing commandline arguments on the commandline, we would save only the latter across invocations of options_init_from_torrc, but take their existence as license not to re-parse the former. Yuck! Incidentally, this fix lets us throw away the backup_arg[gv] logic. Fix for bug 9746; bugfix on d98dfb3746, not in any released Tor. Found by Damian. Thanks, Damian!	2013-09-16 13:07:45 -04:00
Nick Mathewson	c5532889a8	Don't apply read/write buckets to cpuworker connections ... Fixes bug 9731	2013-09-13 13:39:18 -04:00
Nick Mathewson	9205552daa	Don't apply read/write buckets to non-limited connections ... Fixes bug 9731	2013-09-13 13:37:53 -04:00
Nick Mathewson	147a0f31bd	Fix a windows compilation warning from 4647 branch	2013-09-13 13:10:17 -04:00
Nick Mathewson	ccbf1cfacd	Whoops; make or_state_validate conform to validate_fn_t. ... Bugfix on 1293835440, which implemented 6752: Not in any released tor.	2013-09-13 12:56:14 -04:00
Nick Mathewson	25a3ae922f	Merge remote-tracking branch 'Ryman/bug6384' ... Conflicts: src/or/config.c src/or/main.c	2013-09-13 12:55:53 -04:00
Nick Mathewson	e35c972851	Merge branch 'bug4647_squashed'	2013-09-13 12:36:55 -04:00
Nick Mathewson	aac4f30d23	Add a --dump-config option to help testing option parsing.	2013-09-13 12:36:40 -04:00
Nick Mathewson	7972af7073	Whoops; make options_validate conform to validate_fn_t. ... This just goes to show: never cast a function pointer. Found while testing new command line parse logic. Bugfix on 1293835440, which implemented 6752: Not in any released tor.	2013-09-13 12:36:40 -04:00
Nick Mathewson	a6cad4db70	Add '--digests' to "that which implies --hush." ... And have these various commandline options imply "hush", not "quiet", since we like to see warnings.	2013-09-13 12:36:40 -04:00
Nick Mathewson	75d795b1d7	Disallow --hash-password with no commandline arguments. ... Fixes bug 9573. Bugfix on 59453ac6e in 0.0.9pre5, which fixed a crash in a silly way.	2013-09-13 12:36:40 -04:00
Nick Mathewson	b523167f2f	Make config_parse_commandline table-driven for its list of cmdline args	2013-09-13 12:36:40 -04:00
Nick Mathewson	a1096fe180	Use commandline parser for other options ... These were previously allowed only in the initial position: --help, -h , --version, --digests, --list-torrc-options	2013-09-13 12:36:39 -04:00
Nick Mathewson	34ec954f8e	Expose commandline parser so that we can use it for --quiet,etc. ... Fix for bug 9578.	2013-09-13 12:36:39 -04:00
Cristian Toader	d98dfb3746	Patch for 4647 (rewrite command line parser)	2013-09-13 12:36:26 -04:00
Nick Mathewson	e0b2cd061b	Merge remote-tracking branch 'ctoader/gsoc-cap-stage2' ... Conflicts: src/common/sandbox.c	2013-09-13 12:31:41 -04:00
Karsten Loesing	b43a37bc5b	Pass const uint64_t pointers, document array length. ... Suggested by nickm.	2013-09-12 10:51:55 +02:00
Karsten Loesing	d5f0d792dd	Pass around const struct timeval * instead of struct timeval. ... Suggested by nickm.	2013-09-12 10:10:38 +02:00
Karsten Loesing	6553bdde8c	Don't format cell stats for unattached circuits.	2013-09-12 09:21:13 +02:00
Nick Mathewson	a2754d418d	Try using INT_MAX, not SOMAXCONN, to set listen() backlog. ... Fall back to SOMAXCONN if INT_MAX doesn't work. We'd like to do this because the actual maximum is overrideable by the kernel, and the value in the header file might not be right at all. All implementations I can find out about claim that this is supported. Fix for 9716; bugfix on every Tor.	2013-09-11 13:30:45 -04:00
Nick Mathewson	4e00625bbe	Build correctly with older libevents	2013-09-09 15:29:19 -04:00
Nick Mathewson	00fd0cc5f9	Basic compilation fixes.	2013-09-09 14:55:47 -04:00
Nick Mathewson	c7113e702b	Merge remote-tracking branch 'public/bug9645'	2013-09-05 09:59:07 -04:00
Roger Dingledine	86907ea4db	Merge branch 'maint-0.2.4'	2013-09-05 02:34:58 -04:00
Roger Dingledine	2c877d2da4	collect and log statistics about onionskins received/processed ... we skip onionskins that came from non-relays, so we're less likely to run into privacy troubles. starts to implement ticket 9658.	2013-09-05 01:44:52 -04:00
Roger Dingledine	f51add6dbc	Revert e443beff and solve it a different way ... Now we explicitly check for overflow. This approach seemed smarter than a cascade of "change int to unsigned int and hope nothing breaks right before the release". Nick, feel free to fix in a better way, maybe in master.	2013-09-05 01:41:07 -04:00
Roger Dingledine	e443beffeb	don't let recently_chosen_ntors overflow ... with commit c6f1668d we let it grow arbitrarily large. it can still overflow, but the damage is very small now.	2013-09-05 01:27:46 -04:00
Roger Dingledine	6156887adf	Merge branch 'maint-0.2.4' ... Conflicts: src/test/test.c	2013-09-04 23:44:39 -04:00
Roger Dingledine	c6f1668db3	nickm wants us to prioritize tap in a currently-rare edge case	2013-09-04 23:21:46 -04:00
Roger Dingledine	a4400952ee	Be more general in calculating expected onion queue processing time ... Now we consider the TAP cells we'll process while draining the NTor queue, and vice versa.	2013-09-04 23:21:45 -04:00
Roger Dingledine	a66791230f	let the NumNTorsPerTAP consensus param override our queue choice	2013-09-04 23:21:45 -04:00
Roger Dingledine	7acc7c3dc6	do a lopsided round-robin between the onion queues ... that way tap won't starve entirely, but we'll still handle ntor requests quicker.	2013-09-04 23:21:45 -04:00
Roger Dingledine	16b5c609a4	check bounds on handshake_type more thoroughly	2013-09-04 23:21:45 -04:00
Roger Dingledine	9d2030e580	add info-level logs to help track onion queue sizes	2013-09-04 23:21:45 -04:00
Roger Dingledine	bb32bfa2f2	refactor and give it unit tests	2013-09-04 23:21:45 -04:00
Roger Dingledine	87a18514ef	Separate cpuworker queues by handshake type ... Now we prioritize ntor create cells over tap create cells. Starts to address ticket 9574.	2013-09-04 23:21:45 -04:00
Nick Mathewson	d5e9573ed2	Merge remote-tracking branch 'origin/maint-0.2.4' ... Conflicts: src/or/circuituse.c	2013-09-04 16:11:20 -04:00
Nick Mathewson	a60d21a85d	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 ... Conflicts: src/or/circuitbuild.c	2013-09-04 16:08:02 -04:00
Nick Mathewson	4f3dbb3c0a	use !cbt_disabled in place of LearnCBT to avoid needless circs ... This would make us do testing circuits "even when cbt is disabled by consensus, or when we're a directory authority, or when we've failed to write cbt history to our state file lately." (Roger's words.) This is a fix for 9671 and an improvement in our fix for 5049. The original misbehavior was in 0.2.2.14-alpha; the incomplete fix was in 0.2.3.17-beta.	2013-09-04 15:54:05 -04:00
Nick Mathewson	264aa271a7	Fix bug 9645: don't forget an md just because we can't save it.	2013-09-03 14:25:01 -04:00
Nick Mathewson	5c9008e0b0	Fix some "ISO C90 forbids mixed declarations and code" warnings	2013-09-03 13:39:31 -04:00
Nick Mathewson	eb5f22eff2	Merge remote-tracking branch 'Ryman/bug4341'	2013-09-03 13:16:22 -04:00
Kevin Butler	db318dc77f	Minor changes to adhere to codebase conventions.	2013-09-03 17:47:03 +01:00
Nick Mathewson	270b4f030a	Handle HTTP minor versions greater than 9 ... (In practice they don't exist, but so long as we're making changes for standards compliance...) Also add several more unit tests for good and bad URL types.	2013-09-03 11:38:15 -04:00
Kevin Butler	5327605caa	Tougher validation for parsing urls from HTTP headers. Fixes #2767.	2013-09-03 01:14:43 +01:00
Kevin Butler	b336e8c74e	No longer writing control ports to file if updating reversible options fail. Fixes #5605.	2013-09-02 19:25:08 +01:00
Cristian Toader	fe6e2733ab	added contingency message to test for sandbox_getaddrinfo	2013-09-02 12:16:02 +03:00
Cristian Toader	1ef0b2e1a3	changed how sb getaddrinfo works such that it supports storing multiple results	2013-09-02 11:44:04 +03:00
Kevin Butler	6e17fa6d7b	Added --library-versions flag to print the compile time and runtime versions of libevent, openssl and zlib. Partially implements #6384.	2013-09-01 17:38:01 +01:00
Kevin Butler	1bdb391ed0	Added no_tempfile parameter to write_chunks_to_file to do non-atomic writes. Implements #1376.	2013-09-01 00:24:07 +01:00
Kevin Butler	bb69bf8882	Changed signature for check_nickname_list to remove warnings on free.	2013-08-31 05:14:48 +01:00
Kevin Butler	0513643317	MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341.	2013-08-31 04:49:04 +01:00
Cristian Toader	d5f43b5254	_array filter functions now rely on final NULL parameter	2013-08-29 15:42:30 +03:00
Cristian Toader	b1f7105506	supporting /dev/urandom instead of /dev/random	2013-08-29 15:22:14 +03:00
Cristian Toader	148c6dc473	updated open syscall strings	2013-08-26 21:19:22 +03:00
Nick Mathewson	a5f6cb908c	Increase POLICY_BUF_LEN to 72 to accomodate IPv6 exit policy items. ... Fixes bug 9596; bugfix on 0.2.4.7-alpha.	2013-08-26 11:30:09 -04:00
Nick Mathewson	00bcc25d05	Cleanup whitespaces	2013-08-25 12:22:20 -04:00
Nick Mathewson	078d6bcda5	Basic unit test for EVENT_TRANSPORT_LAUNCHED	2013-08-25 11:29:03 -04:00
Nick Mathewson	69312c7a84	Widen event_mask_t to 64 bits	2013-08-25 10:46:53 -04:00
George Kadianakis	6dd462e8bc	Implement the TRANSPORT_LAUNCHED control port event.	2013-08-25 10:37:03 -04:00
Nick Mathewson	2452302354	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-08-25 00:34:23 -04:00
Nick Mathewson	8611195a00	Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3	2013-08-25 00:32:27 -04:00
Nick Mathewson	4107ddd003	Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4	2013-08-25 00:31:51 -04:00
Nick Mathewson	1ee1c8fb4f	Merge remote-tracking branch 'public/bug9366' into maint-0.2.4	2013-08-25 00:29:49 -04:00
Nick Mathewson	3727a978b8	Merge remote-tracking branch 'public/bug9543' into maint-0.2.4	2013-08-25 00:29:06 -04:00
Roger Dingledine	0fd8f5781b	fix typos	2013-08-23 21:43:57 -04:00
Nick Mathewson	223c7da080	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-08-22 20:47:23 -04:00
Nick Mathewson	43f187ec2e	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2013-08-22 20:47:10 -04:00
Nick Mathewson	8920fc5457	Hide the contents of the circuit_build_times structure. ... There were only two functions outside of circuitstats that actually wanted to know what was inside this. Making the structure itself hidden should help isolation and prevent us from spaghettifying the thing more.	2013-08-22 10:15:57 -04:00
Nick Mathewson	79cad08b4f	Documentation for new cbt accessors	2013-08-22 10:15:56 -04:00
Nick Mathewson	775c491502	Separate mutable/const accessors for circuit_build_times ... (These have proved invaluable for other global accessors.)	2013-08-22 10:15:56 -04:00
Nick Mathewson	e1c9b43b8e	Rename get_circuit_nbuild_* to end with _ms	2013-08-22 10:15:56 -04:00
vagrant	4834641dce	Make circ_times static and add accessor functions. ... Change the global circ_times to a static variable and use accessor functions throughout the code, instead of accessing it directly.	2013-08-22 10:15:56 -04:00
Nick Mathewson	2530c84220	Replace return with continue in update_consensus_networkstatus_downloads ... Fix for bug 9564; bugfix on 0.2.3.14-alpha.	2013-08-22 10:00:37 -04:00
Nick Mathewson	71ec90fdc8	Tweak/cleanup 5526 fix.	2013-08-21 13:41:53 -04:00
Peter Retzlaff	a337d4b7cb	Print accounting information in heartbeat messages. ... Implements ticket 5526.	2013-08-21 13:26:57 -04:00
Nick Mathewson	af7970b6bc	Add a 30-day maximum on user-supplied MaxCircuitDirtiness ... Fix for bug 9543.	2013-08-21 11:35:00 -04:00
Nick Mathewson	cbc53a2d52	Make bridges send AUTH_CHALLENGE cells ... The spec requires them to do so, and not doing so creates a situation where they can't send-test because relays won't extend to them because of the other part of bug 9546. Fixes bug 9546; bugfix on 0.2.3.6-alpha.	2013-08-21 11:29:19 -04:00
Nick Mathewson	940cef3367	Make bridges send AUTH_CHALLENGE cells ... The spec requires them to do so, and not doing so creates a situation where they can't send-test because relays won't extend to them because of the other part of bug 9546. Fixes bug 9546; bugfix on 0.2.3.6-alpha.	2013-08-21 11:28:58 -04:00
Nick Mathewson	0daa26a473	Send NETINFO on receiving a NETINFO if we have not yet sent one. ... (Backport to Tor 0.2.3) Relays previously, when initiating a connection, would only send a NETINFO after sending an AUTHENTICATE. But bridges, when receiving a connection, would never send AUTH_CHALLENGE. So relays wouldn't AUTHENTICATE, and wouldn't NETINFO, and then bridges would be surprised to be receiving CREATE cells on a non-open circuit. Fixes bug 9546.	2013-08-21 11:28:57 -04:00
Cristian Toader	bc19ea100c	make check-spaces fixes	2013-08-21 17:57:15 +03:00
Nick Mathewson	1bb4a4f9bd	Send NETINFO on receiving a NETINFO if we have not yet sent one. ... Relays previously, when initiating a connection, would only send a NETINFO after sending an AUTHENTICATE. But bridges, when receiving a connection, would never send AUTH_CHALLENGE. So relays wouldn't AUTHENTICATE, and wouldn't NETINFO, and then bridges would be surprised to be receiving CREATE cells on a non-open circuit. Fixes bug 9546.	2013-08-20 14:52:56 -04:00
Cristian Toader	a9910d89f1	finalised fix on libevent open string issue	2013-08-19 11:41:46 +03:00
Nick Mathewson	a3ffa1f76e	Rename circuit_get_global_list to remove trailing _	2013-08-15 15:37:23 -04:00
Nick Mathewson	d4634d1b72	Merge remote-tracking branch 'majek/bug9108' ... Conflicts: src/or/circuitlist.h	2013-08-15 15:36:04 -04:00
Nick Mathewson	74262f1571	Merge branch 'bug5040_4773_rebase_3'	2013-08-15 12:04:56 -04:00
George Kadianakis	794447d03d	Fix some #5040 bugs found by Nick's tests. ... - Set conn->address when we receive a USERADDR command. - Set conn->state to a sane value when we transition from Extended ORPort to ORPort.	2013-08-15 12:03:38 -04:00
George Kadianakis	f549e4c36d	Write some free_all functions to free the auth. cookies. ... We started allocating space for them on the heap in the previous commit. Conflicts: src/or/ext_orport.h	2013-08-15 12:03:38 -04:00
George Kadianakis	33c3e60a37	Implement and use a generic auth. cookie initialization function. ... Use the generic function for both the ControlPort cookie and the ExtORPort cookie. Also, place the global cookie variables in the heap so that we can pass them around more easily as pointers. Also also, fix the unit tests that broke by this change. Conflicts: src/or/config.h src/or/ext_orport.c	2013-08-15 12:03:37 -04:00
George Kadianakis	13784d4753	Warn if the Extended ORPort listens on a public IP address.	2013-08-15 12:03:37 -04:00
George Kadianakis	bdeddecd29	Better documentation for ext_or_auth_correct_client_hash.	2013-08-15 12:03:37 -04:00
Nick Mathewson	28bb673584	White-box tests for the succeeding case of ext_or_port handshake. ... (Okay, white-box plus mocking enough other functions so they don't crash.)	2013-08-15 12:03:37 -04:00
Nick Mathewson	ba78a3c800	Make 0x01==SAFECOOKIE a macro, not a magic number	2013-08-15 12:03:37 -04:00
Nick Mathewson	d7358e8598	Expose/mock some functions to make ext_orport.c testing possible	2013-08-15 12:03:37 -04:00
Nick Mathewson	4526c3e0b6	Unit test for basic ext_or_cookie authentication backend	2013-08-15 12:03:37 -04:00
Nick Mathewson	b64351ed17	Split the cryptographic part of handle_client_auth_nonce into new fn	2013-08-15 12:03:36 -04:00
George Kadianakis	e1d1d7a8da	Fix some ext_orport.c DOCDOCs.	2013-08-15 12:03:36 -04:00
Nick Mathewson	03e3881043	Tests for connection_write_ext_or_command.	2013-08-15 12:03:36 -04:00
Nick Mathewson	c342ea9879	Unit tests for ext_or_id_map.	2013-08-15 12:03:36 -04:00
Nick Mathewson	7da59721a9	Unit tests for fetch_ext_or_cmd	2013-08-15 12:03:36 -04:00
Nick Mathewson	9d8ffa91ce	Add a clientmap_entry_free(). ... Remove a nedless strdup/free pair.	2013-08-15 12:03:36 -04:00
Nick Mathewson	34d02484c0	Fix hash functions for transport_name in client entry	2013-08-15 12:03:35 -04:00
Nick Mathewson	50136b6698	Use memdup_nulterm and check for NULs in handle_cmd_transport	2013-08-15 12:03:35 -04:00
Nick Mathewson	550af7be0a	Fix a variety of issues in 4773 ... memwipe some stack-allocated stuff Add DOCDOC comments for state machines Use memdup_nulterm as appropriate Check for NULs in useraddr Add a macro so that <= AUTH_MAX has a meaning.	2013-08-15 12:03:35 -04:00
Nick Mathewson	6dd8ff0ad9	Break up <??> differently, and explain why	2013-08-15 12:03:35 -04:00
Nick Mathewson	e4a241af11	Add guards to ext_orport.h, rename get_file to get_file_name	2013-08-15 12:03:34 -04:00
Nick Mathewson	6568424410	Use only uintptr_t for the value of transport_count	2013-08-15 12:03:34 -04:00
George Kadianakis	6ad535e6dc	If a single client connects with multiple transports, note all transports.	2013-08-15 12:03:34 -04:00
George Kadianakis	cb54e44587	Fix a number of issues with the #5040 code. ... - Don't leak if a transport proxy sends us a TRANSPORT command more than once. - Don't use smartlist_string_isin() in geoip_get_transport_history(). (pointed out by Nick) - Use the 'join' argument of smartlist_join_strings() instead of trying to write the separator on our own. (pointed out by Nick) - Document 'ext_or_transport' a bit better. (pointed out by Nick) - Be a bit more consistent with the types of the values of 'transport_counts'. (pointed out by Nick)	2013-08-15 12:03:34 -04:00
George Kadianakis	b2c7379aec	Make check-spaces happy.	2013-08-15 12:03:34 -04:00
Cristian Toader	e2a7b484f4	partial libevent open fix	2013-08-14 23:03:38 +03:00
Cristian Toader	8a85a48b9d	attempt to add stat64 filename filters; failed due to getaddrinfo..	2013-08-12 21:14:43 +03:00
Nick Mathewson	4361795145	Merge remote-tracking branch 'asn/bug9363_take2'	2013-08-12 09:46:54 -04:00
Roger Dingledine	49fd76be05	Merge branch 'maint-0.2.4'	2013-08-10 18:30:20 -04:00
Nick Mathewson	d5cfbf96a2	Fix an uninitialized-read when parsing v3 introduction requests. ... Fortunately, later checks mean that uninitialized data can't get sent to the network by this bug. Unfortunately, reading uninitialized heap *can* (in some cases, with some allocators) cause a crash if you get unlucky and go off the end of a page. Found by asn. Bugfix on 0.2.4.1-alpha.	2013-08-10 17:49:51 -04:00
Cristian Toader	44a4464cf6	fixed memory leak, added array filter support	2013-08-10 18:04:48 +03:00
Cristian Toader	89b39db003	updated filters to work with orport	2013-08-09 19:07:20 +03:00
Cristian Toader	b3a8c08a92	orport progress (not functional), nickm suggested fixes	2013-08-07 13:13:12 +03:00
George Kadianakis	0c4baa016f	Also test that server transports get written to Tor's state.	2013-08-05 21:05:39 +03:00
Nick Mathewson	b9f9110ac7	Don't allow all ORPort values to be NoAdvertise ... Fix for bug #9366	2013-08-05 12:14:48 -04:00
Cristian Toader	356b646976	added execve and multi-configuration support	2013-08-05 15:40:23 +03:00
Cristian Toader	d897690fc7	fixes suggested by nickm	2013-08-05 14:17:46 +03:00
Arlo Breault	506a01bda8	Use size_t for length in replaycache_add_test_and_elapsed() ... For consistency with the rest of buffer lengths in Tor. See #8960	2013-08-04 09:29:22 -04:00
Peter Retzlaff	ebd4ab1506	Prepare patch for ticket 5129 for merging. ... - Preserve old eventdns code. - Add function to close sockets cross-platform, without accounting. - Add changes/ file.	2013-08-02 09:35:24 -04:00
Nick Mathewson	83a859e24c	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-07-31 21:49:30 -04:00
Nick Mathewson	0a0f93d277	Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4	2013-07-31 21:48:48 -04:00
George Kadianakis	5a5147dd2e	Fix invalid-read when a managed proxy configuration fails.	2013-07-31 13:56:07 -04:00
Nick Mathewson	904a58d10f	Merge branch 'bug9288_rebased' ... Conflicts: src/test/test_pt.c	2013-07-31 13:51:15 -04:00
Nick Mathewson	22a074caa7	Update pt/configure_proxy until it stops segfaulting	2013-07-31 13:34:16 -04:00
George Kadianakis	99bb6d2937	Modifications to transports.c for the unit tests to work. ... Both 'managed_proxy_list' and 'unconfigured_proxies_n' are global src/or/transports.c variables that are not initialized properly when unit tests are run.	2013-07-31 13:34:16 -04:00
George Kadianakis	aaf79eb4d3	Write unit tests for configure_proxy().	2013-07-31 13:34:16 -04:00
George Kadianakis	6e40806025	Fix invalid-read when a managed proxy configuration fails.	2013-07-31 13:34:16 -04:00
Cristian Toader	871e5b35a8	small filter changes; openat as separate function	2013-07-30 19:25:56 +03:00
Roger Dingledine	ff6bb13c02	NumDirectoryGuards now tracks NumEntryGuards by default ... Now a user who changes only NumEntryGuards will get the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha.	2013-07-30 12:05:39 -04:00
Cristian Toader	8022def6f0	added openat parameter filter	2013-07-29 16:30:39 +03:00
Cristian Toader	8f9d3da194	Investigated access4 syscall problem, small changes to filter.	2013-07-26 19:53:05 +03:00
Nick Mathewson	d5a5a6a253	Allow {,k,kilo,m,mega,g,giga,t,tera}bit{,s} in torrc ... Patch from CharlieB for ticket #9214	2013-07-26 16:07:11 +02:00
Nick Mathewson	221a0159b8	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-07-26 15:42:10 +02:00
Nick Mathewson	11f1b7d9df	Avoid assertion failure on unexepcted address family in DNS reply. ... Fixes bug 9337; bugfix on 0.2.4.7-alpha.	2013-07-26 15:33:46 +02:00
Cristian Toader	626a2b23de	integrated context for dynamic filters	2013-07-25 14:08:02 +03:00
Cristian Toader	3dfe1c0639	initia stages of runtime dynamic filters	2013-07-25 13:25:20 +03:00
Nick Mathewson	5d4b5018be	Fix bug9309, and n_noncanonical count/continue code ... When we moved channel_matches_target_addr_for_extend() into a separate function, its sense was inverted from what one might expect, and we didn't have a ! in one place where we should have. Found by skruffy.	2013-07-23 05:16:56 -07:00
Cristian Toader	c15d09293b	added experimental support for open syscall path param	2013-07-23 14:01:53 +03:00
Nick Mathewson	1d2e8020b7	Fix bug9309, and n_noncanonical count/continue code ... When we moved channel_matches_target_addr_for_extend() into a separate function, its sense was inverted from what one might expect, and we didn't have a ! in one place where we should have. Found by skruffy.	2013-07-23 11:52:10 +02:00
Nick Mathewson	18845c5507	Initialize destroy_cell_queue. ... Likely fix for the crash bug of #9296, which was introduced through a combination of #7912 and #8586. Bugfix not in any released Tor.	2013-07-19 09:49:35 -04:00
Nick Mathewson	e1d3b44495	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-07-18 23:17:57 -04:00
Nick Mathewson	17a960734a	Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4	2013-07-18 23:17:05 -04:00
Nick Mathewson	5977435629	tmp	2013-07-18 23:08:36 -04:00
George Kadianakis	05306ad74f	Write extra-info bridge-ip-transports lines.	2013-07-18 14:59:57 -04:00
George Kadianakis	e765d6ed84	Make a channel getter method to retrieve transport names.	2013-07-18 14:59:57 -04:00
George Kadianakis	0ec4e5a698	Add transport information to the GeoIP database.	2013-07-18 14:59:57 -04:00
George Kadianakis	210210f219	Make the Extended ORPort understand the TRANSPORT command.	2013-07-18 14:59:56 -04:00
George Kadianakis	895709db07	Fix logging severities and remove some trivial XXXs.	2013-07-18 14:59:56 -04:00
George Kadianakis	c46f1b810d	More Extended ORPort code improvements. ... * Change name of init_ext_or_auth_cookie_authentication(). * Add a small comment.	2013-07-18 14:59:56 -04:00
George Kadianakis	d8f74cc439	Move Extended ORPort code to its own module. ... Move the code from the connection_or module to ext_orport. This commit only moves code: it shouldn't modify anything.	2013-07-18 14:59:56 -04:00
George Kadianakis	2207525a69	Satisfy check-spaces.	2013-07-18 14:59:56 -04:00
George Kadianakis	e2e0d09dab	Various Extended ORPort code improvements. ... * Add documentation. * Free ext_or_auth_correct_client_hash. * Use VPORT(ExtORPort) instead of V(ExtORPOrt). See dfe03d36c8 for details.	2013-07-18 14:59:56 -04:00
George Kadianakis	85b7c73168	Move USERADDR handling to a dedicated function.	2013-07-18 14:59:56 -04:00
George Kadianakis	4a55e39997	Implement Extended ORPort authentication.	2013-07-18 14:59:56 -04:00
George Kadianakis	93b9f85d41	Prepare codebase for the implementation of Extended ORPort auth.	2013-07-18 14:59:56 -04:00
George Kadianakis	d303228eca	Create the Extended ORPort authentication cookie file.	2013-07-18 14:59:55 -04:00
George Kadianakis	ba30d635c5	Document code and change the Extended ORPort command numbers.	2013-07-18 14:59:55 -04:00
Nick Mathewson	8bf0382b22	Skeleton ExtORPort implementation. Needs testing, documentation. ... Does not implement TransportControlPort yet.	2013-07-18 14:59:55 -04:00
Nick Mathewson	f45e1fbd5b	Start of a unit test for options_validate. ... I added this so I could write a unit test for ServerTransportOptions, but it incidentally exercises the succeed-on-defaults case of options_validate too.	2013-07-18 14:40:12 -04:00
Nick Mathewson	1e78100b25	Add a test for n_cells_in_circuit_queues	2013-07-18 11:23:45 -04:00
Nick Mathewson	ae64197195	Unit tests for cell queues. ... This removes some INLINE markers from functions that probably didn't need them.	2013-07-18 11:23:45 -04:00
Nick Mathewson	1047e7dcb0	Use TOR_SIMPLEQ for packed_cell_t	2013-07-18 11:23:45 -04:00
Nick Mathewson	27ec1fafe4	Remove a redundant declaration	2013-07-18 08:56:02 -04:00
Nick Mathewson	d7ccb6a3b1	Merge branch 'bug8978_rebase_2' ... Conflicts: src/test/test_pt.c	2013-07-18 08:48:20 -04:00
Nick Mathewson	b551988ef4	Merge branch 'bug8929_rebase_2'	2013-07-18 08:45:13 -04:00
Nick Mathewson	8a01a7c35b	Improve test coverage of 8929 code	2013-07-18 08:45:03 -04:00
George Kadianakis	c71809d403	Insert the environment variable only if we have options to pass.	2013-07-18 08:45:03 -04:00
George Kadianakis	1ee3a0cf44	Place the options in the environment after processing them properly.	2013-07-18 08:45:03 -04:00
George Kadianakis	1a0cf08841	Rename tor_escape_str_for_socks_arg() to something more generic. ... Since we are going to be using that function to also escape parameters passed to transport proxies using environment variables.	2013-07-18 08:45:03 -04:00
George Kadianakis	ea72958f25	Pass characters to be escaped to tor_escape_str_for_socks_arg(). ... This is in preparation for using tor_escape_str_for_socks_arg() to escape server-side pluggable transport parameters.	2013-07-18 08:45:02 -04:00
George Kadianakis	08d9807125	Write function that parses ServerTransportOptions torrc lines. ... And use it to validate them.	2013-07-18 08:45:02 -04:00
Nick Mathewson	e02b6b99f2	Add a basic unit test for pt_get_extra_info_descriptor_string.	2013-07-18 08:43:53 -04:00
George Kadianakis	924946aaaf	Write transport ARGS to extra-info descriptor.	2013-07-18 08:43:52 -04:00
George Kadianakis	8bb2ba13c1	Extract ARGS from SMETHOD line and attach them to transport.	2013-07-18 08:43:52 -04:00
Nick Mathewson	f797ac465f	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-07-16 14:49:41 -04:00
Nick Mathewson	c36bdbd535	Re-do a cast in order to make old buggy freebsd gcc happy ... Fix for #9254. Bugfix on 0.2.4.14-alpha. This is not actually a bug in the Tor code.	2013-07-16 14:48:12 -04:00
Andrea Shepard	9b3a166b44	Eliminate an impossible case in replaycache_scrub_if_needed_internal()	2013-07-16 06:01:50 -07:00
Nick Mathewson	55f5caf096	Appease "make check-spaces"	2013-07-15 17:35:56 -04:00
Nick Mathewson	c0391bae75	Merge remote-tracking branch 'public/fancy_test_tricks' ... Conflicts: src/common/include.am Conflict was from adding testsupport.h near where sandbox.h had already been added.	2013-07-15 12:02:18 -04:00
Peter Palfrader	2cb59be999	Fix two pre-coffee typos	2013-07-15 09:43:37 -04:00
Peter Palfrader	783c52b6df	Reject relative control socket paths and emit a warning. ... Previously we would accept relative paths, but only if they contained a slash somewhere (not at the end). Otherwise we would silently not work. Closes: #9258. Bugfix on 0.2.3.16-alpha.	2013-07-15 09:04:17 -04:00
Roger Dingledine	6848e29307	cosmetic cleanups	2013-07-14 02:49:34 -04:00
Nick Mathewson	aac732322a	Merge remote-tracking branch 'public/gsoc-ctoader-cap-phase1-squashed'	2013-07-12 17:12:43 -04:00
Nick Mathewson	14d5e7f85e	Remove a bogus semicolon spotted by Gisle Vanem	2013-07-11 15:53:35 -04:00
Cristian Toader	f9c1ba6493	Add a basic seccomp2 syscall filter on Linux ... It's controlled by the new Sandbox argument. Right now, it's rather coarse-grained, it's Linux-only, and it may break some features.	2013-07-11 09:13:13 -04:00
Nick Mathewson	ec6c155f82	Add some basic unit tests for the circuit map data structure. ... These show off the new mocking code by mocking the circuitmux code so that we can test the circuit map code in isolation.	2013-07-10 15:26:34 -04:00
Nick Mathewson	17e9fc09c3	Coverage support: build with --enable-coverage to have tests run with gcov ... If you pass the --enable-coverage flag on the command line, we build our testing binaries with appropriate options eo enable coverage testing. We also build a "tor-cov" binary that has coverage enabled, for integration tests. On recent OSX versions, test coverage only works with clang, not gcc. So we warn about that. Also add a contrib/coverage script to actually run gcov with the appropriate options to generate useful .gcov files. (Thanks to automake, the .o files will not have the names that gcov expects to find.) Also, remove generated gcda and gcno files on clean.	2013-07-10 15:22:16 -04:00
Nick Mathewson	a3e0a87d95	Completely refactor how FILENAME_PRIVATE works ... We previously used FILENAME_PRIVATE identifiers mostly for identifiers exposed only to the unit tests... but also for identifiers exposed to the benchmarker, and sometimes for identifiers exposed to a similar module, and occasionally for no really good reason at all. Now, we use FILENAME_PRIVATE identifiers for identifiers shared by Tor and the unit tests. They should be defined static when we aren't building the unit test, and globally visible otherwise. (The STATIC macro will keep us honest here.) For identifiers used only by the unit tests and never by Tor at all, on the other hand, we wrap them in #ifdef TOR_UNIT_TESTS. This is not the motivating use case for the split test/non-test build system; it's just a test example to see how it works, and to take a chance to clean up the code a little.	2013-07-10 15:20:10 -04:00
Nick Mathewson	f7d654b81e	Start work on fancy compiler tricks to expose extra stuff to our tests ... This is mainly a matter of automake trickery: we build each static library in two versions now: one with the TOR_UNIT_TESTS macro defined, and one without. When TOR_UNIT_TESTS is defined, we can enable mocking and expose more functions. When it's not defined, we can lock the binary down more. The alternatives would be to have alternate build modes: a "testing configuration" for building the libraries with test support, and a "production configuration" for building them without. I don't favor that approach, since I think it would mean more people runnning binaries build for testing, or more people not running unit tests.	2013-07-10 15:20:09 -04:00
Nick Mathewson	fab99844fc	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-07-08 11:35:48 -04:00
Nick Mathewson	b34279d3ab	Add a comment and a check for why flag indices will be <= 63	2013-07-08 11:35:06 -04:00
Nick Mathewson	15cd79f832	FIx undefined behavior in dirvote.c ... Fix a bug in the voting algorithm that could yield incorrect results when a non-naming authority declared too many flags. Fixes bug 9200; bugfix on 0.2.0.3-alpha. Found by coverity scan.	2013-07-03 12:01:37 -04:00
Nick Mathewson	0c3d676f9e	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-29 03:51:53 -04:00
Nick Mathewson	c955149271	Give a warning when bufferevents are enabled. ... Ticket 9147.	2013-06-29 03:45:40 -04:00
Nick Mathewson	cde1a2ca05	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-24 12:55:29 -04:00
Nick Mathewson	ca6aacce16	Fix bug 9122: don't allow newdefaultoptions to be NULL ... (This caused a crash that was reported as bug 9122, but the underlying behavior has been wrong for a while.) Fix on 0.2.3.9-alpha.	2013-06-24 12:53:37 -04:00
Marek Majkowski	10480dff01	Fix #5584 - raise awareness of safer logging - warn about potentially unsafe config options	2013-06-24 11:22:34 -04:00
Marek Majkowski	1555876d5f	Fix #9108 - make global_circuitlist a doubly linked list	2013-06-20 16:56:54 +01:00
Marek Majkowski	d7538b57b4	Don't access global_circuitlist variable directly. Use a getter instead.	2013-06-20 16:40:05 +01:00
Nick Mathewson	f7986269c3	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-18 14:47:15 -04:00
Nick Mathewson	7c4544e5a4	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2013-06-18 14:45:29 -04:00
Nick Mathewson	60d633c73a	Fix some problems with the bug9002 fix. ... Fixes bug 9090; bug not in any released Tor.	2013-06-18 11:54:57 -04:00
Nick Mathewson	b5d1fded3d	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-18 10:25:30 -04:00
Nick Mathewson	efa342f5fa	Tweak bug9063_redux patch: {n_p}_chan_cells, not {n,p}_conn_cells	2013-06-18 10:25:10 -04:00
Nick Mathewson	d3063da691	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 ... Conflicts: src/or/config.c src/or/relay.c	2013-06-18 10:23:03 -04:00
Nick Mathewson	c37fdc2eef	Merge branch 'bug9063_redux_023_squashed' into maint-0.2.3	2013-06-18 10:16:47 -04:00
Nick Mathewson	2e1fe1fcf9	Implement a real OOM-killer for too-long circuit queues. ... This implements "algorithm 1" from my discussion of bug #9072: on OOM, find the circuits with the longest queues, and kill them. It's also a fix for #9063 -- without the side-effects of bug #9072. The memory bounds aren't perfect here, and you need to be sure to allow some slack for the rest of Tor's usage. This isn't a perfect fix; the rest of the solutions I describe on codeable.	2013-06-18 10:15:16 -04:00
Nick Mathewson	2974c83735	Merge remote-tracking branch 'public/bug9082'	2013-06-17 11:57:55 -04:00
Nick Mathewson	0748c06f7c	Fix bug 9082: avoid leak when freeing destroy cell queues ... In my #7912 fix, there wasn't any code to remove entries from the (channel, circuit ID)->circuit map corresponding to queued but un-sent DESTROYs. Spotted by skruffy. Fixes bug 9082; bug not in any released Tor.	2013-06-17 11:30:56 -04:00
Nick Mathewson	dc516a5436	Limit hidden service descriptors to at most 10 guard nodes. ... Fixes bug 9002; bugfix on 0.1.1.11-alpha (which introduced guard nodes), or on 0.0.6pre1 (which introduced hidden services).	2013-06-16 20:24:48 -04:00
Andrea Shepard	469bd7a3cf	Merge branch 'bug9072-024' into bug9072-025	2013-06-15 02:27:23 -07:00
Andrea Shepard	9e45d940d4	Merge branch 'bug9072-023' into bug9072-024	2013-06-15 02:20:19 -07:00
Andrea Shepard	2a95f31716	Disable middle relay queue overfill detection code due to possible guard discovery attack	2013-06-15 02:16:00 -07:00
Nick Mathewson	6f5a720d15	Merge branch 'circuit_queue_cap-0.2.5-squashed' ... Conflicts: src/or/relay.c	2013-06-14 01:50:17 -04:00
Nick Mathewson	bd6bd1c9be	Fix signed/unsigned comparison warning	2013-06-14 01:41:53 -04:00
Nick Mathewson	c974582291	Increase the limit so leaky pipe might work	2013-06-14 01:40:35 -04:00
Nick Mathewson	79cdf81ec1	Increase the limit so leaky pipe might work	2013-06-14 01:37:22 -04:00
Nick Mathewson	9e8c104ab8	Increase the limit so leaky pipe might work	2013-06-14 01:35:21 -04:00
Andrea Shepard	459aada4d0	Don't queue more cells as a middle relay than the spec allows to be in flight	2013-06-13 21:59:01 -07:00
Andrea Shepard	418c2845d0	Don't queue more cells as a middle relay than the spec allows to be in flight	2013-06-13 21:53:36 -07:00
Andrea Shepard	4cce58d3c2	Don't queue more cells as a middle relay than the spec allows to be in flight	2013-06-13 21:39:04 -07:00
Nick Mathewson	483385d2bd	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-13 21:59:27 -04:00
Nick Mathewson	73ca1cf8b7	Rename networkstatus_dl_interval() -> networkstatus_dl_check_interval()	2013-06-13 12:44:46 -04:00
Nick Mathewson	45424b2ca1	Merge remote-tracking branch 'linus/bug8532'	2013-06-13 12:42:49 -04:00
Nick Mathewson	caa0d15c49	If we write the annotation but not the microdescriptor, rewind. ... This fixes bug 9047 (and some parts of 9031, 8922, 8883 that weren't fixed in 8822). Bugfix on 0.2.2.6-alpha.	2013-06-13 12:29:01 -04:00
Nick Mathewson	4b781e24fb	Merge remote-tracking branch 'public/bug7912_squashed'	2013-06-13 10:31:02 -04:00
Nick Mathewson	e61df2ec65	Fix compile warnings wrt printf formating of int64_t	2013-06-13 10:30:34 -04:00
Andrea Shepard	16f9861b22	Add destroy balance tracking and logging to circuitmux	2013-06-13 10:14:36 -04:00
Nick Mathewson	43d53e6d86	Implementation of a fix for bug 7912 ... I added the code to pass a destroy cell to a queueing function rather than writing it immediately, and the code to remember that we shouldn't reuse the circuit id until the destroy is actually sent, and the code to release the circuit id once the destroy has been sent... and then I finished by hooking destroy_cell_queue into the rest of Tor.	2013-06-13 10:14:00 -04:00
Nick Mathewson	801eea03ad	Code to track on a circuit whether it has a "pending" delete cell ... This will be used in a fix for bug7912.	2013-06-13 10:14:00 -04:00
Nick Mathewson	2949849143	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-13 09:43:53 -04:00
Nick Mathewson	25dddf7a8f	Merge remote-tracking branch 'public/bug8822' into maint-0.2.4	2013-06-13 09:40:32 -04:00
Nick Mathewson	d7d6529898	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-12 20:55:53 -04:00
Nick Mathewson	75b7cc1785	Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4	2013-06-12 20:55:35 -04:00
Nick Mathewson	e602c4031b	Make all consumers of microdesc_t.body tolerate NULL ... This is another fix to try to mitigate recurrences of 8031/8822.	2013-06-12 12:12:11 -04:00
Nick Mathewson	f455686b77	Unmap the microdescriptor cache before replacing it. ... This is a reprise of the fix in bdff7e3299d78; 6905c1f6 reintroduced that bug. Briefly: windows doesn't seem to like deleting a mapped file. I tried adding the PROT_SHARED_DELETE flag to the createfile all, but that didn't actually fix this issue. Fortunately, the unit test I added in 4f4fc63fea should prevent us from making this particular screw-up again. This patch also tries to limit the crash potential of a failure to write by a little bit, although it could do a better job of retaining microdescriptor bodies. Fix for bug 8822, bugfix on 0.2.4.12-alpha.	2013-06-12 12:04:33 -04:00
Linus Nordberg	c132427db4	Hide consensus download interval, depending on TestingTorNetwork, in a macro.	2013-06-10 23:04:20 +02:00
Nick Mathewson	c300720bfa	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-10 12:28:30 -04:00
Nick Mathewson	607b29ae1a	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2013-06-10 12:26:39 -04:00
Nick Mathewson	77a1935339	Fix (Open?)BSD fast-connect bug with optimistic data. ... There's an assertion failure that can occur if a connection has optimistic data waiting, and then the connect() call returns 0 on the first attempt (rather than -1 and EINPROGRESS). That latter behavior from connect() appears to be an (Open?)BSDism when dealing with remote addresses in some cases. (At least, I've only seen it reported with the BSDs under libevent, even when the address was 127.0.0.1. And we've only seen this problem in Tor with OpenBSD.) Fixes bug 9017; bugfix on 0.2.3.1-alpha, which first introduced optimistic data. (Although you could also argue that the commented-out connection_start_writing in 155c9b80 back in 2002 is the real source of the issue.)	2013-06-10 12:14:49 -04:00
Linus Nordberg	4d54b9774d	Add support for offsetting the voting interval in order to bootstrap faster. ... A new option TestingV3AuthVotingStartOffset is added which offsets the starting time of the voting interval. This is possible only when TestingTorNetwork is set. This patch makes run_scheduled_events() check for new consensus downloads every second when TestingTorNetwork, instead of every minute. This should be fine, see #8532 for reasoning. This patch also brings MIN_VOTE_SECONDS and MIN_DIST_SECONDS down from 20 to 2 seconds, unconditionally. This makes sanity checking of misconfiguration slightly less sane. Addresses #8532.	2013-06-08 15:25:32 +02:00
Andrea Shepard	ce147a2a9a	When launching a resolve request on behalf of an AF_UNIX control, omit the address field of the new entry connection. Fixes bug 8639.	2013-05-31 15:35:51 -07:00
Karsten Loesing	e39292f21d	Test functions used for TB_EMPTY and CELL_STATS events.	2013-05-31 16:12:28 +02:00
Nick Mathewson	97d1caadfd	Start correctly when not in testing mode. ... You can't use != to compare arbitary members of or_options_t. (Also, generate a better error message to say which Testing* option was set.) Fix for bug 8992. Bugfix on b0d4ca49. Bug not in any released Tor.	2013-05-28 16:13:06 -04:00
Nick Mathewson	d3125a3e40	Merge remote-tracking branch 'karsten/task-6752-3'	2013-05-28 10:59:35 -04:00
Karsten Loesing	b33b366a7f	Tweak CIRC_BW event based on comments by nickm. ... - Rename n_read and n_written in origin_circuit_t to make it clear that these are only used for CIRC_BW events. - Extract new code in control_update_global_event_mask to new clear_circ_bw_fields function.	2013-05-25 19:51:38 +02:00
Karsten Loesing	ef67077fba	Tweak TB_EMPTY event based on comments by nickm. ... - Avoid control_event_refill_global function with 13 arguments and increase code reuse factor by moving more code from control.c to connection.c. - Avoid an unsafe uint32_t -> int cast. - Add TestingEnableTbEmptyEvent option. - Prepare functions for testing. - Rename a few functions and improve documentation.	2013-05-25 19:51:38 +02:00
Karsten Loesing	26b49f525d	Tweak CELL_STATS event based on comments by nickm. ... - Move cell_command_to_string from control.c to command.c. - Use accessor for global_circuitlist instead of extern. - Add a struct for cell statistics by command instead of six arrays. - Split up control_event_circuit_cell_stats by using two helper functions. - Add TestingEnableCellStatsEvent option. - Prepare functions for testing. - Rename a few variables and document a few things better.	2013-05-25 19:51:38 +02:00
Karsten Loesing	2f893624ab	Tweak CONN_BW event based on comments by nickm. ... - Rename read/write counters in connection_t to make it clear that these are only used for CONN_BW events. - Add TestingEnableConnBwEvent option.	2013-05-25 19:51:38 +02:00
Karsten Loesing	a84fae7892	Tweak ORCONN event based on comments by nickm. ... - Move new ID= parameter in ORCONN event to end. Avoids possible trouble from controllers that parse parameters by position, even though they shouldn't.	2013-05-25 19:51:33 +02:00
Karsten Loesing	3795f6a78b	Try harder to document default_options correctly.	2013-05-25 07:33:37 +02:00
Nick Mathewson	eef42d3863	Reformat 4282 fixes a little	2013-05-24 13:37:14 -04:00
Nick Mathewson	57e4324c42	Fix a logic error in 4282 fixes ... check_or_create_data_subdir has succeeded when it returns 0, not when it returns negative.	2013-05-24 13:36:15 -04:00
Peter Retzlaff	5b7eaa3765	Extract duplicate code in geoip and rephist. ... Create new methods check_or_create_data_subdir() and write_to_data_subdir() in config.c and use them throughout rephist.c and geoip.c. This should solve ticket #4282.	2013-05-24 13:12:18 -04:00
Nick Mathewson	b4b0063e48	Tweak fix for #8789 a bit; avoid double-close and add changes file	2013-05-24 12:23:21 -04:00
Arlo Breault	d25e77f2c3	Close socket at err target. ... In connection_listener_new(). See #8789.	2013-05-24 12:05:57 -04:00
Karsten Loesing	b0d4ca4990	Tweak #6752 patch based on comments by nickm.	2013-05-24 10:28:31 +02:00
Nick Mathewson	f5820a1bf1	Restore 8093 log messages to WARN severity, but rate limit ... See #8093 for discussion	2013-05-21 14:00:30 -04:00
Nick Mathewson	feeef00a6a	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-05-21 13:46:28 -04:00
Nick Mathewson	30c06c187a	Downgrade the unexpected sendme cell warnings for 0.2.4 ... See discussion on #8093	2013-05-21 13:45:21 -04:00
Nick Mathewson	cb488f9973	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-05-20 15:59:08 -04:00
Andrea Shepard	a2e72ac04a	Copy-paste description of PathBias params from man page to or.h comment	2013-05-20 12:46:00 -07:00
Nick Mathewson	382dbe9819	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-05-17 14:54:19 -04:00
Nick Mathewson	bc56918e5a	Fix bug 8846: better log message on IP version confusion	2013-05-17 14:50:45 -04:00
Karsten Loesing	2925e2fe78	Add new CIRC_BW event.	2013-05-16 14:18:13 +02:00
Karsten Loesing	dd5ce2157d	Add new TB_EMPTY event. ... Jointly authored with Rob Jansen <jansen@cs.umn.edu>.	2013-05-16 14:18:08 +02:00
Karsten Loesing	c386d2d6ce	Add new CELL_STATS event. ... Jointly authored with Rob Jansen <jansen@cs.umn.edu>.	2013-05-16 14:17:21 +02:00
Karsten Loesing	8d1f78c556	Add new CONN_BW event. ... Jointly authored with Rob Jansen <jansen@cs.umn.edu>.	2013-05-16 13:48:35 +02:00
Karsten Loesing	e54d664f7b	Add connection ID to ORCONN event. ... Jointly authored with Rob Jansen <jansen@cs.umn.edu>.	2013-05-16 13:48:30 +02:00
Karsten Loesing	1293835440	Lower dir fetch retry schedules in testing networks. ... Also lower maximum interval without directory requests, and raise maximum download tries. Implements #6752.	2013-05-16 12:08:48 +02:00
Nick Mathewson	69f66b960c	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-05-15 10:44:17 -04:00
Roger Dingledine	0bfaf86612	Fix socks5 handshake for username/password auth ... The fix for bug 8117 exposed this bug, and it turns out real-world applications like Pidgin do care. Bugfix on 0.2.3.2-alpha; fixes bug 8879.	2013-05-15 03:34:37 -04:00
Arlo Breault	88a780d899	Check the return value of memchr(). ... For quality-of-implementation in munge_extrainfo_into_routerinfo(). See #8791	2013-05-14 12:23:17 -04:00
Andrea Shepard	50beb81d53	Merge branch 'maint-0.2.4'	2013-05-10 21:05:34 -07:00
Andrea Shepard	aaa3a085db	Merge bug5595-v2-squashed into maint-0.2.4	2013-05-10 19:39:48 -07:00
Andrea Shepard	ac73ceb728	Rephrase comment in trusted_dirs_load_certs_from_string() to reflect 5595 fix	2013-05-09 10:55:07 -07:00
Andrea Shepard	17692b2fe2	Make warning in authority_cert_dl_failed() LD_BUG per NickM code review	2013-05-09 10:55:07 -07:00
Andrea Shepard	2824bf3445	Use tor_asprintf() and clean up string handling in authority_certs_fetch_missing()	2013-05-09 10:55:02 -07:00
Andrea Shepard	c0d96bae66	Clean up ugly constants in connection_dir_download_cert_failed(), and fix a broken one	2013-05-09 10:55:02 -07:00
Andrea Shepard	7b6ee54bdc	Avoid duplicate downloads by (fp,sk) and by fp for authority certs when bootstrapping	2013-05-09 10:55:01 -07:00
Andrea Shepard	fddb814fea	When downloading certificates, distinguish requesting by identity digest from requesting by ID digest, signing key pair; fixes bug 5595	2013-05-09 10:55:01 -07:00
Andrea Shepard	d5bd4a4763	Implement fp_pair_map_t	2013-05-09 10:54:55 -07:00
Nick Mathewson	82ab33c9a6	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-05-09 13:20:01 -04:00
Nick Mathewson	bae5dd6c8d	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2013-05-09 13:14:53 -04:00
Nick Mathewson	00e2310f12	Don't run off the end of the array-of-freelists ... This is a fix for bug 8844, where eugenis correctly notes that there's a sentinel value at the end of the list-of-freelists that's never actually checked. It's a bug since the first version of the chunked buffer code back in 0.2.0.16-alpha. This would probably be a crash bug if it ever happens, but nobody's ever reported something like this, so I'm unsure whether it can occur. It would require write_to_buf, write_to_buf_zlib, read_to_buf, or read_to_buf_tls to get an input size of more than 32K. Still, it's a good idea to fix this kind of thing!	2013-05-09 13:10:48 -04:00
Andrea Shepard	9c58905a2b	Merge branch 'maint-0.2.4' into master	2013-05-07 02:24:08 -07:00
Nick Mathewson	a1d7f7ea50	Use a clearer idiom for node identity in router_counts_toward_thresholds	2013-05-05 18:55:19 -04:00
Nick Mathewson	139d367f29	Fix 8833: crash bug from using NULL node->ri in dirserv.c ... It appears that moria1 crashed because of one instance of this (the one in router_counts_toward_thresholds). The other instance I fixed won't actually have broken anything, but I think it's more clear this way. Fixes bug 8833; bugfix on 0.2.4.12-alpha.	2013-05-05 18:52:53 -04:00
Nick Mathewson	ef83db4fe8	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-24 22:16:07 -04:00
Nick Mathewson	f8bb0064d6	Merge remote-tracking branch 'public/bug6026' into maint-0.2.4	2013-04-24 22:15:47 -04:00
Nick Mathewson	68ea7d24d8	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-24 22:05:41 -04:00
Mike Perry	ac22bf27d7	Increase the pathbias state file miscounting version check. ... We now know the bug is present in 0.2.4.12-alpha too. It should be fixed in 0.2.4.13-alpha, though.	2013-04-24 22:03:03 -04:00
Mike Perry	2170f89a93	Bug 8235: Fix scaling adjustments. ... We need to subtract both the current built circuits *and* the attempted circuits from the attempt count during scaling, since *both* have already been counted there.	2013-04-24 22:03:02 -04:00
Nick Mathewson	6defb10d72	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-18 22:45:12 -04:00
Nick Mathewson	b933360ee8	Add a boolean to flag-thresholds for "we have enough measured bandwidth" ... Implements #8711.	2013-04-18 22:43:52 -04:00
Nick Mathewson	0124b10d28	Turn on ntor by default client-side ... Implements #8561.	2013-04-18 22:35:15 -04:00
Nick Mathewson	ab3d5c0490	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-18 21:42:39 -04:00
Nick Mathewson	e35ca13528	Merge remote-tracking branch 'public/bug8716_023' into maint-0.2.4	2013-04-18 21:33:53 -04:00
Nick Mathewson	1b5320bfe3	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-18 11:28:11 -04:00
Nick Mathewson	06efbbb47e	Merge remote-tracking branch 'public/bug8719' into maint-0.2.4	2013-04-18 11:26:54 -04:00
Nick Mathewson	da30adcf0f	Merge remote-tracking branch 'origin/maint-0.2.4' ... Conflicts: src/common/crypto.c	2013-04-18 11:16:05 -04:00
Nick Mathewson	8362f8854a	Merge branch 'less_charbuf_rebased' into maint-0.2.4 ... Conflicts: src/or/dirserv.c src/or/dirserv.h src/test/test_dir.c	2013-04-18 11:13:36 -04:00
Nick Mathewson	992bbd02f9	Re-enable test for parsing and generating descriptor with exit policy ... Looks like I turned this off in 6ac42f5e back in 2003 and never got around to making it work again. There has been no small amount of code drift.	2013-04-18 11:04:58 -04:00
Nick Mathewson	0f83fcc5c2	Add a quick-and-dirty-test for generate_v2_networkstatus. ... It sure is a good thing we can run each test in its own process, or else the amount of setup I needed to do to make this thing work would have broken all the other tests. Test mocking would have made this easier to write too.	2013-04-18 11:04:58 -04:00
Nick Mathewson	6706a05b79	Remove the now-unused router_get_networkstatus_v3_hash	2013-04-18 11:04:57 -04:00
Nick Mathewson	c35ef8e6e9	Test improvement: include microdesc lines in our synthetic microdesc consensuses.	2013-04-18 11:04:57 -04:00
Nick Mathewson	e1128d905c	Fix a couple of documentation issues.	2013-04-18 11:04:57 -04:00
Nick Mathewson	d2d5a7dabc	Remove some now-needless length defines	2013-04-18 11:04:57 -04:00
Nick Mathewson	28ef450b24	Remove RS_ENTRY_LEN ... Nothing uses it any longer now that we use smartlists of strings for stuff that manipulates iles of formatted routerstatuses.	2013-04-18 11:04:57 -04:00
Nick Mathewson	cb75519bbf	Refactor dirobj signature generation ... Now we can compute the hash and signature of a dirobj before concatenating the smartlist, and we don't need to play silly games with sigbuf and realloc any more.	2013-04-18 11:04:57 -04:00
Nick Mathewson	fd93622cc8	Use chunks, not buffers, for router descriptors	2013-04-18 11:04:56 -04:00
Nick Mathewson	1186628fa9	Refactor v2 networkstatus generation to avoid buffer-style	2013-04-18 11:04:56 -04:00
Nick Mathewson	9246a7ca58	Refactor routerstatus_format_entry to avoid character-buffers	2013-04-18 11:04:56 -04:00
Nick Mathewson	cd1cdae0fa	Fix some wide lines	2013-04-18 10:30:14 -04:00
Nick Mathewson	cd2b508f4e	Don't leak a waiting-for-certs consensus when accepting it. ... I believe this was introduced in 6bc071f765, which makes this a fix on 0.2.0.10-alpha. But my code archeology has not extended to actually testing that theory.	2013-04-17 11:53:52 -04:00
Nick Mathewson	0a9c17a61a	Fix memory leak when sending configuration-changed event ... Fix for bug #8718; bugfix on 0.2.3.3-alpha.	2013-04-17 11:34:15 -04:00
Nick Mathewson	bb79373fe8	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-17 10:50:58 -04:00
Nick Mathewson	b00a6211c5	Merge remote-tracking branch 'public/bug7143_v2' into maint-0.2.4	2013-04-17 10:49:59 -04:00
Nick Mathewson	bbc049a756	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-17 10:48:39 -04:00
Nick Mathewson	42731f69ef	Merge branch 'bug8037_squashed' into maint-0.2.4	2013-04-17 10:45:45 -04:00
Nick Mathewson	0cf2c01dbd	Reject most directory documents with an internal NUL. ... (Specifically, we reject all the ones that aren't NUL-terminated, since a NUL-terminated thing can't have a NUL in the middle.) Another fix for #8037.	2013-04-17 10:45:27 -04:00
Nick Mathewson	d34d0b4dc5	Merge remote-tracking branch 'origin/maint-0.2.4' ... Conflicts: src/or/dirserv.c	2013-04-14 21:57:56 -04:00
Nick Mathewson	a6545d6335	Merge branch 'bug8683_rebased' into maint-0.2.4	2013-04-14 21:48:44 -04:00
Nick Mathewson	f3ae628517	Remove a now-empty if body; invert the sense of its condition	2013-04-14 21:47:29 -04:00
Nick Mathewson	c4de828923	Remvoe total_bandwidth and total_exit_bandwidth as unused.	2013-04-14 21:47:29 -04:00
Nick Mathewson	52cadff0d6	Rename all fields which measure bw in kb to end with _kb	2013-04-14 21:45:05 -04:00
Nick Mathewson	49696786fb	Fix some KB/B confusion in flag threshold minima.	2013-04-14 21:43:50 -04:00
Roger Dingledine	9a4e9b4a80	fix trivial typo	2013-04-12 04:27:10 -04:00
Nick Mathewson	63ab5f4849	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-12 01:14:32 -04:00
Nick Mathewson	97246a5b6d	Merge remote-tracking branch 'public/bug5650_squashed' into maint-0.2.4	2013-04-12 01:13:22 -04:00
Nick Mathewson	39ac1db60e	Avoid busy-looping on WANTREAD within connection_handle_write ... Fix for bug 5650. Also, if we get a WANTREAD while reading while writing, make sure we're reading.	2013-04-12 01:11:31 -04:00
Nick Mathewson	265a7ebca6	Use credible_bandwidth uniformly in setting/using fast_bandwidth ... We were using credible_bandwidth to build the fast_bandwidth threshold, but comparing it to bandwidth_for_router.	2013-04-11 10:36:46 -04:00
Nick Mathewson	ec4ee3197f	Use correct units for dirserv_get_{credible_bandwidth,bandwidth_for_router} ... We were mixing bandwidth file entries (which are in kilobytes) with router_get_advertised_bw() entries, which were in bytes. Also, use router_get_advertised_bandwidth_capped() for credible_bandwidth.	2013-04-11 10:26:17 -04:00
Nick Mathewson	e54a5a4f3c	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-11 01:47:10 -04:00
Nick Mathewson	922ab0883d	Merge remote-tracking branch 'public/bug8185_diagnostic' into maint-0.2.4	2013-04-11 01:46:28 -04:00
Nick Mathewson	1b026efc62	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-11 01:43:14 -04:00
Nick Mathewson	ee3cc44f27	Merge remote-tracking branch 'public/bug7302' into maint-0.2.4 ... Conflicts: src/or/status.c	2013-04-11 01:42:54 -04:00
Nick Mathewson	3dfd1ebf12	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-11 01:40:31 -04:00
Nick Mathewson	7f50af116f	Merge remote-tracking branch 'public/bug8117_023' into maint-0.2.4 ... Conflicts: doc/tor.1.txt src/or/config.c src/or/connection.c	2013-04-11 01:39:55 -04:00
Roger Dingledine	8e7226cf7f	fix text in function comment ... (now that we moved to libevent)	2013-04-11 01:11:25 -04:00
Nick Mathewson	25f9ecf4b2	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-05 16:58:26 -04:00
Desoxy	74f5e304e4	Controller: Add CACHED keyword to ADDRMAP events (#8596 part 2/2) ... Add keyword CACHED="YES"/"NO" to ADDRMAP control events to indicate whether the DNS response will be cached or not.	2013-04-03 18:50:51 +02:00
Desoxy	2c40138210	Controller: Always send ADDRMAP event after RESOLVE command (#8596 part 1/2) ... Since 7536c40 only DNS results for real SOCKS requests are added to the cache, but not DNS results for DNSPort queries or control connection RESOLVE queries. Only cache additions would trigger ADDRMAP events on successful resolve. Change it so that DNS results received after a RESOLVE command also generate ADDRMAP events.	2013-04-03 18:50:27 +02:00
Nick Mathewson	b349f09b47	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-03 09:36:59 -04:00
Nick Mathewson	33b7083f26	Fix a wide line	2013-04-03 09:36:37 -04:00
Mike Perry	56e7dff7bd	Add additional checks for Path Bias scaling. ... Just in case more issues remain with scaling, it would be nice to pin-point them as such.	2013-04-03 09:32:15 -04:00
Mike Perry	2b05a8c671	Clip invalid path bias counts at startup. ... There was a bug in Tor prior to 0.2.4.10-alpha that allowed counts to become invalid. Clipping the counts at startup allows us to rule out log messages due to corruption from these prior Tor versions.	2013-04-03 09:32:15 -04:00
Nick Mathewson	a934376049	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-02 10:42:53 -04:00
Nick Mathewson	856d57531b	Merge remote-tracking branch 'public/bug7707_diagnostic' into maint-0.2.4	2013-04-02 10:41:14 -04:00
Nick Mathewson	7ccaf3f1a4	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-02 10:37:00 -04:00
Nick Mathewson	2c155064aa	Merge remote-tracking branch 'public/bug8427' into maint-0.2.4	2013-04-02 10:36:15 -04:00
Akshay Hebbar Y S	36acde6b4e	Removed obsolete code related to cached-routers	2013-04-01 21:50:35 -04:00
Nick Mathewson	c1a2be9ffe	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-29 12:26:01 -04:00
Mike Perry	9117b14218	Bug #8196: Demote a path bias notice that can be caused by controllers. ... We didn't see this in normal usage anyway.	2013-03-29 12:21:28 -04:00
Mike Perry	651e49713c	Bug 8419: Apply the badexit fix from #2203 to validatio too ... This was causing dirauths to emit flag weight validation warns if there was a sufficiently large amount of badexit bandwidth to make a difference in flag weight results.	2013-03-29 12:20:54 -04:00
Mike Perry	f6a2f088fd	Bug 8477: Don't warn if fromerly GENERAL circuits still have streams. ... This can happen in various cases of network failure.	2013-03-29 12:20:54 -04:00
Mike Perry	a7d6683629	Bug 8230: Mark circuits as opened before reachability testing. ... Should silence two path bias Bug messages seen on relays at startup.	2013-03-29 12:20:54 -04:00
Nick Mathewson	c3cc79ec38	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-29 12:19:05 -04:00
Mike Perry	d39e6736fe	Don't relax the timeout for already opened 1-hop circuits.	2013-03-29 12:17:05 -04:00
Mike Perry	66586da9bc	Add detail to log messages related to bug 7799. ... Note this does not solve bug 7799, it is only to help us diagnose it.	2013-03-29 12:17:04 -04:00
Nick Mathewson	097a08f6fe	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-28 09:33:58 -04:00
Karsten Loesing	1bce70a9e3	Make PathsNeededToBuildCircuits option work.	2013-03-28 09:32:19 -04:00
Nick Mathewson	eb9b282cc2	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-27 21:07:36 -04:00
Nick Mathewson	7f8098d2d0	Add some missing case values to please clang ... It seems that some versions of clang that would prefer the -Wswitch-enum compiler flag to warn about switch statements with missing enum values, even if those switch statements have a default. Fixes bug 8598; bugfix on 0.2.4.10-alpha.	2013-03-27 21:04:08 -04:00
Mike Perry	87d50d0617	Clarify liveness log message and lower it to notice. ... It could just be due to small clock jumps, after all.	2013-03-27 16:22:43 -07:00
Mike Perry	65c0489dd4	Bug 6572: Use timestamp_created for liveness sanity checks. ... This should eliminate potential regressions caused by #7341.	2013-03-26 20:28:19 -07:00
Nick Mathewson	e62b8051ee	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-26 22:20:33 -04:00
Mike Perry	914bfe765d	Bug 7065: Use $ for idhex instead of =	2013-03-26 18:49:41 -07:00
Nick Mathewson	2e1f23151c	count DATA cells with stream ID 0 as delivered for SENDME purposes ... Found while investigating 8093, but probably not the cause of it, since this bug would result in us sending too few SENDMEs, not in us receiving SENDMEs unexpectedly. Bugfix on the fix for 7889, which has appeared in 0.2.4.10-alpha, but not yet in any released 0.2.3.x version.	2013-03-22 14:57:58 -04:00
Nick Mathewson	967503c12c	Implement a placeholder mechanism in the channel,id->circ map ... We'll use this to help fix bug 7912, by providing a way to mark that a circuit ID can't get reused while a DESTROY is queued but not sent.	2013-03-21 11:55:07 -04:00
Nick Mathewson	e9ffd9890f	Remove check for whether bridge_line->digest is NULL ... It can never be NULL, since it's an array in bridge_line_t. Introduced in 266f8cddd8. Found by coverity; this is CID 992691. Bug not in any released Tor.	2013-03-21 07:47:42 -04:00
Nick Mathewson	ea6d53e724	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-21 07:25:24 -04:00
Nick Mathewson	6196d0e83d	The *default* guard lifetime is two months; the *min* is one ... This caused an assertion failure when pruning guards. Fixes bug #8553; bug not in any released Tor.	2013-03-21 07:22:59 -04:00
Nick Mathewson	fa3c237739	Per-SOCKSPort configuration for bug 8117 fix. ... This might be necessary if the bug8117 fix confuses any applications. Also add a changes file.	2013-03-20 16:17:06 -04:00
Nick Mathewson	a264c4feda	Prefer SOCKS_USER_PASS over SOCKS_NO_AUTH	2013-03-20 15:37:47 -04:00
Nick Mathewson	7c2eabcf8e	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-20 14:47:49 -04:00
Nick Mathewson	3412054987	Merge remote-tracking branch 'public/bug8475_023' into maint-0.2.4	2013-03-20 14:47:13 -04:00
Nick Mathewson	a87f22ef64	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-20 14:26:22 -04:00
Andrea Shepard	5c5198e713	Set default minimum bandwidth for exit flag to zero for TestingTorNetwork	2013-03-20 11:16:41 -07:00
Andrea Shepard	8e29a7ae1d	Fix an EOL@EOF in circuituse.c	2013-03-20 11:03:18 -07:00
Nick Mathewson	a660fe6fd5	Let testing networks override ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG ... This adds a new option to fix bug 8508 which broke chutney networks. The bug was introduced by 317d16de.	2013-03-20 13:34:57 -04:00
Nick Mathewson	63a42b38b1	Merge remote-tracking branch 'public/unsigned-time_t'	2013-03-20 10:53:07 -04:00
Nick Mathewson	80c987fbb4	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-20 10:34:31 -04:00
Nick Mathewson	5b0b51ca3f	Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4 ... Conflicts: src/or/circuitbuild.c src/or/config.c	2013-03-20 10:31:56 -04:00
Nick Mathewson	7d1ade251b	Debugging log for bug 8185 ... If the bug recurs, log the filename and line number that triggered it	2013-03-19 17:00:40 -04:00
Nick Mathewson	96d39fd236	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-19 16:44:00 -04:00
Nick Mathewson	ca50fb4f81	Don't assert when writing a cell to a CLOSING connection. ... Instead, drop the cell. Fixes another case of bug 7350; bugfix on 0.2.4.4-alpha	2013-03-19 16:35:40 -04:00
Nick Mathewson	96e8e30ee3	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-19 16:17:42 -04:00
Nick Mathewson	323cb655be	Merge remote-tracking branch 'public/bug7164_diagnostic' into maint-0.2.4	2013-03-19 16:16:48 -04:00
Nick Mathewson	c547502ecb	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-19 16:15:39 -04:00
Nick Mathewson	6f20a74d52	Merge branch 'bug8240_v2_squashed' into maint-0.2.4 ... Conflicts: doc/tor.1.txt src/or/circuitbuild.c src/or/config.c src/or/or.h	2013-03-19 16:15:27 -04:00
Nick Mathewson	18752bca5b	Drop the minimum guard lifetime back down to one month ... Mike believes that raising the default to 2 months with no way to lower it may create horrible load-balancing issues.	2013-03-19 16:04:40 -04:00
Nick Mathewson	cf734a08f6	Add support for days of the week to intervals	2013-03-19 16:03:58 -04:00
Nick Mathewson	343f7aa059	Make the guard lifetime configurable and adjustable via the consensus ... Fixes 8240. (Don't actually increase the default guard lifetime. It seems likely to break too many things if done precipitiously.)	2013-03-19 16:02:19 -04:00
Nick Mathewson	acbfc9c8cc	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-19 15:32:44 -04:00
Nick Mathewson	a7b46336eb	Merge remote-tracking branch 'public/bug7950' into maint-0.2.4	2013-03-19 15:32:17 -04:00
Nick Mathewson	084c857704	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-19 14:19:19 -04:00
Nick Mathewson	de7e99f8bb	Merge remote-tracking branch 'public/bug8031' into maint-0.2.4	2013-03-19 14:18:07 -04:00
Nick Mathewson	e6602f5991	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-19 14:16:46 -04:00
Nick Mathewson	c101ecc8dc	Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed' ... Conflicts: src/common/util.c src/or/entrynodes.h	2013-03-19 13:25:45 -04:00
Nick Mathewson	4eaca17f2f	Merge branch 'bug7582_v2' into maint-0.2.4	2013-03-19 12:29:29 -04:00
Nick Mathewson	73a35dc3c0	Free prepend_policy values in origin circuits	2013-03-19 12:29:08 -04:00
Nick Mathewson	6e94d2fb3a	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 16:36:52 -04:00
Nick Mathewson	597cd893c5	Merge remote-tracking branch 'public/bug6174' into maint-0.2.4	2013-03-18 16:36:25 -04:00
Nick Mathewson	b0f7af1615	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 16:34:29 -04:00
Nick Mathewson	01407f9718	Merge remote-tracking branch 'public/bug8062' into maint-0.2.4	2013-03-18 16:33:47 -04:00