torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,168 Commits 53 Branches 631 Tags
fa0c5da68ba472eed004cd87f198854885cff453
Commit Graph

18168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Kadianakis fa0c5da68b Rename the got_hup element of managed proxies. 
Since we need to toggle that element in non-SIGHUP situations too where
the config was re-read (like in SETCONF or RESETCONF).
 2014-04-23 11:05:45 -04:00
George Kadianakis bf7cb6acf6 Don't halt bootstrap to figure out if we should restart PT proxies. 
Instead, figure out if we should restart PT proxies _immediately_ after
we re-read the config file.
 2014-04-23 11:05:45 -04:00
Nick Mathewson fffc59b0e9 Merge remote-tracking branch 'public/bug9841_025' 2014-04-08 12:06:03 -04:00
Nick Mathewson f0bce2dc35 Fix some harmless/untriggerable memory leaks found by coverity 2014-04-07 23:20:13 -04:00
Nick Mathewson 595303fd1e Merge remote-tracking branch 'public/bug10363_024_squashed' 2014-04-07 23:03:04 -04:00
Nick Mathewson 6d9c332757 Another 10363 instance -- this one in the eventdns.c code 2014-04-07 22:56:42 -04:00
Nick Mathewson 9dd115d6b5 Another 10363 instance: this one in tor_memmem fallback code 2014-04-07 22:56:42 -04:00
Nick Mathewson 092ac26ea2 Fix undefined behavior with pointer addition in channeltls.c 
In C, it's a bad idea to do this:

   char *cp = array;
   char *end = array + array_len;

   /* .... */

   if (cp + 3 >= end) { /* out of bounds */ }

because cp+3 might be more than one off the end of the array, and
you are only allowed to construct pointers to the array elements,
and to an element one past the end.  Instead you have to say

   if (cp - array + 3 >= array_len) { /* ... */ }

or something like that.

This patch fixes two of these: one in process_versions_cell
introduced in 0.2.0.10-alpha, and one in process_certs_cell
introduced in 0.2.3.6-alpha.  These are both tracked under bug
10363. "bobnomnom" found and reported both. See also 10313.

In our code, this is likely to be a problem as we used it only if we
get a nasty allocator that makes allocations end close to (void*)-1.
But it's best not to have to worry about such things at all, so
let's just fix all of these we can find.
 2014-04-07 22:56:42 -04:00
Nick Mathewson 84df7d73c9 Merge branch 'bug9665_redux' 2014-04-07 22:20:13 -04:00
Nick Mathewson 74195db6b6 Changes file for bug9665 2014-04-07 22:19:56 -04:00
Nick Mathewson 90341b4852 For missing transport, say "PT_MISSING" not "NO_ROUTE" 2014-04-07 13:44:22 -04:00
Nick Mathewson 754a50592c Forward-port bug9665 fix to work with our fix for 11069 2014-04-07 13:41:07 -04:00
Fábio J. Bertinatto 08ae53e400 Fix bug9665 2014-04-07 13:36:36 -04:00
Nick Mathewson bc0882c868 Merge remote-tracking branch 'public/bug9650' 2014-04-05 14:53:48 -04:00
Nick Mathewson 2ff664ee20 Merge remote-tracking branch 'public/bug10801_024' 
Conflicts:
	src/common/address.c
	src/or/config.c
 2014-04-05 14:50:57 -04:00
Nick Mathewson b3469e4207 Make tor_addr_port_parse handle portless IPv6 addresses correctly. 
(Not a bugfix on any Tor release; before 10801_024, it didn't handle
portless addresses at all.)
 2014-04-05 14:41:37 -04:00
Nick Mathewson eefa3ebc78 Add a test for default/port conflicts in tor_addr_port_parse 2014-04-05 14:18:39 -04:00
Nick Mathewson 8f16a77d6a Protocol_Warn when a rendezvous cookie is used twice. 2014-04-04 12:17:16 -04:00
Nick Mathewson d22ce149c8 Test for circuit_set_rend_token(.,.,NULL) 2014-04-04 12:06:54 -04:00
Nick Mathewson 1bb6e3b503 Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025 2014-04-04 12:05:51 -04:00
Nick Mathewson 09dbcf3b82 Fix to 9841 fix: setting a token to NULL should clear it 
Found by testing with chutney.  The old behavior was "fail an
assertion", which obviously isn't optimal.

Bugfix on 8b9a2cb68b290e550695124d7ef0511225b451d5; bug not in any
released version.
 2014-04-04 12:01:49 -04:00
