From: David Fifield <david@bamsoftware.com>
Date: Sat, 26 Oct 2013 21:34:48 +0000 (-0700)
Subject: Simplify transport_is_needed.
X-Git-Tag: tor-0.2.5.2-alpha~113^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6e6c245c8ef3e5f854d82a67550456857f57ed4;p=thirdparty%2Ftor.git

Simplify transport_is_needed.

By Roger at
https://trac.torproject.org/projects/tor/ticket/5018#comment:11.
---

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index beb855de90..ca3ef530ea 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -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>