RECLAIM/OIDC: code cleanup

[oweals/gnunet.git] / src / vpn / vpn.h

diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h
index 90bcdaa614bd32623cdaa50f55cd30d647f5dd84..4c106361efb77a7d42d906abf33e30f364e78cdc 100644 (file)
--- a/src/vpn/vpn.h
+++ b/src/vpn/vpn.h
@@ -1,21 +1,21 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff
+     Copyright (C) 2012 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., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
@@ -28,6 +28,8 @@
 
 #include "gnunet_util_lib.h"
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Message send by the VPN client to the VPN service requesting
  * the setup of a redirection from some IP via an exit node to
@@ -36,16 +38,15 @@
 struct RedirectToIpRequestMessage
 {
   /**
-   * Type is  GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP
+   * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * GNUNET_YES to notify only after completion of the mesh-level connection,
-   * GNUNET_NO to notify as soon as an address was allocated (in nbo).
+   * Always zero.
    */
-  int32_t nac;
-  
+  uint32_t reserved GNUNET_PACKED;
+
   /**
    * How long should the redirection be maintained at most?
    */
@@ -54,21 +55,21 @@ struct RedirectToIpRequestMessage
   /**
    * Address family desired for the result (AF_INET or AF_INET6 or AF_UNSPEC, in nbo)
    */
-  int32_t result_af;
+  int32_t result_af GNUNET_PACKED;
 
   /**
    * Address family used for the destination address (AF_INET or AF_INET6, in nbo)
    */
-  int32_t addr_af;
+  int32_t addr_af GNUNET_PACKED;
 
   /**
    * Unique ID to match a future response to this request.
    * Picked by the client.
    */
-  uint64_t request_id;
+  uint64_t request_id GNUNET_PACKED;
 
   /* followed by destination address ('struct in_addr' or 'struct in6_addr') */
-  
+
 };
 
 
@@ -80,16 +81,15 @@ struct RedirectToIpRequestMessage
 struct RedirectToServiceRequestMessage
 {
   /**
-   * Type is  GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP
+   * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * GNUNET_YES to notify only after completion of the mesh-level connection,
-   * GNUNET_NO to notify as soon as an address was allocated (in nbo).
+   * Always zero.
    */
-  int32_t nac;
-  
+  uint32_t reserved GNUNET_PACKED;
+
   /**
    * How long should the redirection be maintained at most?
    */
@@ -98,12 +98,12 @@ struct RedirectToServiceRequestMessage
   /**
    * Desired protocol (IPPROTO_UDP or IPPROTO_TCP)
    */
-  int32_t protocol;
-  
+  int32_t protocol GNUNET_PACKED;
+
   /**
    * Address family desired for the result (AF_INET or AF_INET6 or AF_UNSPEC, in nbo)
    */
-  int32_t result_af;
+  int32_t result_af GNUNET_PACKED;
 
   /**
    * Target peer offering the service.
@@ -113,13 +113,13 @@ struct RedirectToServiceRequestMessage
   /**
    * Service descriptor identifying the service.
    */
-  struct GNUNET_PeerIdentity desc;
+  struct GNUNET_HashCode service_descriptor;
 
   /**
    * Unique ID to match a future response to this request.
    * Picked by the client.
    */
-  uint64_t request_id;
+  uint64_t request_id GNUNET_PACKED;
 
 };
 
@@ -130,9 +130,9 @@ struct RedirectToServiceRequestMessage
  */
 struct RedirectToIpResponseMessage
 {
-  
+
   /**
-   * Type is  GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP
+   * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP
    */
   struct GNUNET_MessageHeader header;
 
@@ -140,11 +140,18 @@ struct RedirectToIpResponseMessage
    * Address family of the allocated address that follows; will match
    * "result_af" from the request, of be "AF_UNSPEC" on errors.
    */
-  int32_t result_af;
+  int32_t result_af GNUNET_PACKED;
+
+  /**
+   * Unique ID to match the response to a request.
+   */
+  uint64_t request_id GNUNET_PACKED;
 
   /* followed by destination address ('struct in_addr' or 'struct in6_addr') */
-  
+
 };
 
+GNUNET_NETWORK_STRUCT_END
+
 
 #endif