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

Timestamp:

Nov 26, 2008 4:20:08 AM (16 years ago)

Author:

vboxsync

Message:

ipovly now conform modern BSD making ih_x1 field as array overlapping ih_{next, prev}
fixing r39862 on 64-bit

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip.h (modified) (2 diffs)
• tcp_input.c (modified) (1 diff)
• tcp_subr.c (modified) (2 diffs)
• udp.c (modified) (2 diffs)

trunk/src/VBox/Devices/Network/slirp/ip.h

@@ -203 +203 @@
 
 #ifdef HAVE_SYS_TYPES32_H  /* Overcome some Solaris 2.x junk */
-#include <sys/types32.h>
-#else
-#if SIZEOF_CHAR_P == 4
+# include <sys/types32.h>
+#else
+# if SIZEOF_CHAR_P == 4
 typedef caddr_t caddr32_t;
-#else
-#if !defined(VBOX_WITH_BSD_REASS) && !defined(VBOX_WITH_BSD_TCP_REASS)
+# else
+#  if !defined(VBOX_WITH_BSD_REASS) && !defined(VBOX_WITH_BSD_TCP_REASS)
 typedef u_int32_t caddr32_t;
-#else /* !VBOX_WITH_BSD_REASS && !VBOX_WITH_BSD_TCP_REASS*/
+#  else /* !VBOX_WITH_BSD_REASS && !VBOX_WITH_BSD_TCP_REASS*/
 typedef caddr_t caddr32_t;
-#endif /* VBOX_WITH_BSD_REASS || VBOX_WITH_BSD_TCP_REASS*/
-#endif
+#  endif /* VBOX_WITH_BSD_REASS || VBOX_WITH_BSD_TCP_REASS*/
+# endif
 #endif
 
@@ -228 +228 @@
  */
 struct ipovly {
+#if !defined(VBOX_WITH_BSD_REASS) && !defined(VBOX_WITH_BSD_TCP_REASS)
         caddr32_t       ih_next, ih_prev;       /* for protocol sequence q's */
         u_int8_t        ih_x1;                  /* (unused) */
+#else /* !VBOX_WITH_BSD_REASS && !VBOX_WITH_BSD_TCP_REASS */
+        u_int8_t        ih_x1[9];                  /* (unused) */
+#endif /* VBOX_WITH_BSD_REASS || VBOX_WITH_BSD_TCP_REASS */
         u_int8_t        ih_pr;                  /* protocol */
         u_int16_t       ih_len;                 /* protocol length */

trunk/src/VBox/Devices/Network/slirp/tcp_input.c

@@ -470 +470 @@
          */
         tlen = ((struct ip *)ti)->ip_len;
+#if !defined(VBOX_WITH_BSD_REASS)
         ti->ti_next = ti->ti_prev = 0;
         ti->ti_x1 = 0;
+#else
+        memset(ti->ti_x1, 0, 9);
+#endif
         ti->ti_len = htons((u_int16_t)tlen);
         len = sizeof(struct ip ) + tlen;

trunk/src/VBox/Devices/Network/slirp/tcp_subr.c

@@ -76 +76 @@
         register struct tcpiphdr *n = &tp->t_template;
 
+#if !defined(VBOX_WITH_BSD_REASS)
         n->ti_next = n->ti_prev = 0;
         n->ti_x1 = 0;
+#else
+        memset(n->ti_x1, 0, 9);
+#endif
         n->ti_pr = IPPROTO_TCP;
         n->ti_len = htons(sizeof (struct tcpiphdr) - sizeof (struct ip));
@@ -154 +158 @@
         m->m_len = tlen;
 
+#if !defined(VBOX_WITH_BSD_REASS)
         ti->ti_next = ti->ti_prev = 0;
         ti->ti_x1 = 0;
+#else
+        memset(ti->ti_x1, 0, 9);
+#endif
         ti->ti_seq = htonl(seq);
         ti->ti_ack = htonl(ack);

trunk/src/VBox/Devices/Network/slirp/udp.c

@@ -123 +123 @@
          */
         if (udpcksum && uh->uh_sum) {
+#if !defined(VBOX_WITH_BSD_REASS)
           ((struct ipovly *)ip)->ih_next = 0;
           ((struct ipovly *)ip)->ih_prev = 0;
           ((struct ipovly *)ip)->ih_x1 = 0;
+#else
+          memset(((struct ipovly *)ip)->ih_x1, 0, 9);
+#endif
           ((struct ipovly *)ip)->ih_len = uh->uh_ulen;
           /* keep uh_sum for ICMP reply
@@ -265 +269 @@
          */
         ui = mtod(m, struct udpiphdr *);
+#if !defined(VBOX_WITH_BSD_REASS)
         ui->ui_next = ui->ui_prev = 0;
         ui->ui_x1 = 0;
+#else
+        memset(ui->ui_x1, 0, 9);
+#endif
         ui->ui_pr = IPPROTO_UDP;
         ui->ui_len = htons(m->m_len - sizeof(struct ip)); /* + sizeof (struct udphdr)); */