]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Simplify transport_is_needed.
authorDavid Fifield <david@bamsoftware.com>
Sat, 26 Oct 2013 21:34:48 +0000 (14:34 -0700)
committerNick Mathewson <nickm@torproject.org>
Tue, 29 Oct 2013 05:05:57 +0000 (01:05 -0400)
By Roger at
https://trac.torproject.org/projects/tor/ticket/5018#comment:11.

src/or/entrynodes.c

index beb855de90c59f44e9c4b77d4e1175b56d37b422..ca3ef530ea2a46b9e93789458b48aa3fb3ea60d0 100644 (file)
@@ -1766,22 +1766,16 @@ bridge_resolve_conflicts(const tor_addr_t *addr, uint16_t port,
 int
 transport_is_needed(const char *transport_name)
 {
-  int retval;
-  smartlist_t *needed_transports = NULL;
-
   if (!bridge_list)
     return 0;
 
-  needed_transports = smartlist_new();
-
   SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, bridge) {
-    if (bridge->transport_name)
-      smartlist_add(needed_transports, bridge->transport_name);
+    if (bridge->transport_name &&
+        !strcmp(bridge->transport_name, transport_name))
+      return 1;
   } SMARTLIST_FOREACH_END(bridge);
 
-  retval = smartlist_string_isin(needed_transports, transport_name);
-  smartlist_free(needed_transports);
-  return retval;
+  return 0;
 }
 
 /** Remember a new bridge at <b>addr</b>:<b>port</b>. If <b>digest</b>