aboutsummaryrefslogtreecommitdiff
path: root/src/vpn
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-02-12 19:27:27 +0000
committerChristian Grothoff <christian@grothoff.org>2012-02-12 19:27:27 +0000
commit2fb8352a2f66feacd65a8ec26b73d9bf54da9332 (patch)
treeafe7df1f3852da2a3e39062b96f26b224191b98f /src/vpn
parent4e10f640dee8248a7736d8adc5b43a24fc5da162 (diff)
downloadgnunet-2fb8352a2f66feacd65a8ec26b73d9bf54da9332.tar.gz
gnunet-2fb8352a2f66feacd65a8ec26b73d9bf54da9332.zip
-add missing packed
Diffstat (limited to 'src/vpn')
-rw-r--r--src/vpn/vpn.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h
index 4a80e1812..e937f5ef5 100644
--- a/src/vpn/vpn.h
+++ b/src/vpn/vpn.h
@@ -28,6 +28,8 @@
28 28
29#include "gnunet_util_lib.h" 29#include "gnunet_util_lib.h"
30 30
31GNUNET_NETWORK_STRUCT_BEGIN
32
31/** 33/**
32 * Message send by the VPN client to the VPN service requesting 34 * Message send by the VPN client to the VPN service requesting
33 * the setup of a redirection from some IP via an exit node to 35 * the setup of a redirection from some IP via an exit node to
@@ -44,7 +46,7 @@ struct RedirectToIpRequestMessage
44 * GNUNET_YES to notify only after completion of the mesh-level connection, 46 * GNUNET_YES to notify only after completion of the mesh-level connection,
45 * GNUNET_NO to notify as soon as an address was allocated (in nbo). 47 * GNUNET_NO to notify as soon as an address was allocated (in nbo).
46 */ 48 */
47 int32_t nac; 49 int32_t nac GNUNET_PACKED;
48 50
49 /** 51 /**
50 * How long should the redirection be maintained at most? 52 * How long should the redirection be maintained at most?
@@ -54,18 +56,18 @@ struct RedirectToIpRequestMessage
54 /** 56 /**
55 * Address family desired for the result (AF_INET or AF_INET6 or AF_UNSPEC, in nbo) 57 * Address family desired for the result (AF_INET or AF_INET6 or AF_UNSPEC, in nbo)
56 */ 58 */
57 int32_t result_af; 59 int32_t result_af GNUNET_PACKED;
58 60
59 /** 61 /**
60 * Address family used for the destination address (AF_INET or AF_INET6, in nbo) 62 * Address family used for the destination address (AF_INET or AF_INET6, in nbo)
61 */ 63 */
62 int32_t addr_af; 64 int32_t addr_af GNUNET_PACKED;
63 65
64 /** 66 /**
65 * Unique ID to match a future response to this request. 67 * Unique ID to match a future response to this request.
66 * Picked by the client. 68 * Picked by the client.
67 */ 69 */
68 uint64_t request_id; 70 uint64_t request_id GNUNET_PACKED;
69 71
70 /* followed by destination address ('struct in_addr' or 'struct in6_addr') */ 72 /* followed by destination address ('struct in_addr' or 'struct in6_addr') */
71 73
@@ -88,7 +90,7 @@ struct RedirectToServiceRequestMessage
88 * GNUNET_YES to notify only after completion of the mesh-level connection, 90 * GNUNET_YES to notify only after completion of the mesh-level connection,
89 * GNUNET_NO to notify as soon as an address was allocated (in nbo). 91 * GNUNET_NO to notify as soon as an address was allocated (in nbo).
90 */ 92 */
91 int32_t nac; 93 int32_t nac GNUNET_PACKED;
92 94
93 /** 95 /**
94 * How long should the redirection be maintained at most? 96 * How long should the redirection be maintained at most?
@@ -98,12 +100,12 @@ struct RedirectToServiceRequestMessage
98 /** 100 /**
99 * Desired protocol (IPPROTO_UDP or IPPROTO_TCP) 101 * Desired protocol (IPPROTO_UDP or IPPROTO_TCP)
100 */ 102 */
101 int32_t protocol; 103 int32_t protocol GNUNET_PACKED;
102 104
103 /** 105 /**
104 * Address family desired for the result (AF_INET or AF_INET6 or AF_UNSPEC, in nbo) 106 * Address family desired for the result (AF_INET or AF_INET6 or AF_UNSPEC, in nbo)
105 */ 107 */
106 int32_t result_af; 108 int32_t result_af GNUNET_PACKED;
107 109
108 /** 110 /**
109 * Target peer offering the service. 111 * Target peer offering the service.
@@ -113,13 +115,13 @@ struct RedirectToServiceRequestMessage
113 /** 115 /**
114 * Service descriptor identifying the service. 116 * Service descriptor identifying the service.
115 */ 117 */
116 GNUNET_HashCode service_descriptor; 118 GNUNET_HashCode service_descriptor GNUNET_PACKED;
117 119
118 /** 120 /**
119 * Unique ID to match a future response to this request. 121 * Unique ID to match a future response to this request.
120 * Picked by the client. 122 * Picked by the client.
121 */ 123 */
122 uint64_t request_id; 124 uint64_t request_id GNUNET_PACKED;
123 125
124}; 126};
125 127
@@ -140,16 +142,18 @@ struct RedirectToIpResponseMessage
140 * Address family of the allocated address that follows; will match 142 * Address family of the allocated address that follows; will match
141 * "result_af" from the request, of be "AF_UNSPEC" on errors. 143 * "result_af" from the request, of be "AF_UNSPEC" on errors.
142 */ 144 */
143 int32_t result_af; 145 int32_t result_af GNUNET_PACKED;
144 146
145 /** 147 /**
146 * Unique ID to match the response to a request. 148 * Unique ID to match the response to a request.
147 */ 149 */
148 uint64_t request_id; 150 uint64_t request_id GNUNET_PACKED;
149 151
150 /* followed by destination address ('struct in_addr' or 'struct in6_addr') */ 152 /* followed by destination address ('struct in_addr' or 'struct in6_addr') */
151 153
152}; 154};
153 155
156GNUNET_NETWORK_STRUCT_END
157
154 158
155#endif 159#endif