diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-02-12 19:27:27 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-02-12 19:27:27 +0000 |
commit | 2fb8352a2f66feacd65a8ec26b73d9bf54da9332 (patch) | |
tree | afe7df1f3852da2a3e39062b96f26b224191b98f /src/exit/exit.h | |
parent | 4e10f640dee8248a7736d8adc5b43a24fc5da162 (diff) | |
download | gnunet-2fb8352a2f66feacd65a8ec26b73d9bf54da9332.tar.gz gnunet-2fb8352a2f66feacd65a8ec26b73d9bf54da9332.zip |
-add missing packed
Diffstat (limited to 'src/exit/exit.h')
-rw-r--r-- | src/exit/exit.h | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/src/exit/exit.h b/src/exit/exit.h index f7366df20..dcc50f1b3 100644 --- a/src/exit/exit.h +++ b/src/exit/exit.h | |||
@@ -28,6 +28,8 @@ | |||
28 | 28 | ||
29 | #include "gnunet_util_lib.h" | 29 | #include "gnunet_util_lib.h" |
30 | 30 | ||
31 | GNUNET_NETWORK_STRUCT_BEGIN | ||
32 | |||
31 | /** | 33 | /** |
32 | * Message send via mesh to an exit daemon to initiate forwarding of | 34 | * Message send via mesh to an exit daemon to initiate forwarding of |
33 | * TCP data to a local service. | 35 | * TCP data to a local service. |
@@ -42,12 +44,12 @@ struct GNUNET_EXIT_TcpServiceStartMessage | |||
42 | /** | 44 | /** |
43 | * Always 0. | 45 | * Always 0. |
44 | */ | 46 | */ |
45 | uint32_t reserved; | 47 | uint32_t reserved GNUNET_PACKED; |
46 | 48 | ||
47 | /** | 49 | /** |
48 | * Identification for the desired service. | 50 | * Identification for the desired service. |
49 | */ | 51 | */ |
50 | GNUNET_HashCode service_descriptor; | 52 | GNUNET_HashCode service_descriptor GNUNET_PACKED; |
51 | 53 | ||
52 | /** | 54 | /** |
53 | * Skeleton of the TCP header to send. Port numbers are to | 55 | * Skeleton of the TCP header to send. Port numbers are to |
@@ -73,7 +75,7 @@ struct GNUNET_EXIT_TcpInternetStartMessage | |||
73 | /** | 75 | /** |
74 | * Address family, AF_INET or AF_INET6, in network byte order. | 76 | * Address family, AF_INET or AF_INET6, in network byte order. |
75 | */ | 77 | */ |
76 | int32_t af; | 78 | int32_t af GNUNET_PACKED; |
77 | 79 | ||
78 | /** | 80 | /** |
79 | * Skeleton of the TCP header to send. Port numbers are to | 81 | * Skeleton of the TCP header to send. Port numbers are to |
@@ -104,7 +106,7 @@ struct GNUNET_EXIT_TcpDataMessage | |||
104 | /** | 106 | /** |
105 | * Always 0. | 107 | * Always 0. |
106 | */ | 108 | */ |
107 | uint32_t reserved; | 109 | uint32_t reserved GNUNET_PACKED; |
108 | 110 | ||
109 | /** | 111 | /** |
110 | * Skeleton of the TCP header to send. Port numbers are to | 112 | * Skeleton of the TCP header to send. Port numbers are to |
@@ -130,17 +132,17 @@ struct GNUNET_EXIT_UdpServiceMessage | |||
130 | /** | 132 | /** |
131 | * Source port to use for the UDP request (0 to use a random port). In NBO. | 133 | * Source port to use for the UDP request (0 to use a random port). In NBO. |
132 | */ | 134 | */ |
133 | uint16_t source_port; | 135 | uint16_t source_port GNUNET_PACKED; |
134 | 136 | ||
135 | /** | 137 | /** |
136 | * Destination port to use for the UDP request. In NBO. | 138 | * Destination port to use for the UDP request. In NBO. |
137 | */ | 139 | */ |
138 | uint16_t destination_port; | 140 | uint16_t destination_port GNUNET_PACKED; |
139 | 141 | ||
140 | /** | 142 | /** |
141 | * Identification for the desired service. | 143 | * Identification for the desired service. |
142 | */ | 144 | */ |
143 | GNUNET_HashCode service_descriptor; | 145 | GNUNET_HashCode service_descriptor GNUNET_PACKED; |
144 | 146 | ||
145 | /* followed by UDP payload */ | 147 | /* followed by UDP payload */ |
146 | }; | 148 | }; |
@@ -160,17 +162,17 @@ struct GNUNET_EXIT_UdpInternetMessage | |||
160 | /** | 162 | /** |
161 | * Address family, AF_INET or AF_INET6, in network byte order. | 163 | * Address family, AF_INET or AF_INET6, in network byte order. |
162 | */ | 164 | */ |
163 | int32_t af; | 165 | int32_t af GNUNET_PACKED; |
164 | 166 | ||
165 | /** | 167 | /** |
166 | * Source port to use for the UDP request (0 to use a random port). In NBO. | 168 | * Source port to use for the UDP request (0 to use a random port). In NBO. |
167 | */ | 169 | */ |
168 | uint16_t source_port; | 170 | uint16_t source_port GNUNET_PACKED; |
169 | 171 | ||
170 | /** | 172 | /** |
171 | * Destination port to use for the UDP request. In NBO. | 173 | * Destination port to use for the UDP request. In NBO. |
172 | */ | 174 | */ |
173 | uint16_t destination_port; | 175 | uint16_t destination_port GNUNET_PACKED; |
174 | 176 | ||
175 | /* followed by IP address of the destination; either | 177 | /* followed by IP address of the destination; either |
176 | 'struct in_addr' or 'struct in6_addr', depending on af */ | 178 | 'struct in_addr' or 'struct in6_addr', depending on af */ |
@@ -194,13 +196,13 @@ struct GNUNET_EXIT_UdpReplyMessage | |||
194 | * Source port to use for the UDP reply (0 to use the same | 196 | * Source port to use for the UDP reply (0 to use the same |
195 | * port as for the original request). In NBO. | 197 | * port as for the original request). In NBO. |
196 | */ | 198 | */ |
197 | uint16_t source_port; | 199 | uint16_t source_port GNUNET_PACKED; |
198 | 200 | ||
199 | /** | 201 | /** |
200 | * Destination port to use for the UDP reply (0 to use the same | 202 | * Destination port to use for the UDP reply (0 to use the same |
201 | * port as for the original request). In NBO. | 203 | * port as for the original request). In NBO. |
202 | */ | 204 | */ |
203 | uint16_t destination_port; | 205 | uint16_t destination_port GNUNET_PACKED; |
204 | 206 | ||
205 | /* followed by UDP payload */ | 207 | /* followed by UDP payload */ |
206 | }; | 208 | }; |
@@ -223,12 +225,12 @@ struct GNUNET_EXIT_IcmpServiceMessage | |||
223 | * The receiver (exit) may still have to translate (PT) to the services' | 225 | * The receiver (exit) may still have to translate (PT) to the services' |
224 | * ICMP version (if possible). | 226 | * ICMP version (if possible). |
225 | */ | 227 | */ |
226 | int32_t af; | 228 | int32_t af GNUNET_PACKED; |
227 | 229 | ||
228 | /** | 230 | /** |
229 | * Identification for the desired service. | 231 | * Identification for the desired service. |
230 | */ | 232 | */ |
231 | GNUNET_HashCode service_descriptor; | 233 | GNUNET_HashCode service_descriptor GNUNET_PACKED; |
232 | 234 | ||
233 | /** | 235 | /** |
234 | * ICMP header to use. | 236 | * ICMP header to use. |
@@ -259,7 +261,7 @@ struct GNUNET_EXIT_IcmpInternetMessage | |||
259 | * the IP address format that is used for the target IP. If | 261 | * the IP address format that is used for the target IP. If |
260 | * PT is necessary, the sender has already done it. | 262 | * PT is necessary, the sender has already done it. |
261 | */ | 263 | */ |
262 | int32_t af; | 264 | int32_t af GNUNET_PACKED; |
263 | 265 | ||
264 | /** | 266 | /** |
265 | * ICMP header to use. Must match the target 'af' given | 267 | * ICMP header to use. Must match the target 'af' given |
@@ -292,7 +294,7 @@ struct GNUNET_EXIT_IcmpToVPNMessage | |||
292 | * Address family, AF_INET or AF_INET6, in network byte order. | 294 | * Address family, AF_INET or AF_INET6, in network byte order. |
293 | * Useful to determine if this is an ICMPv4 or ICMPv6 header. | 295 | * Useful to determine if this is an ICMPv4 or ICMPv6 header. |
294 | */ | 296 | */ |
295 | int32_t af; | 297 | int32_t af GNUNET_PACKED; |
296 | 298 | ||
297 | /** | 299 | /** |
298 | * ICMP header to use. ICMPv4 or ICMPv6, depending on 'af'. | 300 | * ICMP header to use. ICMPv4 or ICMPv6, depending on 'af'. |
@@ -306,4 +308,6 @@ struct GNUNET_EXIT_IcmpToVPNMessage | |||
306 | }; | 308 | }; |
307 | 309 | ||
308 | 310 | ||
311 | GNUNET_NETWORK_STRUCT_END | ||
312 | |||
309 | #endif | 313 | #endif |