12934 Commits

Author	SHA1	Message	Date
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
Cristian Toader	b10472f92b	small open syscall modification (just in case)	2013-08-21 19:01:01 +03: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
Cristian Toader	ed4968315e	fix: sandbox_intern_string log clean up	2013-08-21 13:43:44 +03:00
Cristian Toader	8aa5517ff6	fix: flock filter update	2013-08-21 13:38:00 +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	71612f00ae	fixed openssl open syscall, fixed sandbox_getaddrinfo	2013-08-20 13:10:07 +03:00
Cristian Toader	36aeca0ecf	fix for getaddrinfo open syscall	2013-08-19 13:56:50 +03:00
Cristian Toader	a9910d89f1	finalised fix on libevent open string issue	2013-08-19 11:41:46 +03:00
Cristian Toader	c09b11b6d8	updated filters	2013-08-16 01:43:09 +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	172a55d9d6	Fix a wide line in test_geoip_with_pt	2013-08-15 12:10:10 -04:00
Nick Mathewson	74262f1571	Merge branch 'bug5040_4773_rebase_3'	2013-08-15 12:04:56 -04:00
George Kadianakis	c5269a59b0	Test ExtORPort cookie initialization when file writing is broken.	2013-08-15 12:03:38 -04:00
George Kadianakis	94db455472	Test some fail conditions of ext_orport.c USERADDR/TRANSPORT parsing.	2013-08-15 12:03:38 -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	636aeb1f24	Test for initializing ext_or_auth_cookie file	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	4e868a9bc3	Unit test for the ext_orport safe_cookie handshake	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	fd6749203e	More unit tests for handle_client_auth_nonce ... Incidentally, this business here where I make crypto_rand mockable: this is exactly the kind of thing that would make me never want to include test-support stuff in production builds.	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	7a12cbc03d	Split out buffers and socks tests into separate modules. ... No other changes were made here. Keeping everything in src/test/test.c was a legacy of back when we had all our unit tests in one big file. Doing this now because I'm adding an ext_or_command test.	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	85c556a4c2	Trivially change unittests to make them more readable. ... Pluggable transport names are now in alphabetical order like they appear in the bridge-ip-transports string.	2013-08-15 12:03:34 -04:00
George Kadianakis	b2c7379aec	Make check-spaces happy.	2013-08-15 12:03:34 -04:00
George Kadianakis	f8a9591d31	Fix some unittests that broke when we added bridge-ip-transports.	2013-08-15 12:03:33 -04:00
George Kadianakis	f4b36bee7e	Add a unittest for the bridge-ip-transports extra-info line.	2013-08-15 12:03:33 -04:00
Cristian Toader	863dd4d4b3	received feedback and fixed (partly) the socket filters	2013-08-15 00:23:51 +03:00
Cristian Toader	372e0f91fd	added comments for sandbox.h	2013-08-15 00:09:07 +03: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	9abbfef2f7	Merge remote-tracking branch 'karsten/geoip-manual-update-aug2013'	2013-08-12 09:47:30 -04:00
Nick Mathewson	5d706dd27a	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-08-12 09:47:17 -04:00
Nick Mathewson	4361795145	Merge remote-tracking branch 'asn/bug9363_take2'	2013-08-12 09:46:54 -04:00
Nick Mathewson	3433b7ce39	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2013-08-12 09:45:07 -04:00
Nick Mathewson	64410cc888	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	2013-08-12 09:44:36 -04:00
Karsten Loesing	41bf8fa889	Update to the August 2013 GeoIP database.	2013-08-12 15:26:36 +02:00
Karsten Loesing	fa62d966c9	Add 2, update 1, and remove 3 manual A1 substitutions.	2013-08-12 15:22:14 +02: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
Nick Mathewson	031e695aa5	Use SOCKET_OK/TOR_INVALID_SOCKET in socketpair replacement code	2013-08-06 16:41:53 -04:00
George Kadianakis	0c4baa016f	Also test that server transports get written to Tor's state.	2013-08-05 21:05:39 +03:00
George Kadianakis	00a7d1af9f	test_pt_configure_proxy(): verify the internals of the managed proxy.	2013-08-05 21:05:35 +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	a960e56c68	multi-configuration support using sandbox_t struct	2013-08-05 16:01:31 +03: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
Andrea Shepard	468e44a0ef	Fix tor_get_lines_from_handle() for make check-spaces	2013-08-02 18:49:57 -07:00
Nick Mathewson	9ac0a681ce	Unit test for smartlist_ints_eq ... (This was the only wholly untested function in containers.c)	2013-08-02 13:45:25 -04:00
Nick Mathewson	362f60e2d4	Try to make the win32 ersatz_socketpair pass.	2013-08-02 11:04:30 -04:00
Nick Mathewson	48a4ef3f6a	Fixed "unused parameter cloexec" warnings on windows	2013-08-02 10:52:57 -04:00
Nick Mathewson	bcc39c4666	Unit test for tor_{ersatz_,}socketpair. ... This catches tor_accept as well.	2013-08-02 10:36:36 -04:00
Nick Mathewson	d6adf05582	Split the socketpair replacement code into its own function for testing	2013-08-02 10:36:01 -04:00
Nick Mathewson	b8d9c84037	Simple unit test for tor_open_socket_with_extensions	2013-08-02 10:05:17 -04:00
Nick Mathewson	e25eb35f11	Actually use the cloexec argument in the !defined(SOCK_CLOEXEC) case	2013-08-02 10:04:21 -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
Nick Mathewson	5405688223	Fix compilation on Windows ... (Bugfix on tests for #9288 fix; bug not in any released Tor)	2013-07-31 14:19:29 -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	8a0eedbbb0	Fix mixed declaration/statement warning	2013-07-31 13:36:17 -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	2e7c531fdc	Prepare some mock functions to test #9288.	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	dde3ed385b	removed access, set_robust_list, set_thread_area, set_tid_address, uname; added sb_poll	2013-07-31 12:05:10 +03:00
Cristian Toader	313cbe6e24	sigprocmask, epoll_ctl, prctl, mprotect, flock, futex, mremap	2013-07-31 11:35:25 +03:00
Cristian Toader	f0840ed4c9	epoll_ctl	2013-07-31 00:27:14 +03:00
Cristian Toader	5fc0e13db8	fcntl64	2013-07-30 23:52:54 +03:00
Cristian Toader	686cf4c0ff	clean stable version	2013-07-30 23:43:42 +03:00
Cristian Toader	c1f5f1842e	fully switched to function pointers; problems with socketcall parameters	2013-07-30 23:20:08 +03:00
Cristian Toader	442f256f25	switched to a design using filters as function pointer arrays	2013-07-30 21:23:30 +03:00
Cristian Toader	5baea85189	removed open flags (postponed), added mmap2 flags	2013-07-30 19:37:28 +03: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	6d5b0367f6	Changes as suggested by nickm ... - char* to const char* and name refactoring - workaround for accept4 syscall	2013-07-29 14:46:47 +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
Cristian Toader	abe082e7d0	dynamic parameter filter bug fixes	2013-07-24 17:15:57 +03:00
Cristian Toader	962d814e52	dynamic parameter filter (prototype, not tested)	2013-07-24 17:06:06 +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	e1410f20d7	added support for multiple parameters	2013-07-23 14:22:31 +03: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
Cristian Toader	8b12170f23	added support for numeric parameters, tested with rt_sigaction	2013-07-23 10:49:56 +03:00
Cristian Toader	7cf1dbfd51	changed paramfilter type to intptr_t	2013-07-23 10:14:25 +03:00
Nick Mathewson	f6d8bc9389	Refactor the assertion-failure code into a function	2013-07-19 13:40:20 -04:00
Nick Mathewson	5343ee1a06	Add a signal-safe decimal formatting function	2013-07-19 13:26:25 -04:00
Nick Mathewson	8f0755fa85	Whoops; check in test_circuitmux.c	2013-07-19 12:05:38 -04:00
Nick Mathewson	34ad7642c8	Regression test for destroy cell queue ... This exercises the code that crashed and caused #9296.	2013-07-19 10:17:00 -04: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
Cristian Toader	8dfa5772e7	(undo) git test..	2013-07-18 18:28:55 +03:00
Cristian Toader	b0725c964b	git test..	2013-07-18 18:28:10 +03: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
Cristian Toader	e7e2efb717	Added getter for protected parameter	2013-07-18 18:21:37 +03:00
Cristian Toader	673349c42e	Repair of some of the lost parameter filters history	2013-07-18 18:03:10 +03:00
Nick Mathewson	27ec1fafe4	Remove a redundant declaration	2013-07-18 08:56:02 -04:00
Nick Mathewson	e6c0fb2b6d	Fix a wide line in test_pt.c	2013-07-18 08:49:52 -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
Nick Mathewson	31871f7d77	Fix memory leaks in test_config_parse_transport_options_line	2013-07-18 08:45:03 -04:00
Nick Mathewson	713ff2f5ef	Document what "escape" means in tor_escape_str_for_pt_args	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	6cfc2b5d73	Write unit tests for the ServerTransportOptions parsing function.	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
Nick Mathewson	dd18789a9c	Add a unit test for smethod lines with arguments.	2013-07-18 08:43:52 -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
Nick Mathewson	4824f3ad93	Merge remote-tracking branch 'asn/bug9265'	2013-07-16 09:55:51 -04:00
Nick Mathewson	74356aaeec	Remove an unused variable in test_replaycache_scrub	2013-07-16 09:53:44 -04:00
Andrea Shepard	459d827193	Add more replaycache.c unit tests, bringing coverage to 100% for that file	2013-07-16 06:02:22 -07:00
Andrea Shepard	9b3a166b44	Eliminate an impossible case in replaycache_scrub_if_needed_internal()	2013-07-16 06:01:50 -07:00
George Kadianakis	4ccd4b5c51	Test deeper in test_pt_parsing(). ... We used to test parse_{c,s}method_line() without actually testing that the resulting transport_t was well formed.	2013-07-16 14:07:03 +03:00
Nick Mathewson	55f5caf096	Appease "make check-spaces"	2013-07-15 17:35:56 -04:00
Nick Mathewson	85178e2e93	Use format_hex_number_sigsafe to format syscalls in sandbox.c ... This way, we don't have to use snprintf, which is not guaranteed to be signal-safe. (Technically speaking, strlen() and strlcpy() are not guaranteed to be signal-safe by the POSIX standard. But I claim that they are on every platform that supports libseccomp2, which is what matters here.)	2013-07-15 13:07:09 -04:00
Nick Mathewson	9fda7e8cd1	Lightly refactor and test format_hex_number_sigsafe ... Better tests for upper bounds, and for failing cases. Also, change the function's interface to take a buffer length rather than a maximum length, and then NUL-terminate: functions that don't NUL-terminate are trouble waiting to happen.	2013-07-15 12:52:29 -04:00
Nick Mathewson	18136afbbb	HEX_ERRNO_SIZE is no longer the correct upper limit for format_hex_number_sigsafe	2013-07-15 12:40:07 -04:00
Nick Mathewson	22977b7c1d	Expose format_hex_number_..., and rename it to ..._sigsafe(). ... There are some other places in the code that will want a signal-safe way to format numbers, so it shouldn't be static to util.c.	2013-07-15 12:26:55 -04:00
Nick Mathewson	449b2b7c58	Don't build format_helper_exit_status on win32 ... The only thing that used format_helper_exit_status on win32 was the unit tests. This caused an error when we tried to leave a static format_helper_exit_status lying around in a production object file. The easiest solution is to admit that this way of dealing with process exit status is Unix-only.	2013-07-15 12:17:23 -04:00
Nick Mathewson	1556b0cb12	Merge remote-tracking branch 'linus/unused_param'	2013-07-15 12:02:46 -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
Linus Nordberg	d0c0f050df	Avoid compiler warning 'unused param'. ... Fixes #9261.	2013-07-15 15:46:36 +02: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
Peter Palfrader	5cc52b242e	Document get_parent_directory more	2013-07-15 09:04:17 -04:00
Roger Dingledine	6848e29307	cosmetic cleanups	2013-07-14 02:49:34 -04:00
Roger Dingledine	de7cdc0d94	put sandbox.h in the tarball, so the tarball builds	2013-07-13 20:31:18 -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	b6e8c74667	Add rudimentary test mocking support. ... This is not the most beautiful possible implementation (it requires decorating mockable functions with ugly macros), but it actually works, and is portable across multiple compilers and architectures.	2013-07-10 15:22:16 -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	7a4145c45a	Merge branch 'bug9200' into maint-0.2.4	2013-07-08 11:35:25 -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	dd90ab4121	Merge remote-tracking branch 'karsten/geoip-manual-update-jul2013'	2013-07-08 09:23:39 -04:00
Nick Mathewson	20634fac54	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-07-08 09:23:09 -04:00
Nick Mathewson	c78c8de015	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2013-07-08 09:22:49 -04:00
Nick Mathewson	0b9c515870	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	2013-07-08 09:22:00 -04:00
Karsten Loesing	2a61b0dd6b	Update to the July 2013 GeoIP database.	2013-07-08 10:21:28 +02:00
Karsten Loesing	1a43dfa603	Add 2 new manual A1 substitutions.	2013-07-08 10:14:42 +02: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	f631b73cd5	Merge remote-tracking branch 'linus/bug8530'	2013-06-29 16:02:13 -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	8a96a85d66	Check more return values in the unit tests	2013-06-18 12:31:03 -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	459c7c0e41	Attempt to un-confuse coverity about (false) double-free in bench_onion_ntor.	2013-06-18 11:33:15 -04:00
Nick Mathewson	9f8e672b50	Fix a couple of resource leaks in test_config.c ... Spotted by Coverity Scan. Not in any released Tor.	2013-06-18 11:28:30 -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
Linus Nordberg	538ca4153a	Invoke binaries in $PATH rather than by absolute path. ... That security measure costs more than it gives. So, keep your PATH sane and we can run this script on more than one system.	2013-06-18 11:48:02 +02: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
dana koch	7f67becf30	Instead of testing for __GNUC__, use CHECK_SCANF, like CHECK_PRINTF. ... This lets us have the possibility of fine-tuning the check in the tor_sscanf test cases at a later date.	2013-06-14 10:52:00 -04:00
Linus Nordberg	b567efcfff	Use CHUTNEY_PATH to find Chutney.	2013-06-14 14:17:42 +02: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	2338681efb	Define SEEK_SET for platforms that lack it.	2013-06-13 21:56:35 -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
Linus Nordberg	c82d7950ad	Add make target test-network running traffic tests in a Chutney network. ... This implements ticket #8530.	2013-06-13 16:33:56 +02: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
Marek Majkowski	16d1dd134a	Fix #9043 - simplyfy the code and use EVP_PKEY_cmp instead of pkey_eq / tor_tls_evp_pkey_eq	2013-06-12 13:02:06 -04:00
Nick Mathewson	616fd790ec	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-12 13:01:14 -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
Nick Mathewson	fff9386af8	Revert "Use the FILE_SHARE_DELETE flag for CreateFile on a mapping" ... This reverts commit 884a0e269c. I'm reverting this because it doesn't actually make the problem go away. It appears that instead we need to do unmap-then-replace.	2013-06-12 10:45:48 -04:00
Nick Mathewson	a64d062c95	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-12 10:01:10 -04:00
Nick Mathewson	3bdc4e5fee	Merge remote-tracking branch 'public/bug2077_share_delete' into maint-0.2.4	2013-06-12 10:00:33 -04:00
Nick Mathewson	884a0e269c	Use the FILE_SHARE_DELETE flag for CreateFile on a mapping ... A comment by rransom on #8795 taken together with a comment by doorss recorded on #2077 suggest that *every* attempt to replace the md cache will fail on Vista/Win7 if we don't have the FILE_SHARE_DELETE flag passed to CreateFile, and if we try to replace the file ourselves before unmapping it. I'm adding the FILE_SHARE_DELETE, since that's this simplest fix. Broken indexers (the favored #2077 hypothesis) could still cause trouble here, but at least this patch should make us stop stepping on our own feet. Likely fix for #2077 and its numerous duplicates. Bugfix on 0.2.2.6-alpha, which first had a microdescriptor cache that would get replaced before remapping it.	2013-06-12 09:53:46 -04:00
Nick Mathewson	4f4fc63fea	Expand microdesc cache tests ... Is it possible that *every* attempt to replace the microdesc cache on windows 7 is going to fail because of our lack of FILE_SHARE_DELETE while opening the file? If so, this test will catch #2077 and let us know when it's fixed.	2013-06-12 09:30:09 -04:00
Linus Nordberg	c132427db4	Hide consensus download interval, depending on TestingTorNetwork, in a macro.	2013-06-10 23:04:20 +02:00
Arlo Breault	6fc3997307	Fix tor-fw-helper exit code. ... It's returning the number of initialized backends. (changes file added by nickm; this is a fix for bug #9030)	2013-06-10 14:28:21 -04:00
Nick Mathewson	c94f6b228b	Fix "make check-spaces"	2013-06-10 13:51:53 -04:00
Nick Mathewson	7f9066ceee	Make OPENSSL_free(dh_string_repr) conditional.	2013-06-10 13:49:13 -04:00
Nick Mathewson	aaaf082ed6	Merge remote-tracking branch 'majek/bug5170'	2013-06-10 13:47:57 -04: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	4835faebf5	Merge branch 'bug9017' into maint-0.2.3	2013-06-10 12:25:14 -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
Marek Majkowski	d769cd82b5	Bug #5170 - make pkey_eq testable, introduce test_tortls.c	2013-06-10 16:21:39 +01:00
Marek Majkowski	e4f51682bc	Bug #5170 - test crypto_pk_get_all_digests	2013-06-10 15:03:18 +01: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
Marek Majkowski	68be3469c5	Bug 5170 - simplify i2d_PublicKey in pkey_eq	2013-06-06 13:32:46 +01:00
Marek Majkowski	a022930fda	Bug #5170 - simplify i2d_X509	2013-06-06 12:45:25 +01:00
Marek Majkowski	6f1c67195c	Bug #5170 - also simplify i2d_DHparams	2013-06-06 12:13:24 +01:00
Marek Majkowski	2132d036e3	Bug #5170 - i2d_RSAPublicKey supports allocating its own output buffer	2013-06-06 11:45:35 +01:00
Nick Mathewson	bcdc002269	Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013'	2013-06-05 11:22:48 -04:00
Nick Mathewson	7159e19ea9	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-06-05 11:22:36 -04:00
Nick Mathewson	c860a96ecb	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2013-06-05 11:22:19 -04:00
Nick Mathewson	fe689de084	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	2013-06-05 11:22:02 -04:00
Karsten Loesing	d34753174e	Update to the June 2013 GeoIP database.	2013-06-05 08:43:03 +02:00
Karsten Loesing	9b233acd03	Remove 9 now unused manual A1 substitutions.	2013-06-05 08:40:39 +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	4d7ac69f05	Fix windows compilation warning in test_config.c ... bugfix on 78cc5833a1da038331186ddf07f4add7f8f1094b; bug not in any released Tor. Spotted by weasel using Jenkins.	2013-05-29 12:08:28 -04: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
Nick Mathewson	58721ac24c	Tweak 4282 unit tests for style, safety, correctness. ... We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.	2013-05-24 13:31:10 -04:00
Peter Retzlaff	78cc5833a1	Unit tests for check_or_create_data_subdir and write_to_data_subdir.	2013-05-24 13:13:21 -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	826daaf726	Merge remote-tracking branch 'karsten/geoip-manual-update-may2013'	2013-05-20 12:42:36 -04:00
Nick Mathewson	c90c370ab3	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-05-20 12:37:58 -04:00
Nick Mathewson	0c2fb64d6f	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2013-05-20 12:37:21 -04:00
Nick Mathewson	78735f8778	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	2013-05-20 12:34:59 -04: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
Arlo Breault	0ab38b9366	Remove PK_PKCS1_PADDING ... See #8792	2013-05-17 10:11:33 -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	95c34399cf	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-05-15 14:35:37 -04:00
Nick Mathewson	31a6b4e11f	Fix unit tests to pass after fix for #8879	2013-05-15 14:34:59 -04: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
Karsten Loesing	f8053179c9	Update to the May 2013 GeoIP database.	2013-05-13 15:37:43 +02:00
Karsten Loesing	d93caf7f0a	Update GeoIP file script and manual substitutions. ... Script changes now catch more cases when our manual substitutions need to be updated. Manual substitutions are updated to May 2013 database.	2013-05-13 15:35:01 +02:00
Arlo Breault	73b98948a2	Remove strcpy from unit tests. ... See #8790.	2013-05-11 23:33:41 -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	54f41d68e9	Add some unit tests for fp_pair_map_t to test/containers.c based on the strmap tests	2013-05-09 10:55:07 -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
Nick Mathewson	8f21838ee5	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-05-08 13:01:58 -04:00
Nick Mathewson	7d3fd85838	Fix bug 8845: check the right length of memory in aes unit tests ... This couldn't actually be a buffer overrun unless AES somehow turned into memcpy, but still it's good to fix it.	2013-05-08 12:59:43 -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	9fec0c1a95	Remove a double-newline	2013-04-18 11:14: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	4b15606fa2	Add unit test for encoding ntor key in routerinfo	2013-04-18 11:04:58 -04:00
Nick Mathewson	cb74b5a152	Remove the unused pk3 variable from test_dir_formats	2013-04-18 11:04:58 -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	4d672f3ae3	Test networkstatus_getinfo_helper_single	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
Roger Dingledine	d028c005da	socks5 will ask for username/password if we offer it ... Commit a264c4fe made the socks5 server prefer auth 2 if it's offered, but it didn't update the unit test to expect it.	2013-04-11 10:37:41 -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
Roger Dingledine	7ed1af3671	socks5 will ask for username/password if we offer it ... Commit a264c4fe made the socks5 server prefer auth 2 if it's offered, but it didn't update the unit test to expect it.	2013-04-11 02:53:26 -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	5d4f43eb4a	Merge remote-tracking branch 'karsten/geoip-manual-update-apr2013'	2013-04-08 11:10:37 -04:00
Nick Mathewson	1bbfadfa61	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-08 11:10:07 -04:00
Nick Mathewson	6acf0ac285	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2013-04-08 11:09:50 -04:00
Nick Mathewson	9630fb917f	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	2013-04-08 11:09:26 -04:00
Karsten Loesing	b41f03f6df	Update to the April 2013 GeoIP database.	2013-04-08 12:18:40 +02:00
Karsten Loesing	c8925550c6	Manually fix 'A1' ranges. ... MaxMind changed twelve 'A1' ranges in their April 2013 database that the the substitution algorithm couldn't fix. Fix them manually.	2013-04-08 12:13:12 +02:00
Nick Mathewson	25f9ecf4b2	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-05 16:58:26 -04:00
Nick Mathewson	3367a7611e	Merge remote-tracking branch 'desoxy/bug-8596' into maint-0.2.4	2013-04-05 16:57:53 -04:00
Nick Mathewson	55817c4c50	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-04-05 16:53:07 -04:00
Peter Palfrader	d1dc23c938	test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638)	2013-04-05 16:51:48 -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	80e9ca411f	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-23 18:51:15 -04:00
Nick Mathewson	8b6a952c94	Avoid clang warnings from implicit off_t->size_t cast	2013-03-23 18:50:21 -04:00
Nick Mathewson	9a6514ce4f	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-22 12:41:16 -04:00
Nick Mathewson	1b6b8b0564	Fix an uninitialized-var warning in unit tests ... Found by formorer; fix on 42fb61d172, not in any released Tor.	2013-03-22 12:38:55 -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	294c89f238	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-21 07:53:46 -04:00
Nick Mathewson	42fb61d172	Fix a small memory leak in the unit tests ... Found by coverity; this is CID 992692.	2013-03-21 07:52:36 -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	60fd08f40b	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-19 15:13:07 -04:00
Nick Mathewson	60d1442136	Merge remote-tracking branch 'public/bug7768' into maint-0.2.4	2013-03-19 15:11:47 -04:00
David Fifield	03efe54027	Use option name --test-commandline in tor-fw-helper. ... It was previously --Test in the help output and --test-commandline in the getopt call. The man page already had --test. (Originally by David, who resolved the tie in favor of "--test"; I chose --test-commandline" instead so that nothing that depended on it could break. -Nick)	2013-03-19 15:09:44 -04:00
Nick Mathewson	01af92fede	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-19 14:27:00 -04:00
Nick Mathewson	8d29866bec	Merge remote-tracking branch 'public/bug8002' into maint-0.2.4	2013-03-19 14:26:45 -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
Nick Mathewson	899c2805b1	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 15:57:51 -04:00
Nick Mathewson	bd9901bef2	Handle TRUNCATE correctly if our next channel isn't done yet. ... Patch from 'cypherpunks'. Fixes bug #7947. Bugfix on 0.0.7.1.	2013-03-18 15:55:55 -04:00
Nick Mathewson	d404b0200f	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 15:46:01 -04:00
Nick Mathewson	aa4fcc4f13	Merge remote-tracking branch 'public/bug6164' into maint-0.2.4	2013-03-18 15:45:49 -04:00
Nick Mathewson	e5b79b5bb5	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 15:44:45 -04:00
Nick Mathewson	0b827cbcb1	Fix another case of bug 8206; patch from flupzor	2013-03-18 15:44:23 -04:00
Nick Mathewson	19d6650f81	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 15:41:14 -04:00
Nick Mathewson	eff1cfaaf7	Merge remote-tracking branch 'public/bug6673' into maint-0.2.4	2013-03-18 15:40:50 -04:00
Nick Mathewson	c8c86c9b23	Fix a double-newline	2013-03-18 15:39:47 -04:00
Nick Mathewson	5124bc251a	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 15:39:21 -04:00
Nick Mathewson	ad8a27a393	Fix some wide lines	2013-03-18 15:39:11 -04:00
Nick Mathewson	a88f3e24ea	Merge remote-tracking branch 'origin/maint-0.2.4' ... Conflicts: src/test/test_addr.c	2013-03-18 15:29:32 -04:00
Nick Mathewson	2ac66e59f7	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 ... Conflicts: src/test/test_addr.c	2013-03-18 15:28:39 -04:00
Nick Mathewson	ebb95d0f78	Merge remote-tracking branch 'public/bug8377' into maint-0.2.3	2013-03-18 15:27:50 -04:00
Nick Mathewson	67709398b6	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 15:18:56 -04:00
Nick Mathewson	5959d1c105	Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4	2013-03-18 15:17:11 -04:00
Nick Mathewson	41cff47c6a	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 15:16:11 -04:00
Nick Mathewson	3f837d4826	Make stream events for RESOLVE lookups more consistent ... Fixes 8203; patch by Desoxy	2013-03-18 15:13:59 -04:00
Andrea Shepard	0164f16f70	Improve comment for routers_with_measured_bw static var in dirserv.c	2013-03-18 12:04:41 -07:00
Andrea Shepard	e9bdb695e8	Improve comment on router_counts_toward_thresholds()	2013-03-18 11:58:30 -07:00
Andrea Shepard	d64e5969f4	Add dirserv_has_measured_bw() predicate wrapper for dirserv_query_measured_bw_cache()	2013-03-18 11:56:42 -07:00
Nick Mathewson	f15d9cf5db	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 14:50:36 -04:00
Nick Mathewson	26639b7798	Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4	2013-03-18 14:50:01 -04:00
Nick Mathewson	1512747656	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 14:32:18 -04:00
Nick Mathewson	173efa1051	Merge remote-tracking branch 'public/bug8059' into maint-0.2.4	2013-03-18 14:31:50 -04:00
Nick Mathewson	a770e1cc22	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 14:30:28 -04:00
Nick Mathewson	57ffef3f89	Remove an unused local variable.	2013-03-18 14:30:11 -04:00
Nick Mathewson	63b67577d6	Check return values from fcntl and setsockopt ... (Based on a patch from flupzor; bug #8206)	2013-03-18 14:28:38 -04:00
Nick Mathewson	3fa9c9b688	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-18 14:24:30 -04:00
Nick Mathewson	eb9420082d	Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 support ... Fixes bug 8464; bugfix on b2863739 in 0.2.4.8-alpha	2013-03-18 14:23:19 -04:00
Andrea Shepard	f93f7e331b	Ignore advertised bandwidths if we have enough measured bandwidths available	2013-03-18 11:15:21 -07:00
Nick Mathewson	f48daef299	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-15 12:38:55 -04:00
Nick Mathewson	8b4728ebd6	Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4	2013-03-15 12:38:11 -04:00
Nick Mathewson	686aaa5c4c	Upgrade the warn for EntryNodes without UseEntryGuards to an error ... fixes bug 8180	2013-03-15 12:34:29 -04:00
Nick Mathewson	b163e801bc	Merge remote-tracking branch 'origin/maint-0.2.4' ... Conflicts: src/or/routerlist.c	2013-03-15 12:20:17 -04:00
Nick Mathewson	0cf327dc78	Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4	2013-03-15 12:17:23 -04:00
Nick Mathewson	e4d2177d31	Fix some basic socket issues with tor-fw-helper-natpmp on windows ... This isn't going to be the last of these issues, but we might as well take the fixes as we find them. Patch from Gisle Vanem, fixes bug 7280.	2013-03-15 12:11:38 -04:00
David Fifield	a0b92cd800	Fix brackets in tor-fw-helper help output. ... Change nesting from [(]) to [()]. Formerly it made it look to me at first glance that "internal port" was optional. [Trivial change; fixes #7767 --nickm]	2013-03-15 11:23:47 -04:00
Nick Mathewson	9be3389dc7	Merge remote-tracking branch 'origin/maint-0.2.4'	2013-03-14 12:06:58 -04:00
Nick Mathewson	653b09e1ec	Make circuit_purpose_to_string handle CIRCUIT_PURPOSE_PATH_BIAS_TESTING	2013-03-14 12:06:03 -04:00
Nick Mathewson	1b28f366b8	Apply ClientDNSRejectInternalAddresses to IPv6 in RESOLVED cells ... Fixes bug 8475; bugfix on 0.2.0.7-alpha.	2013-03-14 11:19:08 -04:00
Nick Mathewson	adfc3de833	Log fname:lineno in log messages for #7164 ... This should help us track down #7164 at last.	2013-03-13 10:42:58 -04:00