From: Matthias Wachs <wachs@net.in.tum.de>
Date: Thu, 7 Oct 2010 14:16:58 +0000 (+0000)
Subject: removed not needed check
X-Git-Tag: initial-import-from-subversion-38251~20134
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=667ecd3a8d88b6785d3488e61b1e3f80b36d5672;p=oweals%2Fgnunet.git

removed not needed check
---

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index 48ae22bc0..fbbd1ad76 100644
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -2522,15 +2522,10 @@ http_plugin_address_suggested (void *cls,
   if (addrlen == sizeof (struct IPv4HttpAddress))
     {
       v4 = (struct IPv4HttpAddress *) addr;
-      /* Not skipping loopback
-      if (INADDR_LOOPBACK == ntohl(v4->ipv4_addr))
-      {
-        return GNUNET_SYSERR;
-      } */
 
       if (plugin->bind4_address!=NULL)
       {
-    	  if (0 == memcmp (&plugin->bind4_address->sin_addr, &v4->ipv4_addr, sizeof(uint32_t)) && (ntohs (v4->u_port) == plugin->port_inbound))
+    	  if (0 == memcmp (&plugin->bind4_address->sin_addr, &v4->ipv4_addr, sizeof(uint32_t)))
     		  return GNUNET_OK;
     	  else
     		  return GNUNET_SYSERR;
@@ -2541,7 +2536,7 @@ http_plugin_address_suggested (void *cls,
     		  break;
     	  tv4 = tv4->next;
       }
-      if ((tv4 !=NULL) && (ntohs (v4->u_port) == plugin->port_inbound))
+      if (tv4 != NULL)
         return GNUNET_OK;
 	  else
 		  return GNUNET_SYSERR;
@@ -2564,7 +2559,7 @@ http_plugin_address_suggested (void *cls,
     		  break;
     	  tv6 = tv6->next;
       }
-      if ((tv6 !=NULL) && (ntohs (v6->u6_port) == plugin->port_inbound))
+      if (tv6 !=NULL)
         return GNUNET_OK;
 	  else
 		  return GNUNET_SYSERR;
diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c
index fea71b3d3..a178f16a0 100644
--- a/src/transport/test_plugin_transport_http.c
+++ b/src/transport/test_plugin_transport_http.c
@@ -1250,12 +1250,7 @@ run (void *cls,
   fail_pretty_printer=GNUNET_NO;
   fail_addr_to_str=GNUNET_NO;
 
-  /* Suggesting addresses with wrong port*/
   struct IPv4HttpAddress failing_addr;
-  failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);
-  failing_addr.u_port = htons(0);
-  suggest_res = api->check_address (api->cls,&failing_addr,sizeof (struct IPv4HttpAddress));
-  GNUNET_assert (GNUNET_SYSERR == suggest_res);
 
   /* Suggesting addresses with wrong size*/
   failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);
diff --git a/src/transport/test_plugin_transport_https.c b/src/transport/test_plugin_transport_https.c
index 7eb60d46c..192ca764d 100644
--- a/src/transport/test_plugin_transport_https.c
+++ b/src/transport/test_plugin_transport_https.c
@@ -1315,12 +1315,7 @@ run (void *cls,
   fail_pretty_printer=GNUNET_NO;
   fail_addr_to_str=GNUNET_NO;
 
-  /* Suggesting addresses with wrong port*/
   struct IPv4HttpAddress failing_addr;
-  failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);
-  failing_addr.u_port = htons(0);
-  suggest_res = api->check_address (api->cls,&failing_addr,sizeof (struct IPv4HttpAddress));
-  GNUNET_assert (GNUNET_SYSERR == suggest_res);
 
   /* Suggesting addresses with wrong size*/
   failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);