Nick Mathewson
f7e8bc2b4b
fix a long line
2014-12-12 08:54:07 -05:00
Nick Mathewson
915c9a517e
Merge remote-tracking branch 'meejah/ticket-13941-b'
2014-12-12 08:53:14 -05:00
Nick Mathewson
7c5d888977
Tweak 13942 fix
2014-12-12 08:49:52 -05:00
meejah
85bfad1875
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.
2014-12-11 18:46:56 -07:00
meejah
76753efd7b
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).
2014-12-11 18:43:51 -07:00
Roger Dingledine
b73a7600af
when somebody uploads too much, say who tried it
2014-12-10 01:10:44 -05:00
rl1987
9c239eccc9
Use END_CIRC_REASON_TORPROTOCOL instead of magic number.
2014-12-07 15:47:09 +02:00
Nick Mathewson
430f5852ac
Fix a signed/unsigned comparison warning in scheduler_run
2014-11-28 09:18:17 -05:00
Nick Mathewson
0bfadbf4b9
Fix a memory leak in rend_services_introduce
...
This is CID 1256187 ; bug not in any released tor.
2014-11-27 23:24:03 -05:00
Nick Mathewson
e2641484a7
One more, appease "make check-spaces"
2014-11-27 22:57:04 -05:00
Nick Mathewson
b1e1b439b8
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.
2014-11-27 22:51:13 -05:00
Nick Mathewson
0e0dc7d787
Fix a 64-bit clang warning
2014-11-27 22:42:03 -05:00
Nick Mathewson
a28df3fb67
Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
...
Conflicts:
src/or/or.h
src/test/Makefile.nmake
2014-11-27 22:39:46 -05:00
Nick Mathewson
3d2366c676
Merge remote-tracking branch 'public/bug13126'
...
Conflicts:
src/or/or.h
2014-11-26 09:03:30 -05:00
Nick Mathewson
3a91a08e21
Merge branch 'feature9503_squashed'
2014-11-25 12:49:09 -05:00
rl1987
bf67a60b86
Sending response to SIGNAL HEARTBEAT controller command.
2014-11-25 12:48:41 -05:00
rl1987
8c135062e5
Adding 'SIGNAL HEARTBEAT' message that causes unscheduled heartbeat.
2014-11-25 12:48:41 -05:00
Nick Mathewson
6218f48950
Use consistent formatting for list of directory authorities
...
Based on a patch from grpamp on tor-dev.
2014-11-24 01:34:17 -05:00
Nick Mathewson
336c856e52
Make can_complete_circuits a static variable.
2014-11-20 12:03:46 -05:00
Nick Mathewson
f15cd22bb7
Don't build introduction circuits until we know we can build circuits
...
Patch from akwizgran. Ticket 13447.
2014-11-20 11:51:36 -05:00
Nick Mathewson
126f220071
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-19 17:27:37 -05:00
Nick Mathewson
0872d8e3cf
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-19 17:26:42 -05:00
Micah Anderson
dca902ceba
Update longclaw dirauth IP to be a more stable location
2014-11-19 17:22:25 -05:00
Nick Mathewson
b3bd7a736c
Remove Support022HiddenServices
...
This has been already disabled in the directory consensus for a while;
it didn't seem to break anything.
Finally closes #7803 .
2014-11-17 11:52:10 -05:00
rl1987
620e251dcc
Rewriting comment for control_event_hs_descriptor_failed().
2014-11-16 16:06:00 +02:00
rl1987
0db96d023b
Adding REASON field to HS_DESC FAILED controller event.
2014-11-16 15:51:23 +02:00
Nick Mathewson
5c813f6ca1
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-12 15:32:15 -05:00
Nick Mathewson
6c146f9c83
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/config.c
2014-11-12 15:30:11 -05:00
Micah Anderson
b6e7b8c88c
Remove turtles as a directory authority ( #13296 )
2014-11-12 15:25:52 -05:00
Micah Anderson
ad448c6405
Add longclaw as a directory authority ( #13296 )
2014-11-12 15:25:52 -05:00
Nick Mathewson
a3dafd3f58
Replace operators used as macro arguments with OP_XX macros
...
Part of fix for 13172
2014-11-12 13:28:07 -05:00
Nick Mathewson
d85270e13c
Reenhappy make check-spaces
2014-11-12 13:15:10 -05:00
Nick Mathewson
81433e7432
Merge remote-tracking branch 'rl1987/bug13644'
2014-11-12 13:12:14 -05:00
Nick Mathewson
99e2a325f6
Merge remote-tracking branch 'rl1987/bug9812'
2014-11-12 10:27:12 -05:00
Nick Mathewson
a87c697fb1
Merge remote-tracking branch 'public/bug13698_024_v1'
2014-11-12 10:23:55 -05:00
rl1987
a6520ed537
Renaming ROUTER_WAS_NOT_NEW to ROUTER_IS_ALREADY_KNOWN.
2014-11-11 20:56:40 +02:00
rl1987
f9d73eea9c
Comment possible values of was_router_added_t.
2014-11-11 20:37:39 +02:00
David Goulet
34eb007d22
Fix: don't report timeout when closing parallel intro points
...
When closing parallel introduction points, the given reason (timeout)
was actually changed to "no reason" thus when the circuit purpose was
CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT, we were reporting an introduction
point failure and flagging it "unreachable". After three times, that
intro point gets removed from the rend cache object.
In the case of CIRCUIT_PURPOSE_C_INTRODUCING, the intro point was
flagged has "timed out" and thus not used until the connection to the HS
is closed where that flag gets reset.
This commit adds an internal circuit reason called
END_CIRC_REASON_IP_NOW_REDUNDANT which tells the closing circuit
mechanism to not report any intro point failure.
This has been observed while opening hundreds of connections to an HS on
different circuit for each connection. This fix makes this use case to
work like a charm.
Fixes #13698 .
Signed-off-by: David Goulet <dgoulet@ev0ke.net >
2014-11-10 15:02:54 -05:00
rl1987
7025f2dc59
Print a warning when extra info document is found incompatible with router descriptor.
2014-11-09 17:41:18 +02:00
David Goulet
151f5f90b8
Wrong format in log statement
...
Fixes bug 13701.
2014-11-07 11:44:41 -05:00
Nick Mathewson
4df419a4b1
Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'
...
Conflicts:
src/or/config.c
2014-11-05 14:11:47 -05:00
Nick Mathewson
ce147d33f5
Fix a wide line I introduced
2014-11-04 09:56:46 -05:00
Nick Mathewson
9619c395ac
Merge remote-tracking branch 'andrea/ticket6456'
...
Somewhat tricky conflicts:
src/or/config.c
Also, s/test_assert/tt_assert in test_config.c
2014-11-04 09:52:04 -05:00
Nick Mathewson
60c86a3b79
Merge branch 'bug13315_squashed'
...
Conflicts:
src/or/buffers.c
2014-11-04 00:48:25 -05:00
rl1987
51e2473618
Sending 'Not allowed' error message before closing the connection.
2014-11-04 00:37:24 -05:00
rl1987
0da4ddda4f
Checking if FQDN is actually IPv6 address string and handling that case.
2014-11-04 00:37:24 -05:00
rl1987
2862b769de
Validating SOCKS5 hostname more correctly.
2014-11-04 00:36:42 -05:00
Nick Mathewson
593909ea70
Merge remote-tracking branch 'public/bug13214_025_squashed'
2014-11-04 00:24:56 -05:00
Nick Mathewson
b10e5ac7b8
Check descriptor ID in addition to HS ID when saving a v2 hs descriptor
...
Fixes bug 13214; reported by 'special'.
2014-11-04 00:24:15 -05:00
David Goulet
71355e1db9
Add comments and rename intro_nodes list in rend_services_introduce()
...
(No changes file needed: this patch just adds comments and renames
variables. This is ticket 13646. message taken from the ticket. -Nick)
2014-11-04 00:19:31 -05:00