tolerate additional IPv4 address now available for gnunet.org

[oweals/gnunet.git] / src / transport / plugin_transport_http_common.c

diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c
index 13f01f7131b6bc5a97f9cae4ba95a13e1075def5..0a0545dd6abe2e637f925705e52c56636ca0176b 100644 (file)
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -1,21 +1,21 @@
 /*
  This file is part of GNUnet
- Copyright (C) 2002-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2002-2013 GNUnet e.V.
 
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
 
  GNUnet is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
 
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
@@ -263,7 +263,7 @@ http_common_plugin_dnsresult_to_address (const char *plugin,
       dnsresult, saddr->port, saddr->path);
   if (strlen (res) + 1 < 500)
   {
-    memcpy (rbuf, res, strlen (res) + 1);
+    GNUNET_memcpy (rbuf, res, strlen (res) + 1);
     GNUNET_free(res);
     return rbuf;
   }
@@ -567,7 +567,7 @@ http_common_plugin_address_to_url (void *cls,
     GNUNET_break(0);
     return NULL;
   }
-  if (0 >= addrlen)
+  if (0 == addrlen)
   {
     GNUNET_break(0);
     return NULL;
@@ -581,7 +581,7 @@ http_common_plugin_address_to_url (void *cls,
   if (addr_str[ntohl (address->urlen) - 1] != '\0')
     return NULL;
 
-  memcpy (rbuf,
+  GNUNET_memcpy (rbuf,
           &address[1],
           ntohl (address->urlen));
   return rbuf;
@@ -611,25 +611,25 @@ http_common_plugin_address_to_string (const char *plugin,
 
   GNUNET_assert(NULL != plugin);
   if (NULL == addr)
-    return NULL ;
+    return NULL;
   if (0 == addrlen)
-    return NULL ;
+    return NULL;
   if (addrlen != http_common_address_get_size (address))
-    return NULL ;
+    return NULL;
   addr_str = (char *) &address[1];
   if (addr_str[ntohl (address->urlen) - 1] != '\0')
-    return NULL ;
+    return NULL;
   GNUNET_asprintf (&res, "%s.%u.%s", plugin, ntohl (address->options),
       &address[1]);
   if (strlen (res) + 1 < 500)
   {
-    memcpy (rbuf, res, strlen (res) + 1);
+    GNUNET_memcpy (rbuf, res, strlen (res) + 1);
     GNUNET_free(res);
     return rbuf;
   }
   GNUNET_break(0);
   GNUNET_free(res);
-  return NULL ;
+  return NULL;
 }
 
 /**
@@ -702,7 +702,7 @@ http_common_plugin_string_to_address (void *cls,
   a = GNUNET_malloc (sizeof (struct HttpAddress) + urlen);
   a->options = htonl (options);
   a->urlen = htonl (urlen);
-  memcpy (&a[1], address, urlen);
+  GNUNET_memcpy (&a[1], address, urlen);
 
   (*buf) = a;
   (*added) = sizeof(struct HttpAddress) + urlen;
@@ -737,7 +737,7 @@ http_common_address_from_socket (const char *protocol,
   address = GNUNET_malloc (sizeof (struct HttpAddress) + len);
   address->options = htonl (HTTP_OPTIONS_NONE);
   address->urlen = htonl (len);
-  memcpy (&address[1], res, len);
+  GNUNET_memcpy (&address[1], res, len);
   GNUNET_free(res);
   return address;
 }
@@ -772,7 +772,7 @@ http_common_socket_from_address (const void *addr,
     GNUNET_break (0);
     return NULL;
   }
-  if (0 >= addrlen)
+  if (0 == addrlen)
   {
     GNUNET_break (0);
     return NULL;
@@ -868,14 +868,14 @@ http_common_cmp_addresses (const void *addr1,
 
   if (NULL == a1)
     return GNUNET_SYSERR;
-  if (0 >= addrlen1)
+  if (0 == addrlen1)
     return GNUNET_SYSERR;
   if (a1[addrlen1 - 1] != '\0')
     return GNUNET_SYSERR;
 
   if (NULL == a2)
     return GNUNET_SYSERR;
-  if (0 >= addrlen2)
+  if (0 == addrlen2)
     return GNUNET_SYSERR;
   if (a2[addrlen2 - 1] != '\0')
     return GNUNET_SYSERR;
@@ -898,17 +898,17 @@ http_common_cmp_addresses (const void *addr1,
  * @param address the address
  * @return the network type
  */
-enum GNUNET_ATS_Network_Type
+enum GNUNET_NetworkType
 http_common_get_network_for_address (struct GNUNET_TRANSPORT_PluginEnvironment *env,
                                      const struct GNUNET_HELLO_Address *address)
 {
 
   struct sockaddr *sa;
-  enum GNUNET_ATS_Network_Type net_type;
+  enum GNUNET_NetworkType net_type;
   size_t salen = 0;
   int res;
 
-  net_type = GNUNET_ATS_NET_UNSPECIFIED;
+  net_type = GNUNET_NT_UNSPECIFIED;
   sa = http_common_socket_from_address (address->address,
                                         address->address_length,
                                         &res);