From: David Barksdale <amatus.amongus@gmail.com>
Date: Tue, 29 Jun 2010 06:33:59 +0000 (+0000)
Subject: Remove the 2 padding bytes (that are currently filled with junk) at the end of the... 
X-Git-Tag: initial-import-from-subversion-38251~21135
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b51130e1f156917a1ddd892c645d871b84192ad6;p=oweals%2Fgnunet.git

Remove the 2 padding bytes (that are currently filled with junk) at the end of the tcp/udp/http transport addresses.
---

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index 905105ce3..b412b46ae 100644
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -77,12 +77,12 @@ struct IPv4HttpAddress
   /**
    * IPv4 address, in network byte order.
    */
-  uint32_t ipv4_addr;
+  uint32_t ipv4_addr GNUNET_PACKED;
 
   /**
    * Port number, in network byte order.
    */
-  uint16_t u_port;
+  uint16_t u_port GNUNET_PACKED;
 
 };
 
@@ -95,12 +95,12 @@ struct IPv6HttpAddress
   /**
    * IPv6 address.
    */
-  struct in6_addr ipv6_addr;
+  struct in6_addr ipv6_addr GNUNET_PACKED;
 
   /**
    * Port number, in network byte order.
    */
-  uint16_t u6_port;
+  uint16_t u6_port GNUNET_PACKED;
 
 };
 
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 2737003ab..6ac539ccd 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -116,12 +116,12 @@ struct IPv4TcpAddress
   /**
    * IPv4 address, in network byte order.
    */
-  uint32_t ipv4_addr;
+  uint32_t ipv4_addr GNUNET_PACKED;
 
   /**
    * Port number, in network byte order.
    */
-  uint16_t t_port;
+  uint16_t t_port GNUNET_PACKED;
 
 };
 
@@ -134,12 +134,12 @@ struct IPv6TcpAddress
   /**
    * IPv6 address.
    */
-  struct in6_addr ipv6_addr;
+  struct in6_addr ipv6_addr GNUNET_PACKED;
 
   /**
    * Port number, in network byte order.
    */
-  uint16_t t6_port;
+  uint16_t t6_port GNUNET_PACKED;
 
 };
 
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 1f079801c..2beda31b3 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -99,12 +99,12 @@ struct IPv4UdpAddress
   /**
    * IPv4 address, in network byte order.
    */
-  uint32_t ipv4_addr;
+  uint32_t ipv4_addr GNUNET_PACKED;
 
   /**
    * Port number, in network byte order.
    */
-  uint16_t u_port;
+  uint16_t u_port GNUNET_PACKED;
 };
 
 
@@ -116,12 +116,12 @@ struct IPv6UdpAddress
   /**
    * IPv6 address.
    */
-  struct in6_addr ipv6_addr;
+  struct in6_addr ipv6_addr GNUNET_PACKED;
 
   /**
    * Port number, in network byte order.
    */
-  uint16_t u6_port;
+  uint16_t u6_port GNUNET_PACKED;
 };
 
 /* Forward definition */