[GNUnet-SVN] r13203 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2010-10-07 16:16:58 +0200 (Thu, 07 Oct 2010)
New Revision: 13203

Modified:
   gnunet/src/transport/plugin_transport_http.c
   gnunet/src/transport/test_plugin_transport_http.c
   gnunet/src/transport/test_plugin_transport_https.c
Log:
removed not needed check


Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2010-10-07 13:57:31 UTC 
(rev 13202)
+++ gnunet/src/transport/plugin_transport_http.c        2010-10-07 14:16:58 UTC 
(rev 13203)
@@ -2522,15 +2522,10 @@
   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 @@
                  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 @@
                  break;
          tv6 = tv6->next;
       }
-      if ((tv6 !=NULL) && (ntohs (v6->u6_port) == plugin->port_inbound))
+      if (tv6 !=NULL)
         return GNUNET_OK;
          else
                  return GNUNET_SYSERR;

Modified: gnunet/src/transport/test_plugin_transport_http.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_http.c   2010-10-07 13:57:31 UTC 
(rev 13202)
+++ gnunet/src/transport/test_plugin_transport_http.c   2010-10-07 14:16:58 UTC 
(rev 13203)
@@ -1250,12 +1250,7 @@
   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);

Modified: gnunet/src/transport/test_plugin_transport_https.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_https.c  2010-10-07 13:57:31 UTC 
(rev 13202)
+++ gnunet/src/transport/test_plugin_transport_https.c  2010-10-07 14:16:58 UTC 
(rev 13203)
@@ -1315,12 +1315,7 @@
   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);