Selaa lähdekoodia

- Stop triggering asserts if the controller tries to extend hidden
service circuits.
(also found by mwenge)


svn:r8682

Roger Dingledine 17 vuotta sitten
vanhempi
commit
552d828def
2 muutettua tiedostoa jossa 8 lisäystä ja 7 poistoa
  1. 2 0
      ChangeLog
  2. 6 7
      src/or/circuituse.c

+ 2 - 0
ChangeLog

@@ -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

+ 6 - 7
src/or/circuituse.c

@@ -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. */
   }
 }