diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-05-02 22:35:18 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-05-02 22:35:18 +0000 |
| commit | ab34901263c6593a56c039979e04bf9345932dd1 (patch) | |
| tree | 5cc0591eb4f02fde0e441df1be5a678736f917aa /src/or/circuitlist.c | |
| parent | 16184f62dcb40fce82f1170b31a161d314dfc81f (diff) | |
| download | tor-ab34901263c6593a56c039979e04bf9345932dd1.tar tor-ab34901263c6593a56c039979e04bf9345932dd1.tar.gz | |
New and frightening code to implement fast-path first-hop CREATE_FAST cells. Watch out when we bump the version to 0.1.0.6-rc!
svn:r4162
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index af54ae90d..93df61692 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -274,8 +274,8 @@ circuit_free_cpath_node(crypt_path_t *victim) { crypto_free_digest_env(victim->f_digest); if (victim->b_digest) crypto_free_digest_env(victim->b_digest); - if (victim->handshake_state) - crypto_dh_free(victim->handshake_state); + if (victim->dh_handshake_state) + crypto_dh_free(victim->dh_handshake_state); victim->magic = 0xDEADBEEFu; tor_free(victim); } @@ -613,10 +613,10 @@ void assert_cpath_layer_ok(const crypt_path_t *cp) tor_assert(cp->b_crypto); /* fall through */ case CPATH_STATE_CLOSED: - tor_assert(!cp->handshake_state); + tor_assert(!cp->dh_handshake_state); break; case CPATH_STATE_AWAITING_KEYS: - tor_assert(cp->handshake_state); + /* tor_assert(cp->dh_handshake_state); */ break; default: log_fn(LOG_ERR,"Unexpected state %d",cp->state); |