RECLAIM/OIDC: code cleanup

[oweals/gnunet.git] / src / vpn / gnunet-service-vpn.c

diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 4759f374661e0ba46c4969ee0383ba5e8eade6a6..91bc13fd82165c0813d51accd2c9096a7ab06a6b 100644 (file)
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -2,20 +2,20 @@
      This file is part of GNUnet.
      Copyright (C) 2010, 2011, 2012, 2016, 2017 Christian Grothoff
 
-     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., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
@@ -1839,7 +1839,7 @@ route_packet (struct DestinationEntry *destination,
 
       mlen = sizeof (struct GNUNET_EXIT_UdpServiceMessage) +
        payload_length - sizeof (struct GNUNET_TUN_UdpHeader);
-      if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+      if (mlen >= GNUNET_MAX_MESSAGE_SIZE)
       {
        GNUNET_break (0);
        return;
@@ -1864,7 +1864,7 @@ route_packet (struct DestinationEntry *destination,
 
       mlen = sizeof (struct GNUNET_EXIT_UdpInternetMessage) +
        alen + payload_length - sizeof (struct GNUNET_TUN_UdpHeader);
-      if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+      if (mlen >= GNUNET_MAX_MESSAGE_SIZE)
       {
        GNUNET_break (0);
        return;
@@ -1904,7 +1904,7 @@ route_packet (struct DestinationEntry *destination,
 
        mlen = sizeof (struct GNUNET_EXIT_TcpServiceStartMessage) +
          payload_length - sizeof (struct GNUNET_TUN_TcpHeader);
-       if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+       if (mlen >= GNUNET_MAX_MESSAGE_SIZE)
        {
          GNUNET_break (0);
          return;
@@ -1927,7 +1927,7 @@ route_packet (struct DestinationEntry *destination,
 
        mlen = sizeof (struct GNUNET_EXIT_TcpInternetStartMessage) +
          alen + payload_length - sizeof (struct GNUNET_TUN_TcpHeader);
-       if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+       if (mlen >= GNUNET_MAX_MESSAGE_SIZE)
        {
          GNUNET_break (0);
          return;
@@ -1963,7 +1963,7 @@ route_packet (struct DestinationEntry *destination,
 
       mlen = sizeof (struct GNUNET_EXIT_TcpDataMessage) +
        payload_length - sizeof (struct GNUNET_TUN_TcpHeader);
-      if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+      if (mlen >= GNUNET_MAX_MESSAGE_SIZE)
       {
        GNUNET_break (0);
        return;
@@ -2038,7 +2038,7 @@ route_packet (struct DestinationEntry *destination,
       /* update length calculations, as payload_length may have changed */
       mlen = sizeof (struct GNUNET_EXIT_IcmpServiceMessage) +
        alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
-      if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+      if (mlen >= GNUNET_MAX_MESSAGE_SIZE)
       {
        GNUNET_break (0);
        return;
@@ -2168,7 +2168,7 @@ route_packet (struct DestinationEntry *destination,
       /* update length calculations, as payload_length may have changed */
       mlen = sizeof (struct GNUNET_EXIT_IcmpInternetMessage) +
        alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
-      if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+      if (mlen >= GNUNET_MAX_MESSAGE_SIZE)
       {
        GNUNET_break (0);
        return;
@@ -2218,6 +2218,9 @@ route_packet (struct DestinationEntry *destination,
  *
  * @param cls closure, NULL
  * @param message message we got from the client (VPN channel interface)
+ * @return #GNUNET_OK on success,
+ *    #GNUNET_NO to stop further processing (no error)
+ *    #GNUNET_SYSERR to stop further processing with error
  */
 static int
 message_token (void *cls,
@@ -2434,12 +2437,10 @@ allocate_v6_address (struct in6_addr *v6)
   while ( (GNUNET_YES ==
           GNUNET_CONTAINER_multihashmap_contains (destination_map,
                                                   &key)) ||
-         (0 == memcmp (v6,
-                       &addr,
-                       sizeof (struct in6_addr))) ||
-         (0 == memcmp (v6,
-                       &mask,
-                       sizeof (struct in6_addr))) );
+         (0 == GNUNET_memcmp (v6,
+                       &addr)) ||
+         (0 == GNUNET_memcmp (v6,
+                       &mask)) );
   return GNUNET_OK;
 }