diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-05-19 23:51:39 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-05-19 23:51:39 +0000 |
| commit | 80be19d9da9e02deac29c7fb685559446d881b0b (patch) | |
| tree | b5ac664a92d42c8d062fb2b9b535a006879c6874 | |
| parent | b37450ce553d206e115ed57da80b9546fe34e0fb (diff) | |
| download | tor-80be19d9da9e02deac29c7fb685559446d881b0b.tar.gz tor-80be19d9da9e02deac29c7fb685559446d881b0b.zip | |
Tighten assert_cpath_layer_ok assumptions
svn:r1904
| -rw-r--r-- | src/or/circuitlist.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 4f611b2196..9cdfb809be 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -395,14 +395,15 @@ int _circuit_mark_for_close(circuit_t *circ) { */ void assert_cpath_layer_ok(const crypt_path_t *cp) { - tor_assert(cp->f_crypto); - tor_assert(cp->b_crypto); // tor_assert(cp->addr); /* these are zero for rendezvous extra-hops */ // tor_assert(cp->port); switch(cp->state) { - case CPATH_STATE_CLOSED: case CPATH_STATE_OPEN: + tor_assert(cp->f_crypto); + tor_assert(cp->b_crypto); + /* fall through */ + case CPATH_STATE_CLOSED: tor_assert(!cp->handshake_state); break; case CPATH_STATE_AWAITING_KEYS: |