plugin datastore mysql

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

diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h
index bec3a5b59cda3b378d7493dc2f4d5526996b21fe..1f47724efb4e470a992254721a3a4a7a98bfc785 100644 (file)
--- a/src/vpn/vpn.h
+++ b/src/vpn/vpn.h
@@ -1,6 +1,6 @@
 /*
      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
@@ -14,8 +14,8 @@
 
      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.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -38,16 +38,15 @@ GNUNET_NETWORK_STRUCT_BEGIN
 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 GNUNET_PACKED;
-  
+  uint32_t reserved GNUNET_PACKED;
+
   /**
    * How long should the redirection be maintained at most?
    */
@@ -70,7 +69,7 @@ struct RedirectToIpRequestMessage
   uint64_t request_id GNUNET_PACKED;
 
   /* followed by destination address ('struct in_addr' or 'struct in6_addr') */
-  
+
 };
 
 
@@ -82,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 GNUNET_PACKED;
-  
+  uint32_t reserved GNUNET_PACKED;
+
   /**
    * How long should the redirection be maintained at most?
    */
@@ -101,7 +99,7 @@ struct RedirectToServiceRequestMessage
    * Desired protocol (IPPROTO_UDP or IPPROTO_TCP)
    */
   int32_t protocol GNUNET_PACKED;
-  
+
   /**
    * Address family desired for the result (AF_INET or AF_INET6 or AF_UNSPEC, in nbo)
    */
@@ -115,7 +113,7 @@ struct RedirectToServiceRequestMessage
   /**
    * Service descriptor identifying the service.
    */
-  GNUNET_HashCode service_descriptor;
+  struct GNUNET_HashCode service_descriptor;
 
   /**
    * Unique ID to match a future response to this request.
@@ -132,9 +130,9 @@ struct RedirectToServiceRequestMessage
  */
 struct RedirectToIpResponseMessage
 {
-  
+
   /**
-   * Type is  GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP
+   * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP
    */
   struct GNUNET_MessageHeader header;
 
@@ -150,7 +148,7 @@ struct RedirectToIpResponseMessage
   uint64_t request_id GNUNET_PACKED;
 
   /* followed by destination address ('struct in_addr' or 'struct in6_addr') */
-  
+
 };
 
 GNUNET_NETWORK_STRUCT_END