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

- Stop triggering asserts if the controller tries to extend hidden

Browse Source 
service circuits.
(also found by mwenge)


svn:r8682
This commit is contained in:
Roger Dingledine 2006-10-09 22:26:21 +00:00
parent 655859f76b
commit 552d828def
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -24,6 +24,8 @@ Changes in version 0.1.2.3-alpha - 2006-10-??
not requested.
- When reporting verbose nicknames in entry_guards_getinfo(), avoid
printing a duplicate "$" in the keys we send.
- Stop triggering asserts if the controller tries to extend hidden
service circuits.
Changes in version 0.1.2.2-alpha - 2006-10-07

13
src/or/circuituse.c
View File

@ -703,9 +703,9 @@ circuit_has_opened(origin_circuit_t *circ)
case CIRCUIT_PURPOSE_TESTING:
circuit_testing_opened(circ);
break;
default:
log_err(LD_BUG,"unhandled purpose %d",circ->_base.purpose);
tor_assert(0);
/* default:
* This won't happen in normal operation, but might happen if the
* controller did it. Just let it slide. */
}
}
@ -793,10 +793,9 @@ circuit_build_failed(origin_circuit_t *circ)
failed_at_last_hop?"last":"non-last");
rend_service_relaunch_rendezvous(circ);
break;
default:
/* Other cases are impossible, since this function is only called with
* unbuilt circuits. */
tor_assert(0);
/* default:
* This won't happen in normal operation, but might happen if the
* controller did it. Just let it slide. */
}
}