[or-cvs] r17006: {tor} Nobody calls circuit_launch_by_nickname; remove it. (tor/trunk/src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-09-29 16:44:29 -0400 (Mon, 29 Sep 2008)
New Revision: 17006

Modified:
   tor/trunk/src/or/circuituse.c
   tor/trunk/src/or/or.h
Log:
Nobody calls circuit_launch_by_nickname; remove it.

Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2008-09-29 19:27:20 UTC (rev 17005)
+++ tor/trunk/src/or/circuituse.c	2008-09-29 20:44:29 UTC (rev 17006)
@@ -952,25 +952,6 @@
   return circuit_establish_circuit(purpose, extend_info, flags);
 }
 
-/** Launch a new circuit; see circuit_launch_by_extend_info() for
- * details on arguments. */
-origin_circuit_t *
-circuit_launch_by_nickname(uint8_t purpose,
-                           const char *exit_nickname, int flags)
-{
-  routerinfo_t *router = NULL;
-
-  if (exit_nickname) {
-    router = router_get_by_nickname(exit_nickname, 1);
-    if (!router) {
-      log_warn(LD_GENERAL, "Trying to launch circ by nickname, but "
-               "no such OR as '%s'", exit_nickname);
-      return NULL;
-    }
-  }
-  return circuit_launch_by_router(purpose, router, flags);
-}
-
 /** Record another failure at opening a general circuit. When we have
  * too many, we'll stop trying for the remainder of this minute.
  */

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2008-09-29 19:27:20 UTC (rev 17005)
+++ tor/trunk/src/or/or.h	2008-09-29 20:44:29 UTC (rev 17006)
@@ -2769,9 +2769,6 @@
 /** Flag to set when the last hop of a circuit doesn't need to be an
  * exit node. */
 #define CIRCLAUNCH_IS_INTERNAL    (1<<3)
-origin_circuit_t *circuit_launch_by_nickname(uint8_t purpose,
-                                             const char *exit_nickname,
-                                             int flags);
 origin_circuit_t *circuit_launch_by_extend_info(uint8_t purpose,
                                                 extend_info_t *info,
                                                 int flags);