Tighten assert_cpath_layer_ok assumptions

svn:r1904

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 4f611b219671ed8d2367ffc7223ee5db0a7b38a7..9cdfb809be06aef09726f5c91482562edcc9cda4 100644 (file)
--- 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: