Changeset 50169 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 23, 2014 3:40:12 AM (11 years ago)

Author:

vboxsync

Message:

lwip: Sync with git master up to
commit ae300c98a4107458d0aa040c074d89ee9d3ac984
Date: Sat Jun 29 21:47:22 2013 +0200

These git commits don't affect VBox, same object code is generated.

Location:

trunk/src/VBox/Devices/Network/lwip-new

Files:

• CHANGELOG (modified) (1 diff)
• src/include/ipv4/lwip/inet.h (modified) (1 diff)
• src/include/ipv6/lwip/inet6.h (modified) (1 diff)
• src/include/lwip/sockets.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/lwip-new/CHANGELOG

@@ -80 +80 @@
 
  ++ Bugfixes:
+
+  2013-06-29: Simon Goldschmidt
+  * inet.h, sockets.h: partially fixed bug #37585: IPv6 compatibility (in socket structs)
+
+  2013-06-29: Simon Goldschmidt
+  * inet6.h: bug #37585/task #12600: fixed struct in6_addr.s6_addr to conform to spec
 
   2013-04-24: patch by Liam <morepork>

trunk/src/VBox/Devices/Network/lwip-new/src/include/ipv4/lwip/inet.h

@@ -41 +41 @@
 #endif
 
+/* If your port already typedef's in_addr_t, define IN_ADDR_T_DEFINED
+   to prevent this code from redefining it. */
+#if !defined(in_addr_t) && !defined(IN_ADDR_T_DEFINED)
+typedef u32_t in_addr_t;
+#endif
 /** For compatibility with BSD code */
 struct in_addr {
-  u32_t s_addr;
+  in_addr_t s_addr;
 };
 

trunk/src/VBox/Devices/Network/lwip-new/src/include/ipv6/lwip/inet6.h

@@ -59 +59 @@
     u32_t u32_addr[4];
   } un;
-#define s6_addr  un.u32_addr
+#define s6_addr  un.u8_addr
 };
 

trunk/src/VBox/Devices/Network/lwip-new/src/include/lwip/sockets.h

@@ -49 +49 @@
 #endif
 
+/* If your port already typedef's sa_family_t, define SA_FAMILY_T_DEFINED
+   to prevent this code from redefining it. */
+#if !defined(sa_family_t) && !defined(SA_FAMILY_T_DEFINED)
+typedef u8_t sa_family_t;
+#endif
+/* If your port already typedef's in_port_t, define IN_PORT_T_DEFINED
+   to prevent this code from redefining it. */
+#if !defined(in_port_t) && !defined(IN_PORT_T_DEFINED)
+typedef u16_t in_port_t;
+#endif
+
 /* members are in network byte order */
 struct sockaddr_in {
-  u8_t sin_len;
-  u8_t sin_family;
-  u16_t sin_port;
-  struct in_addr sin_addr;
+  u8_t            sin_len;
+  sa_family_t     sin_family;
+  in_port_t       sin_port;
+  struct in_addr  sin_addr;
 #define SIN_ZERO_LEN 8
-  char sin_zero[SIN_ZERO_LEN];
+  char            sin_zero[SIN_ZERO_LEN];
 };
 
 #if LWIP_IPV6
 struct sockaddr_in6 {
-  u8_t sin6_len;             /* length of this structure */
-  u8_t sin6_family;          /* AF_INET6                 */
-  u16_t sin6_port;           /* Transport layer port #   */
-  u32_t sin6_flowinfo;       /* IPv6 flow information    */
-  struct in6_addr sin6_addr; /* IPv6 address             */
+  u8_t            sin6_len;      /* length of this structure */
+  sa_family_t     sin6_family;   /* AF_INET6                 */
+  in_port_t       sin6_port;     /* Transport layer port #   */
+  u32_t           sin6_flowinfo; /* IPv6 flow information    */
+  struct in6_addr sin6_addr;     /* IPv6 address             */
 };
 #endif /* LWIP_IPV6 */
 
 struct sockaddr {
-  u8_t sa_len;
-  u8_t sa_family;
-#if LWIP_IPV6
-  u8_t sa_data[22];
+  u8_t        sa_len;
+  sa_family_t sa_family;
+#if LWIP_IPV6
+  char        sa_data[22];
 #else /* LWIP_IPV6 */
-  u8_t sa_data[14];
+  char        sa_data[14];
+#endif /* LWIP_IPV6 */
+};
+
+struct sockaddr_storage {
+  u8_t        s2_len;
+  sa_family_t ss_family;
+  char        s2_data1[2];
+  u32_t       s2_data2[3];
+#if LWIP_IPV6
+  u32_t       s2_data3[2];
 #endif /* LWIP_IPV6 */
 };