ftbfs

[oweals/gnunet.git] / src / hello / address.c

diff --git a/src/hello/address.c b/src/hello/address.c
index 36f376d5c3b0a27a402efb380956128cf1114cde..9aaafeb537f17c748c2ab95854257304c37ed1c6 100644 (file)
--- a/src/hello/address.c
+++ b/src/hello/address.c
@@ -1,21 +1,21 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 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 Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-     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., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
@@ -89,10 +89,10 @@ GNUNET_HELLO_address_allocate (const struct GNUNET_PeerIdentity *peer,
   addr->local_info = local_info;
   end = (char *) &addr[1];
   addr->transport_name = &end[address_length];
-  memcpy (end,
+  GNUNET_memcpy (end,
           address,
           address_length);
-  memcpy (&end[address_length],
+  GNUNET_memcpy (&end[address_length],
           transport_name,
           slen);
   return addr;
@@ -108,6 +108,8 @@ GNUNET_HELLO_address_allocate (const struct GNUNET_PeerIdentity *peer,
 struct GNUNET_HELLO_Address *
 GNUNET_HELLO_address_copy (const struct GNUNET_HELLO_Address *address)
 {
+  if (NULL == address)
+    return NULL;
   return GNUNET_HELLO_address_allocate (&address->peer,
                                         address->transport_name,
                                         address->address,
@@ -130,14 +132,25 @@ GNUNET_HELLO_address_cmp (const struct GNUNET_HELLO_Address *a1,
 {
   int ret;
 
+  if ( (NULL == a1) &&
+       (NULL == a2) )
+    return 0;
+  if (NULL == a1)
+    return 1;
+  if (NULL == a2)
+    return -1;
   ret = strcmp (a1->transport_name, a2->transport_name);
   if (0 != ret)
     return ret;
+  if (a1->local_info != a2->local_info)
+    return (((int) a1->local_info) < ((int) a2->local_info)) ? -1 : 1;
   if (a1->address_length < a2->address_length)
     return -1;
   if (a1->address_length > a2->address_length)
     return 1;
-  return memcmp (a1->address, a2->address, a1->address_length);
+  return memcmp (a1->address,
+                 a2->address,
+                 a1->address_length);
 }