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

[gnunet]

Author: wachs
Date: 2013-07-12 10:50:45 +0200 (Fri, 12 Jul 2013)
New Revision: 27946

Modified:
   gnunet/src/transport/plugin_transport_http_server.c
Log:
verified and improved address checking for external hostname and verify option


Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2013-07-12 08:47:10 UTC 
(rev 27945)
+++ gnunet/src/transport/plugin_transport_http_server.c 2013-07-12 08:50:45 UTC 
(rev 27946)
@@ -658,17 +658,17 @@
   struct HttpAddressWrapper *next;
   struct HttpAddressWrapper *pos;
        struct HttpAddress *h_addr;
-GNUNET_break (0);
        h_addr = (struct HttpAddress *) addr;
+
   if ((NULL != plugin->ext_addr) &&
           GNUNET_YES == (http_common_cmp_addresses (addr, addrlen,
                                           plugin->ext_addr, 
plugin->ext_addr_len)))
   {
-       if ((ntohl(h_addr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE) != 
HTTP_OPTIONS_VERIFY_CERTIFICATE)
-                       GNUNET_break (0);
-       else
-               GNUNET_break (0);
-    return GNUNET_OK;
+       /* Checking HTTP_OPTIONS_VERIFY_CERTIFICATE option for external 
hostname */
+       if ((ntohl(h_addr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE) !=
+                       (plugin->options & HTTP_OPTIONS_VERIFY_CERTIFICATE))
+                       return GNUNET_NO; /* VERIFY option not set as required! 
*/
+       return GNUNET_OK;
   }
 
   next  = plugin->addr_head;