/*
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
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.
*/
/**
#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
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?
*/
/**
* 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') */
-
+
};
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?
*/
/**
* 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.
/**
* Service descriptor identifying the service.
*/
- GNUNET_HashCode service_descriptor;
+ 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;
};
*/
struct RedirectToIpResponseMessage
{
-
+
/**
- * Type is GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP
+ * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP
*/
struct GNUNET_MessageHeader header;
* 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;
+ uint64_t request_id GNUNET_PACKED;
/* followed by destination address ('struct in_addr' or 'struct in6_addr') */
-
+
};
+GNUNET_NETWORK_STRUCT_END
+
#endif