Nick Mathewson
db9ce36b25
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-23 15:37:57 -04:00
Nick Mathewson
ffd7189b3f
Don't assert in get_string_from_pipe() on len==0
...
We can treat this case as an EAGAIN (probably because of an
unexpected internal NUL) rather than a crash-worthy problem.
Fixes bug 6225, again. Bug not in any released version of Tor.
2012-06-23 15:35:43 -04:00
Nick Mathewson
b1ad1a1d02
Resolve crash caused by format_helper_exit_status changes in #5557
...
Because the string output was no longer equal in length to
HEX_ERRNO_SIZE, the write() call would add some extra spaces and
maybe a NUL, and the NUL would trigger an assert in
get_string_from_pipe.
Fixes bug 6225; bug not in any released version of Tor.
2012-06-23 15:32:04 -04:00
Nick Mathewson
d0243e82cf
Merge branch 'bug5099_nm' into maint-0.2.3
2012-06-23 15:10:57 -04:00
Nick Mathewson
f54ac08846
Tweak bug5099 changes file
2012-06-23 15:10:43 -04:00
George Kadianakis
8c3a4a1d21
Improve log message issued when a managed proxy fails to launch.
2012-06-23 15:05:46 -04:00
Nick Mathewson
7761c1d6ac
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-22 22:41:12 -04:00
Nick Mathewson
ebda15e4b5
Merge remote-tracking branch 'public/bug6211' into maint-0.2.3
2012-06-22 22:38:59 -04:00
Nick Mathewson
a9de982c34
Merge remote-tracking branch 'public/bug6203_v2' into maint-0.2.3
2012-06-22 22:33:14 -04:00
Nick Mathewson
a08bbefa9b
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-22 22:23:20 -04:00
Nick Mathewson
4a7e4129af
Style tweaks and add a warning about NUL-termination
2012-06-22 22:21:20 -04:00
Andrea Shepard
770374a6b3
Add unit test for format_hex_number_for_helper_exit_status()
2012-06-22 22:21:20 -04:00
Andrea Shepard
c21af69f29
Refactor unsigned int hex formatting out of format_helper_exit_status() in util.c
2012-06-22 22:21:20 -04:00
Andrea Shepard
4c62cc6f99
Make format_helper_exit_status() avoid unnecessary spaces
2012-06-22 22:21:19 -04:00
Nick Mathewson
f96f319b9e
Increment master branch version to 0.2.4.0-alpha-dev
2012-06-20 16:41:31 -04:00
Nick Mathewson
c239c57d3c
Fix a regression bug in AllowDotExit
...
The code that detected the source of a remapped address checked that
an address mapping's source was a given rewrite rule if addr_orig had
no .exit, and addr did have a .exit after processing that rule. But
addr_orig was formatted for logging: it was not the original address
at all, but rather was the address escaped for logging and possibly
replaced with "[scrubbed]".
This new logic will correctly set ADDRMAPSRC_NONE in the case when the
address starts life as a .exit address, so that AllowDotExit can work
again.
Fixes bug 6211; bugfix on 0.2.3.17-beta
2012-06-19 19:50:03 -04:00
Nick Mathewson
0600e8cab1
Disable warning for marked-but-reading in main.c
...
It turns out this can happen. Even though there is no reason for
connections to be marked but reading, we leave them reading anyway,
so warning here is unwarranted. Let's turn that back on once we do
something sensible and disable reading when we mark. Bugfix for
6203 on Tor 0.2.3.17-beta.
Thanks to cypherpunks for pointing out the general stupidity of the
original code here.
2012-06-19 12:22:43 -04:00
Nick Mathewson
dcb1d0a67b
add bug number and explanation to changes/bug2385; call it a feature
2012-06-18 13:20:02 -04:00
Nick Mathewson
4a8eaad7ef
Clear a couple more fields in rend_service_load_auth_keys
2012-06-18 13:13:53 -04:00
Nick Mathewson
b8d1e8e375
Refactor exit path in rend_service_load_auth_keys
...
Now it's an orthodox "goto err/done" exit path, and it isn't some
screwy thing where we stick err/done at the end of a loop and
duplicate our cleanup code.
2012-06-18 13:10:02 -04:00
Nick Mathewson
e5a61c5176
Fix indentation in rend_service_load_auth_keys
2012-06-18 13:01:33 -04:00
Nick Mathewson
be28d10622
Refactor rend_service_load_keys() into main portion and auth portion.
2012-06-18 12:59:29 -04:00
Nick Mathewson
53f5a38942
Fix indentation and whitespace in rend_service_load_keys
2012-06-18 12:45:55 -04:00
Nick Mathewson
b44693f32d
Refactor rend_service_load_keys() into outer loop and loop contents
2012-06-18 12:43:20 -04:00
Nick Mathewson
e6782b355a
Merge remote-tracking branch 'public/bug3311'
2012-06-18 12:07:39 -04:00
Nick Mathewson
72acdfe134
Merge branch 'bug4748_squashed'
2012-06-18 12:01:56 -04:00
Nick Mathewson
f5e86bcd6c
Document 0.2.3.x torrc/default-torrc/command line semantics changes
...
Bug 4748
squash! Document 0.2.3.x torrc/default-torrc/command line semantics changes
Incorporates fixes suggested by rransom.
2012-06-18 12:01:27 -04:00
Nick Mathewson
4cbd6e46ef
Merge branch 'bug6173_rebased'
2012-06-18 11:52:03 -04:00
Nick Mathewson
4432fa40dd
Merge remote-tracking branch 'andrea/bug6028'
2012-06-18 11:51:55 -04:00
Nick Mathewson
8c0158101c
oops: AC_RUN_IFELSE gets offended if I don't give it a AC_LANG_PROGRAM
2012-06-18 11:48:45 -04:00
Nick Mathewson
adbdeafad9
More sophisticated attempt at detecting working linker options
...
On some platforms, the linker is perfectly happy to produce binaries
that won't run if you give it the wrong set of flags. So when not
cross-compiling, try to link-and-run a little test program, rather
than just linking it.
Possible fix for 6173.
2012-06-18 11:48:45 -04:00
Roger Dingledine
26855fe22c
conn_type_to_string() on a listener already says it's a listener
2012-06-16 02:29:03 -04:00
Andrea Shepard
a782893ed0
Add change file bug2385
2012-06-15 21:54:26 -07:00
Andrea Shepard
10130e5979
Appease make check-spaces
2012-06-15 21:48:15 -07:00
Andrea Shepard
b5280efc17
Clean up keys on stack in rend_parse_service_authorization()
2012-06-15 21:47:06 -07:00
Andrea Shepard
7f24b9b8c3
Clean up keys on stack in rend_client_refetch_v2_renddesc()
2012-06-15 21:39:28 -07:00
Andrea Shepard
a8bcbe7bf7
Clean up keys on stack in rend_client_send_introduction()
2012-06-15 21:25:25 -07:00
Andrea Shepard
ab2e007ffb
In rend_service_load_keys(), clear extended descriptor cookie and buffer, clear temporary heap space for client key, and check if serializing client key fails
2012-06-15 21:17:02 -07:00
Andrea Shepard
276f95182c
Clean keys on stack in rend_service_rendezvous_has_opened()
2012-06-15 20:54:45 -07:00
Andrea Shepard
88c5d3ca55
Clean keys on stack in rend_service_intro_has_opened()
2012-06-15 20:43:33 -07:00
Andrea Shepard
d43ba536df
Clean up keys on stack in rend_service_introduce()
2012-06-15 20:19:02 -07:00
Andrea Shepard
9f55dfd915
Clean up keys on stack in rend_service_load_keys()
2012-06-15 19:54:54 -07:00
Roger Dingledine
c37b8023b7
fix the typo on the typo fix
2012-06-15 20:34:16 -04:00
Andrea Shepard
1f7f10e4f3
Always set *socket_error to something appropriate when returning -1 from connection_connect()
2012-06-15 16:53:32 -07:00
Roger Dingledine
ca525db02d
fix typos from 783f705d
2012-06-15 17:08:25 -04:00
Nick Mathewson
97555f4537
fix a compiler warning added in one of my XXX023 fixes.
2012-06-15 16:43:59 -04:00
Nick Mathewson
30c4653780
Whitespace fix
2012-06-15 16:12:24 -04:00
Nick Mathewson
eab75d2c36
Fix a typo found by Mike.
2012-06-15 16:12:04 -04:00
Nick Mathewson
bdfb399867
Merge remote-tracking branch 'public/xxx023'
2012-06-15 16:10:59 -04:00
Nick Mathewson
87409771c4
Clarify some messages about publishing hidden service descriptors
...
Fix for bug 3311.
2012-06-15 15:25:46 -04:00