Nick Mathewson d290e36576 Fix make_socket_reusable() on windows. Bug not in any released Tor 2014-04-02 21:11:45 -04:00
Nick Mathewson 24c4b56a39 Merge remote-tracking branch 'public/bug10081' 2014-04-02 15:45:20 -04:00
Nick Mathewson da908a593f Unit tests for connection_edge_process_resolved_cell 
Also rename a function to be more accurate (resolve->resolved)
 2014-04-02 15:38:00 -04:00
Nick Mathewson 4215c801ff Tests for resolved_cell_parse 2014-04-02 15:38:00 -04:00
Nick Mathewson c230ff4ca9 Look at all of a RESOLVED cell; not just the first answer. 
Also, stop accepting the old kind of RESOLVED cells with no TTL
fields; they haven't been sent since 0.1.1.6-alpha.

This patch won't work without the fix to #10468 -- it will break
DNSPorts unless they set the proper ipv4/6 flags on entry_connection_t.
 2014-04-02 15:38:00 -04:00
Nick Mathewson 4fb3ae69a6 Extract code to handle RESOLVED cells 
No other changes have been made; only code has been moved.
 2014-04-01 23:30:41 -04:00
Nick Mathewson 17d5734df4 Merge remote-tracking branch 'public/bug11278' 2014-04-01 21:56:49 -04:00
Nick Mathewson 86f619d0d3 Merge remote-tracking branch 'public/bug10468_024' 2014-04-01 21:50:55 -04:00
Nick Mathewson fc9e84062b Merge remote-tracking branch 'public/bug4645' 
Conflicts:
	src/or/dirserv.c
 2014-04-01 21:49:01 -04:00
Nick Mathewson 408bd98e79 Add one more missing heck on bug4645 fixes 2014-04-01 21:10:14 -04:00
Nick Mathewson dfc32177d9 Merge remote-tracking branch 'origin/maint-0.2.4' 2014-04-01 21:00:30 -04:00
Nick Mathewson 48578e1512 Merge branch 'bug9213_doc_024' into maint-0.2.4 2014-04-01 20:59:13 -04:00
Nick Mathewson a68e6ea9c0 Fix documentation of torrc search order 
We are searching @CONFDIR@ before $HOME, but the documentation
implied otherwise.

I screwed this up in f5e86bcd6c, when I
first documented the $HOME/.torrc possibility.

Fix for bug 9213; bugfix on 0.2.3.18-rc.
 2014-04-01 20:56:03 -04:00
Nick Mathewson b4b91864bb Merge remote-tracking branch 'public/bug9870' 
Conflicts:
	src/or/config.c
 2014-04-01 20:48:15 -04:00
Nick Mathewson 6bef082d0a Merge remote-tracking branch 'public/bug11232' 2014-04-01 09:39:48 -04:00
Nick Mathewson c0441cca8b Merge branch 'bug8787_squashed' 2014-03-31 11:57:56 -04:00
Nick Mathewson 3118af2d5f changes file for bug8787 2014-03-31 11:57:40 -04:00
Nick Mathewson 1a9b4bd28c Munmap the right pointers in routerlist_free() 2014-03-31 11:43:51 -04:00
Nick Mathewson 449b87791d NULL out all mappings after tor_munmap_file() 2014-03-31 11:42:49 -04:00
Nick Mathewson 8e94d5f22e Check return values for tor_munmap_file() in unit tests 2014-03-31 11:40:00 -04:00
Nick Mathewson 7cdb50e866 Handle tor_munmap_file(NULL) consistently 2014-03-31 11:35:39 -04:00
Andrea Shepard dea8190111 Check strftime() return in tortls.c 2014-03-31 11:27:08 -04:00
Andrea Shepard 0938c20fa3 Eliminate lseek() with unchecked return in tor_mmap_file() 2014-03-31 11:27:08 -04:00
Andrea Shepard abdf1878a3 Always check returns from unlink() 2014-03-31 11:27:08 -04:00
Andrea Shepard df076eccfa Always check returns from tor_munmap_file() in microdesc.c 2014-03-31 11:27:08 -04:00
Andrea Shepard 947a6daa31 Always check returns from tor_munmap_file() in routerlist.c 2014-03-31 11:27:08 -04:00
Andrea Shepard 389251eda9 Add return value and assert for null parameter to tor_munmap_file() 2014-03-31 11:27:08 -04:00
Nick Mathewson 4ebad0d947 Merge remote-tracking branch 'public/build_torrify_manpage_again' 2014-03-31 10:52:09 -04:00
Nick Mathewson f82e499aa5 Merge remote-tracking branch 'public/bug11342' 2014-03-31 10:51:09 -04:00