fixing 2012: network structure alignment now forced to be correct even on W32 using #pragma pack from gcc 4.x

7 files changed, 48 insertions, 7 deletions

diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index 1c01754de..21dcc7acb 100644
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -13,6 +13,7 @@ enum GNUNET_DNS_ServiceTypes
   GNUNET_DNS_SERVICE_TYPE_TCP = 2
 };
 
+GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * This is the structure describing an dns-record such as www.gnunet.
@@ -57,5 +58,6 @@ struct GNUNET_DNS_Record
    */
   uint32_t service_type GNUNET_PACKED;
 };
+GNUNET_NETWORK_STRUCT_END
 
 #endif
diff --git a/src/include/block_fs.h b/src/include/block_fs.h
index 9dc22e57f..aae741e60 100644
--- a/src/include/block_fs.h
+++ b/src/include/block_fs.h
@@ -139,6 +139,8 @@ struct NBlock
 };
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * @brief index block (indexing a DBlock that
  *        can be obtained directly from reading
@@ -160,6 +162,6 @@ struct OnDemandBlock
   uint64_t offset GNUNET_PACKED;
 
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 #endif
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 898857af8..88cab0d9b 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -403,6 +403,8 @@ enum GNUNET_ATS_Property
 };
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * struct used to communicate the transport's properties like cost and
  * quality of service as well as high-level constraints on resource
@@ -433,7 +435,7 @@ struct GNUNET_ATS_Information
    */
   uint32_t value GNUNET_PACKED;
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 
 /* ******************************** Scheduling API ***************************** */
diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h
index 75f71b32c..fabe47bea 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -38,6 +38,8 @@ extern "C"
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * 32-bit bandwidth used for network exchange by GNUnet, in bytes per second.
  */
@@ -48,7 +50,7 @@ struct GNUNET_BANDWIDTH_Value32NBO
    */
   uint32_t value__ GNUNET_PACKED;
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 /**
  * Struct to track available bandwidth.  Combines a time stamp with a
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 665697a97..134543c46 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -116,9 +116,37 @@
  */
 #define GNUNET_UNUSED __attribute__((unused))
 
+#if __GNUC__ > 3
+/**
+ * gcc 4.x-ism to pack structures even on W32 (to be used before structs)
+ */
+#define GNUNET_NETWORK_STRUCT_BEGIN \
+  _Pragma("pack(push)") \
+  _Pragma("pack(1)")
+
+/**
+ * gcc 4.x-ism to pack structures even on W32 (to be used after structs)
+ */
+#define GNUNET_NETWORK_STRUCT_END _Pragma("pack(pop)")
+#else
+#ifdef MINGW
+#error gcc 4.x or higher required on W32 systems
+#endif
+/**
+ * Good luck, GNUNET_PACKED should suffice, but this won't work on W32
+ */
+#define GNUNET_NETWORK_STRUCT_BEGIN 
+
+/**
+ * Good luck, GNUNET_PACKED should suffice, but this won't work on W32
+ */
+#define GNUNET_NETWORK_STRUCT_END
+#endif
 
 /* ************************ super-general types *********************** */
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Header for all communications.
  */
@@ -137,7 +165,7 @@ struct GNUNET_MessageHeader
   uint16_t type GNUNET_PACKED;
 
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 /**
  * @brief 512-bit hashcode
@@ -149,6 +177,8 @@ typedef struct
 GNUNET_HashCode;
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * The identity of the host (basically the SHA-512 hashcode of
  * it's public key).
@@ -157,7 +187,7 @@ struct GNUNET_PeerIdentity
 {
   GNUNET_HashCode hashPubKey GNUNET_PACKED;
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 /**
  * Function called with a filename.
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 53137c179..76806d432 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -121,6 +121,8 @@ struct GNUNET_CRYPTO_RsaSignature
 };
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * @brief header of what an RSA signature signs
  *        this must be followed by "size - 8" bytes of
@@ -197,7 +199,7 @@ struct GNUNET_CRYPTO_AesSessionKey
    */
   uint32_t crc32 GNUNET_PACKED;
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 /**
  * @brief IV for sym cipher
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index f8afdae41..7090c33a1 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -61,6 +61,7 @@ struct GNUNET_TIME_Relative
   uint64_t rel_value;
 };
 
+GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * Time for relative time used by GNUnet, in milliseconds and in network byte order.
@@ -84,7 +85,7 @@ struct GNUNET_TIME_AbsoluteNBO
    */
   uint64_t abs_value__ GNUNET_PACKED;
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 /**
  * Relative time zero.