]>
git.ipfire.org Git - thirdparty/tor.git/log
Francisco Blas Izquierdo Riera (klondike) [Tue, 23 Dec 2014 15:51:36 +0000 (10:51 -0500)]
Add the transparent proxy getsockopt to the sandbox
When receiving a trasnsparently proxied request with tor using iptables tor
dies because the appropriate getsockopt calls aren't enabled on the sandbox.
This patch fixes this by adding the two getsockopt calls used when doing
transparent proxying with tor to the sandbox for the getsockopt policy.
This patch is released under the same license as the original file as
long as the author is credited.
Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
Francisco Blas Izquierdo Riera (klondike) [Tue, 23 Dec 2014 15:51:33 +0000 (10:51 -0500)]
Use the appropriate call to getsockopt for IPv6 sockets
The original call to getsockopt to know the original address on transparently
proxyed sockets using REDIRECT in iptables failed with IPv6 addresses because
it assumed all sockets used IPv4.
This patch fixes this by using the appropriate options and adding the headers
containing the needed definitions for these.
This patch is released under the same license as the original file as
long as the author iscredited.
Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
Nick Mathewson [Mon, 22 Dec 2014 21:06:05 +0000 (16:06 -0500)]
Tweak channel unit tests so we don't see coverity complaints
channel_write_*_cell() can delete its argument, so coverity doesn't
like us doing pointer comparison against that argument later.
Silly.
Nick Mathewson [Mon, 22 Dec 2014 21:02:47 +0000 (16:02 -0500)]
Merge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Mon, 22 Dec 2014 20:58:49 +0000 (15:58 -0500)]
Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5
Nick Mathewson [Mon, 22 Dec 2014 17:56:35 +0000 (12:56 -0500)]
When decoding a base-{16,32,64} value, clear the target buffer first
This is a good idea in case the caller stupidly doesn't check the
return value from baseX_decode(), and as a workaround for the
current inconsistent API of base16_decode.
Prevents any fallout from bug 14013.
Nick Mathewson [Mon, 22 Dec 2014 17:27:26 +0000 (12:27 -0500)]
Fix a bunch of memory leaks in the unit tests. Found with valgrind
Nick Mathewson [Mon, 22 Dec 2014 16:13:11 +0000 (11:13 -0500)]
Coverity complained that we were not checking this return value
Nick Mathewson [Mon, 22 Dec 2014 16:13:01 +0000 (11:13 -0500)]
Fix some coverity issues in the unit tests
Nick Mathewson [Mon, 22 Dec 2014 15:54:09 +0000 (10:54 -0500)]
Reflow the changelog again
Nick Mathewson [Mon, 22 Dec 2014 15:53:52 +0000 (10:53 -0500)]
Rewrite some changelog entries
Nick Mathewson [Mon, 22 Dec 2014 15:12:43 +0000 (10:12 -0500)]
Relabel some changelog items; re-sort them into place
Nick Mathewson [Mon, 22 Dec 2014 15:06:56 +0000 (10:06 -0500)]
minor teaks fo the changelog
Nick Mathewson [Mon, 22 Dec 2014 15:03:19 +0000 (10:03 -0500)]
Auto-reformat the changelog for 0.2.6.2-alpha
Nick Mathewson [Mon, 22 Dec 2014 15:02:18 +0000 (10:02 -0500)]
Start on a changelog for 0.2.6.2-alpha
Nick Mathewson [Mon, 22 Dec 2014 15:00:34 +0000 (10:00 -0500)]
have lintchanges check header format.
Nick Mathewson [Mon, 22 Dec 2014 14:49:33 +0000 (09:49 -0500)]
Resolve issues in changes files
Nick Mathewson [Mon, 22 Dec 2014 14:34:55 +0000 (09:34 -0500)]
Short python script to lint the changes files
Nick Mathewson [Sun, 21 Dec 2014 19:48:53 +0000 (14:48 -0500)]
Merge branch 'ticket7356_squashed'
rl1987 [Tue, 16 Dec 2014 18:52:05 +0000 (20:52 +0200)]
Fixing mistake in comment.
rl1987 [Sun, 23 Nov 2014 19:52:50 +0000 (21:52 +0200)]
Changes file for 7356
rl1987 [Sun, 23 Nov 2014 19:42:46 +0000 (21:42 +0200)]
Using channel state lookup macros in connection_or.c.
rl1987 [Sun, 23 Nov 2014 19:34:41 +0000 (21:34 +0200)]
Using CHANNEL_FINISHED macro in connection.c
rl1987 [Sun, 23 Nov 2014 19:27:15 +0000 (21:27 +0200)]
Using channel state lookup macros in circuitlist.c.
rl1987 [Sun, 23 Nov 2014 19:17:15 +0000 (21:17 +0200)]
Using CHANNEL_IS_OPEN macro in circuitbuild.c
rl1987 [Sun, 23 Nov 2014 19:12:47 +0000 (21:12 +0200)]
Using channel state lookup macros in circuitbias.c.
rl1987 [Sun, 23 Nov 2014 19:02:00 +0000 (21:02 +0200)]
Using channel state lookup macros in channeltls.c
rl1987 [Sun, 23 Nov 2014 18:53:13 +0000 (20:53 +0200)]
Use channel state lookup macros in channel.c
rl1987 [Sun, 23 Nov 2014 18:52:24 +0000 (20:52 +0200)]
Using macros and inline function for quick lookup of channel state.
Nick Mathewson [Sun, 21 Dec 2014 18:37:40 +0000 (13:37 -0500)]
Merge remote-tracking branch 'teor/bug14002-osx-transproxy-ipfw-pf'
teor [Sun, 21 Dec 2014 18:36:06 +0000 (13:36 -0500)]
Make log bufer 10k, not 9.78k.
teor [Sun, 21 Dec 2014 18:35:42 +0000 (13:35 -0500)]
Fix a comment in tor_addr_parse
teor [Sat, 20 Dec 2014 11:20:54 +0000 (22:20 +1100)]
Fix clang warning, IPv6 address comment, buffer size typo
The address of an array in the middle of a structure will
always be non-NULL. clang recognises this and complains.
Disable the tautologous and redundant check to silence
this warning.
Fixes bug 14001.
teor [Sat, 20 Dec 2014 11:27:21 +0000 (22:27 +1100)]
Fix transparent proxy checks to allow OS X to use ipfw or pf
OS X uses ipfw (FreeBSD) or pf (OpenBSD). Update the transparent
proxy option checks to allow for both ipfw and pf on OS X.
Fixes bug 14002.
Nick Mathewson [Fri, 19 Dec 2014 19:12:35 +0000 (14:12 -0500)]
LLONG_MIN => INT64_MIN.
Nick Mathewson [Fri, 19 Dec 2014 19:12:22 +0000 (14:12 -0500)]
Define an int64_min when it is missing
Karsten Loesing [Fri, 19 Dec 2014 17:37:43 +0000 (18:37 +0100)]
Fix unit test.
Looks like we forgot to update unit tests when we switched from 32-bit to
64-bit ints while tweaking
7cd53b7 .
Nick Mathewson [Fri, 19 Dec 2014 15:35:47 +0000 (10:35 -0500)]
Merge branch 'asn-karsten-task-13192-5-squashed'
George Kadianakis [Thu, 18 Dec 2014 15:44:47 +0000 (17:44 +0200)]
HS stats: Add changes file and improve man page.
George Kadianakis [Tue, 2 Dec 2014 12:20:35 +0000 (12:20 +0000)]
Add two hidden-service related statistics.
The two statistics are:
1. number of RELAY cells observed on successfully established
rendezvous circuits; and
2. number of .onion addresses observed as hidden-service
directory.
Both statistics are accumulated over 24 hours, obfuscated by rounding
up to the next multiple of a given number and adding random noise,
and written to local file stats/hidserv-stats.
Notably, no statistics will be gathered on clients or services, but
only on relays.
Nick Mathewson [Fri, 19 Dec 2014 14:38:46 +0000 (09:38 -0500)]
Merge remote-tracking branch 'dgoulet/bug13936_025_v2'
David Goulet [Wed, 10 Dec 2014 18:05:41 +0000 (13:05 -0500)]
Fix: call circuit_has_opened() for rendezvous circuit
In circuit_get_open_circ_or_launch(), for a rendezvous circuit,
rend_client_rendcirc_has_opened() but circuit_has_opened() is preferred here
since it will call the right function for a specific circuit purpose.
Furthermore, a controller event is triggered where the former did not.
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
Nick Mathewson [Fri, 12 Dec 2014 13:54:07 +0000 (08:54 -0500)]
fix a long line
Nick Mathewson [Fri, 12 Dec 2014 13:53:42 +0000 (08:53 -0500)]
Reference bug number in changes file
Nick Mathewson [Fri, 12 Dec 2014 13:53:14 +0000 (08:53 -0500)]
Merge remote-tracking branch 'meejah/ticket-13941-b'
Nick Mathewson [Fri, 12 Dec 2014 13:49:52 +0000 (08:49 -0500)]
Tweak 13942 fix
meejah [Thu, 11 Dec 2014 05:15:04 +0000 (22:15 -0700)]
Pre-check hidden-service-dir permissions/ownership
See ticket #13942 where Tor dies if you feed it a hidden service
directory with the wrong owner via SETCONF.
meejah [Thu, 11 Dec 2014 05:30:14 +0000 (22:30 -0700)]
Fix 13941: make calling log_new_relay_greeting() optional.
Specifically, only if we're creating secret_id_key do we log the
greeting (and then only if the key is actually created).
Karsten Loesing [Mon, 8 Dec 2014 14:00:58 +0000 (15:00 +0100)]
Add better support to obfuscate statistics.
Roger Dingledine [Wed, 10 Dec 2014 06:10:44 +0000 (01:10 -0500)]
when somebody uploads too much, say who tried it
rl1987 [Sun, 7 Dec 2014 13:47:09 +0000 (15:47 +0200)]
Use END_CIRC_REASON_TORPROTOCOL instead of magic number.
Nick Mathewson [Thu, 4 Dec 2014 14:19:44 +0000 (09:19 -0500)]
Add fakechans.h to noinst_headers
Nick Mathewson [Thu, 4 Dec 2014 14:16:49 +0000 (09:16 -0500)]
Fix more 64/32 warnings in test_channel.c
Nick Mathewson [Thu, 4 Dec 2014 14:11:13 +0000 (09:11 -0500)]
Initialize libevent in circuitmux/destroy_cell_queue test
George Kadianakis [Mon, 1 Dec 2014 16:12:05 +0000 (16:12 +0000)]
Constify crypto_pk_get_digest().
Nick Mathewson [Fri, 28 Nov 2014 15:06:10 +0000 (10:06 -0500)]
Fix some 32-bit build issues in the tests
When comparing 64-bit types, you need to use tt_[ui]64_op().
Found by Jenkins
Nick Mathewson [Fri, 28 Nov 2014 14:18:17 +0000 (09:18 -0500)]
Fix a signed/unsigned comparison warning in scheduler_run
Nick Mathewson [Fri, 28 Nov 2014 04:24:03 +0000 (23:24 -0500)]
Fix a memory leak in rend_services_introduce
This is CID
1256187 ; bug not in any released tor.
Nick Mathewson [Fri, 28 Nov 2014 04:21:46 +0000 (23:21 -0500)]
Fix a likely bug found by coverity in test_scheduler.c.
Andrea, do you agree with this?
This is CID
1256186
Nick Mathewson [Fri, 28 Nov 2014 04:05:21 +0000 (23:05 -0500)]
Tweak global_scheduler changes file
Nick Mathewson [Fri, 28 Nov 2014 03:57:04 +0000 (22:57 -0500)]
One more, appease "make check-spaces"
Nick Mathewson [Fri, 28 Nov 2014 03:51:13 +0000 (22:51 -0500)]
Fix some issues with the scheduler configuration options
1) Set them to the values that (according to Rob) avoided performance
regressions. This means that the scheduler won't get much exercise
until we implement KIST or something like it.
2) Rename the options to end with a __, since I think they might be
going away, and nobody should mess with them.
3) Use the correct types for the option variables. MEMUNIT needs to be a
uint64_t; UINT needs to be (I know, I know!) an int.
4) Validate the values in options_validate(); do the switch in
options_act(). This way, setting the option to an invalid value on
a running Tor will get backed out.
Nick Mathewson [Fri, 28 Nov 2014 03:42:03 +0000 (22:42 -0500)]
Fix a 64-bit clang warning
Nick Mathewson [Fri, 28 Nov 2014 03:39:46 +0000 (22:39 -0500)]
Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
Conflicts:
src/or/or.h
src/test/Makefile.nmake
Nick Mathewson [Wed, 26 Nov 2014 14:03:30 +0000 (09:03 -0500)]
Merge remote-tracking branch 'public/bug13126'
Conflicts:
src/or/or.h
Nick Mathewson [Tue, 25 Nov 2014 17:49:09 +0000 (12:49 -0500)]
Merge branch 'feature9503_squashed'
rl1987 [Tue, 4 Nov 2014 17:29:29 +0000 (19:29 +0200)]
Sending response to SIGNAL HEARTBEAT controller command.
rl1987 [Sun, 2 Nov 2014 17:14:58 +0000 (19:14 +0200)]
Adding 'SIGNAL HEARTBEAT' message that causes unscheduled heartbeat.
Nick Mathewson [Mon, 24 Nov 2014 14:19:22 +0000 (09:19 -0500)]
Merge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Mon, 24 Nov 2014 14:19:06 +0000 (09:19 -0500)]
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Mon, 24 Nov 2014 14:18:36 +0000 (09:18 -0500)]
Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4
Nick Mathewson [Mon, 24 Nov 2014 14:18:21 +0000 (09:18 -0500)]
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Karsten Loesing [Mon, 24 Nov 2014 13:23:18 +0000 (14:23 +0100)]
Update geoip6 to the November 15 2014 database.
Karsten Loesing [Mon, 24 Nov 2014 13:21:31 +0000 (14:21 +0100)]
Update geoip to the November 15 2014 database.
Nick Mathewson [Mon, 24 Nov 2014 06:34:17 +0000 (01:34 -0500)]
Use consistent formatting for list of directory authorities
Based on a patch from grpamp on tor-dev.
Nick Mathewson [Thu, 20 Nov 2014 17:03:46 +0000 (12:03 -0500)]
Make can_complete_circuits a static variable.
Nick Mathewson [Thu, 20 Nov 2014 16:51:36 +0000 (11:51 -0500)]
Don't build introduction circuits until we know we can build circuits
Patch from akwizgran. Ticket 13447.
Nick Mathewson [Wed, 19 Nov 2014 22:27:37 +0000 (17:27 -0500)]
Merge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Wed, 19 Nov 2014 22:26:42 +0000 (17:26 -0500)]
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Micah Anderson [Wed, 19 Nov 2014 22:22:25 +0000 (17:22 -0500)]
Update longclaw dirauth IP to be a more stable location
Nick Mathewson [Tue, 18 Nov 2014 02:16:33 +0000 (21:16 -0500)]
whoops; removed the documentation for Support022HiddenServices too
Nick Mathewson [Mon, 17 Nov 2014 16:52:10 +0000 (11:52 -0500)]
Remove Support022HiddenServices
This has been already disabled in the directory consensus for a while;
it didn't seem to break anything.
Finally closes #7803.
rl1987 [Sun, 16 Nov 2014 14:12:08 +0000 (16:12 +0200)]
Changes file for 13212.
rl1987 [Sun, 16 Nov 2014 14:06:00 +0000 (16:06 +0200)]
Rewriting comment for control_event_hs_descriptor_failed().
rl1987 [Sun, 16 Nov 2014 13:51:23 +0000 (15:51 +0200)]
Adding REASON field to HS_DESC FAILED controller event.
Nick Mathewson [Fri, 14 Nov 2014 16:19:34 +0000 (11:19 -0500)]
document that hiddenserviceport can have an ipv6 addr.for 12670
Nick Mathewson [Wed, 12 Nov 2014 20:32:15 +0000 (15:32 -0500)]
Merge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Wed, 12 Nov 2014 20:29:39 +0000 (15:29 -0500)]
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Conflicts:
src/or/config.c
Sebastian Hahn [Wed, 12 Nov 2014 18:12:18 +0000 (19:12 +0100)]
Add changes file for #13926
Micah Anderson [Sun, 9 Nov 2014 20:49:11 +0000 (15:49 -0500)]
Remove turtles as a directory authority (#13296)
Micah Anderson [Sun, 9 Nov 2014 20:48:56 +0000 (15:48 -0500)]
Add longclaw as a directory authority (#13296)
Nick Mathewson [Wed, 12 Nov 2014 18:44:57 +0000 (13:44 -0500)]
Merge remote-tracking branch 'public/bug7484'
Conflicts:
src/test/test_addr.c
Nick Mathewson [Wed, 12 Nov 2014 18:42:01 +0000 (13:42 -0500)]
Fix wide lines (from 13172)
Nick Mathewson [Wed, 12 Nov 2014 18:28:07 +0000 (13:28 -0500)]
Replace operators used as macro arguments with OP_XX macros
Part of fix for 13172
Nick Mathewson [Wed, 12 Nov 2014 18:25:17 +0000 (13:25 -0500)]
Merge branch 'ticket13172'
Nick Mathewson [Wed, 12 Nov 2014 18:15:10 +0000 (13:15 -0500)]
Reenhappy make check-spaces
Nick Mathewson [Wed, 12 Nov 2014 18:12:14 +0000 (13:12 -0500)]
Merge remote-tracking branch 'rl1987/bug13644'
Nick Mathewson [Wed, 12 Nov 2014 15:28:33 +0000 (10:28 -0500)]
tweak 9812 changes file
Nick Mathewson [Wed, 12 Nov 2014 15:27:12 +0000 (10:27 -0500)]
Merge remote-tracking branch 'rl1987/bug9812'
Nick Mathewson [Wed, 12 Nov 2014 15:23:55 +0000 (10:23 -0500)]
Merge remote-tracking branch 'public/bug13698_024_v1'