Browse Source

Nobody calls circuit_launch_by_nickname; remove it.

svn:r17006
Nick Mathewson 15 years ago
parent
commit
9d950f7d25
2 changed files with 0 additions and 22 deletions
  1. 0 19
      src/or/circuituse.c
  2. 0 3
      src/or/or.h

+ 0 - 19
src/or/circuituse.c

@@ -952,25 +952,6 @@ circuit_launch_by_extend_info(uint8_t purpose,
   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.
  */

+ 0 - 3
src/or/or.h

@@ -2769,9 +2769,6 @@ void circuit_build_failed(origin_circuit_t *circ);
 /** 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);