[or-cvs] r8657: remove some old debugging code (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2006-10-08 19:20:43 -0400 (Sun, 08 Oct 2006)
New Revision: 8657

Modified:
   tor/trunk/src/or/circuitbuild.c
   tor/trunk/src/or/circuitlist.c
   tor/trunk/src/or/or.h
Log:
remove some old debugging code


Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2006-10-08 21:28:06 UTC (rev 8656)
+++ tor/trunk/src/or/circuitbuild.c	2006-10-08 23:20:43 UTC (rev 8657)
@@ -87,7 +87,7 @@
       return 0;
     }
     test_circ_id |= high_bit;
-  } while (circuit_id_used_on_conn(test_circ_id, conn));
+  } while (circuit_get_by_circid_orconn(test_circ_id, conn));
   return test_circ_id;
 }
 

Modified: tor/trunk/src/or/circuitlist.c
===================================================================
--- tor/trunk/src/or/circuitlist.c	2006-10-08 21:28:06 UTC (rev 8656)
+++ tor/trunk/src/or/circuitlist.c	2006-10-08 23:20:43 UTC (rev 8657)
@@ -571,22 +571,6 @@
     return circ;
 }
 
-/** Return true iff there is a circ such that
- *  - circ-\>n_circ_id or circ-\>p_circ_id is equal to <b>circ_id</b>, and
- *  - circ is attached to <b>conn</b>, either as p_conn or n_conn.
- * Return NULL if no such circuit exists.
- */
-int
-circuit_id_used_on_conn(uint16_t circ_id, or_connection_t *conn)
-{
-  circuit_t *circ = circuit_get_by_circid_orconn_impl(circ_id, conn);
-  if (circ && circ->marked_for_close)
-    log_fn(LOG_NOTICE, LD_CIRC,
-           "I was about to re-use a circuit ID that had been marked."
-           " Good thing we fixed that bug!");
-  return circ != NULL;
-}
-
 /** Return the circuit that a given edge connection is using. */
 circuit_t *
 circuit_get_by_edge_conn(edge_connection_t *conn)

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2006-10-08 21:28:06 UTC (rev 8656)
+++ tor/trunk/src/or/or.h	2006-10-08 23:20:43 UTC (rev 8657)
@@ -1750,7 +1750,6 @@
 or_circuit_t *or_circuit_new(uint16_t p_circ_id, or_connection_t *p_conn);
 circuit_t *circuit_get_by_circid_orconn(uint16_t circ_id,
                                         or_connection_t *conn);
-int circuit_id_used_on_conn(uint16_t circ_id, or_connection_t *conn);
 circuit_t *circuit_get_by_edge_conn(edge_connection_t *conn);
 void circuit_unlink_all_from_or_conn(or_connection_t *conn, int reason);
 origin_circuit_t *circuit_get_by_global_id(uint32_t id);