[or-cvs] r8682: - Stop triggering asserts if the controller tries to extend (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2006-10-09 18:26:21 -0400 (Mon, 09 Oct 2006)
New Revision: 8682

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/circuituse.c
Log:
- Stop triggering asserts if the controller tries to extend hidden
  service circuits.
(also found by mwenge)


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2006-10-09 21:26:34 UTC (rev 8681)
+++ tor/trunk/ChangeLog	2006-10-09 22:26:21 UTC (rev 8682)
@@ -24,6 +24,8 @@
       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

Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2006-10-09 21:26:34 UTC (rev 8681)
+++ tor/trunk/src/or/circuituse.c	2006-10-09 22:26:21 UTC (rev 8682)
@@ -703,9 +703,9 @@
     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 @@
                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. */
   }
 }