Ensure that struct sockaddr is long enough...

diff --git a/src/include/gpxe/socket.h b/src/include/gpxe/socket.h
index a89b3aff45e242c139169c82bff7a0e16b3de0c3..44322f24fa9c525294a36260be1216d5c9cd20a4 100644 (file)
--- a/src/include/gpxe/socket.h
+++ b/src/include/gpxe/socket.h
@@ -14,6 +14,9 @@
 /** A socket address family */
 typedef uint16_t sa_family_t;
 
+/** Length of a @c struct @c sockaddr */
+#define SA_LEN 32
+
 /**
  * Generalized socket address structure
  *
@@ -26,6 +29,13 @@ struct sockaddr {
         * This is an AF_XXX constant.
         */
         sa_family_t sa_family;
+       /** Padding
+        *
+        * This ensures that a struct @c sockaddr_tcpip is large
+        * enough to hold a socket address for any TCP/IP address
+        * family.
+        */
+       char pad[ SA_LEN - sizeof ( sa_family_t ) ];
 };
 
 #endif /* _GPXE_SOCKET_H */

diff --git a/src/include/gpxe/tcpip.h b/src/include/gpxe/tcpip.h
index 2508d5f504928fff1c6e16f8b73095b51ad362ed..ec708bc6fe4fb42c53108a2683b20c57590c5e3f 100644 (file)
--- a/src/include/gpxe/tcpip.h
+++ b/src/include/gpxe/tcpip.h
@@ -21,9 +21,6 @@ struct net_device;
  */
 #define TCPIP_EMPTY_CSUM 0xffff
 
-/** Length of a @c struct @c sockaddr_tcpip */
-#define SA_TCPIP_LEN 32
-
 /**
  * TCP/IP socket address
  *
@@ -41,7 +38,8 @@ struct sockaddr_tcpip {
         * enough to hold a socket address for any TCP/IP address
         * family.
         */
-       char pad[SA_TCPIP_LEN - sizeof ( sa_family_t ) - sizeof ( uint16_t )];
+       char pad[ sizeof ( struct sockaddr ) -
+                 ( sizeof ( sa_family_t ) + sizeof ( uint16_t ) ) ];
 };
 
 /**