aboutsummaryrefslogtreecommitdiff
path: root/src/transport/plugin_transport_wlan.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-12-21 09:40:15 +0000
committerChristian Grothoff <christian@grothoff.org>2011-12-21 09:40:15 +0000
commitc4f0fe3ea5a5ca3ce1f7dfecef719da631e4c6ac (patch)
tree02e313a83c4416f07fadf650d33aff09dfe46130 /src/transport/plugin_transport_wlan.c
parent40e5092e9a5db88b4c9b62cb341596fbf6ce1cf8 (diff)
downloadgnunet-c4f0fe3ea5a5ca3ce1f7dfecef719da631e4c6ac.tar.gz
gnunet-c4f0fe3ea5a5ca3ce1f7dfecef719da631e4c6ac.zip
fixing 2012: network structure alignment now forced to be correct even on W32 using #pragma pack from gcc 4.x
Diffstat (limited to 'src/transport/plugin_transport_wlan.c')
-rw-r--r--src/transport/plugin_transport_wlan.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index 4c4e9f1ab..d121ec9be 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -120,6 +120,8 @@
120#define IEEE80211_FC0_TYPE_CTL 0x04 120#define IEEE80211_FC0_TYPE_CTL 0x04
121#define IEEE80211_FC0_TYPE_DATA 0x08 121#define IEEE80211_FC0_TYPE_DATA 0x08
122 122
123GNUNET_NETWORK_STRUCT_BEGIN
124
123/* 125/*
124 * generic definitions for IEEE 802.11 frames 126 * generic definitions for IEEE 802.11 frames
125 */ 127 */
@@ -133,6 +135,7 @@ struct ieee80211_frame
133 u_int8_t i_seq[2]; 135 u_int8_t i_seq[2];
134 u_int8_t llc[4]; 136 u_int8_t llc[4];
135} GNUNET_PACKED; 137} GNUNET_PACKED;
138GNUNET_NETWORK_STRUCT_END
136 139
137/** 140/**
138 * Encapsulation of all of the state of the plugin. 141 * Encapsulation of all of the state of the plugin.
@@ -361,6 +364,8 @@ struct Plugin_Session_pair
361}; 364};
362 365
363 366
367GNUNET_NETWORK_STRUCT_BEGIN
368
364/** 369/**
365 * Header for messages which need fragmentation 370 * Header for messages which need fragmentation
366 */ 371 */
@@ -388,7 +393,7 @@ struct WlanHeader
388// followed by payload 393// followed by payload
389 394
390}; 395};
391 396GNUNET_NETWORK_STRUCT_END
392 397
393/** 398/**
394 * Information kept for each message that is yet to 399 * Information kept for each message that is yet to