nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanups on r13037

Browse Source 
svn:r13045
This commit is contained in:
Roger Dingledine 2008-01-06 23:37:48 +00:00
parent d73b791969
commit 5a912aa1c8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -24,6 +24,9 @@ Changes in version 0.2.0.16-alpha - 2008-01-??
- Use a mutex to protect the list of logs, so we never write to - Use a mutex to protect the list of logs, so we never write to
the list as it's being freed. Bugfix on 0.1.2.x. Fixes the the list as it's being freed. Bugfix on 0.1.2.x. Fixes the
very rare bug 575, which is kind of the revenge of bug 222. very rare bug 575, which is kind of the revenge of bug 222.
- Patch from Karsten Loesing to complain less at both the client
and the relay when a relay used to have the HSDir flag but doesn't
anymore, and we try to upload a hidden service descriptor.
o Minor features (controller): o Minor features (controller):
- Get NS events working again. (Patch from tup) - Get NS events working again. (Patch from tup)

7
src/or/directory.c
View File

@ -2727,18 +2727,17 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers,
!strcmpstart(url,"/tor/rendezvous2/publish")) { !strcmpstart(url,"/tor/rendezvous2/publish")) {
switch (rend_cache_store_v2_desc_as_dir(body)) { switch (rend_cache_store_v2_desc_as_dir(body)) {
case -2: case -2:
log_info(LD_REND, "Rejected rend descriptor (length %d) from %s.", log_info(LD_REND, "Rejected v2 rend descriptor (length %d) from %s "
"since we're not currently a hidden service directory.",
(int)body_len, conn->_base.address); (int)body_len, conn->_base.address);
write_http_status_line(conn, 503, "Currently not acting as v2 " write_http_status_line(conn, 503, "Currently not acting as v2 "
"hidden service directory"); "hidden service directory");
log_info(LD_REND, "Handled v2 rendezvous descriptor post: rejected");
break; break;
case -1: case -1:
log_info(LD_REND, "Rejected rend descriptor (length %d) from %s.", log_warn(LD_REND, "Rejected v2 rend descriptor (length %d) from %s.",
(int)body_len, conn->_base.address); (int)body_len, conn->_base.address);
write_http_status_line(conn, 400, "Invalid service descriptor " write_http_status_line(conn, 400, "Invalid service descriptor "
"rejected"); "rejected");
log_info(LD_REND, "Handled v2 rendezvous descriptor post: rejected");
break; break;
default: default:
write_http_status_line(conn, 200, "Service descriptor stored"); write_http_status_line(conn, 200, "Service descriptor stored");