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

Timestamp:

Nov 15, 2008 8:12:41 PM (16 years ago)

Author:

vboxsync

Message:

initial preparation for injecting FreeBSD IP fragmentation code
(Windows compilation wasn't checked)

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/slirp/ip.h (modified) (2 diffs)
• Network/slirp/ip_input.c (modified) (7 diffs)
• Network/slirp/mbuf.h (modified) (1 diff)
• Network/slirp/slirp.c (modified) (2 diffs)
• Network/slirp/slirp.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -534 +534 @@
 ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
 Drivers_DEFS       = VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
+endif
+ifdef VBOX_WITH_BSD_REASS
+Drivers_DEFS       = VBOX_WITH_BSD_REASS
 endif
 Drivers_INCS      := \

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

@@ -38 +38 @@
 #define _IP_H_
 
+#ifdef VBOX_WITH_BSD_REASS
+# ifndef RT_OS_WINDOWS
+# include <sys/queue.h>
+# else
+/* XXX: Windows has own queue types declared in winnt.h (should look at them once again) */
+# endif
+#endif
+
 #ifdef WORDS_BIGENDIAN
 # ifndef NTOHL
@@ -236 +244 @@
  */
 struct ipq_t {
+#ifndef VBOX_WITH_BSD_REASS
         ipqp_32 next,prev;      /* to other reass headers */
+#else
+        TAILQ_ENTRY(ipq_t) ipq_list;
+#endif
         u_int8_t        ipq_ttl;                /* time for reass q to live */
         u_int8_t        ipq_p;                  /* protocol of this fragment */
         u_int16_t       ipq_id;                 /* sequence id for reassembly */
-        ipasfragp_32 ipq_next,ipq_prev;
-                                        /* to ip headers of fragments */
+#ifndef VBOX_WITH_BSD_REASS
+        ipasfragp_32 ipq_next,ipq_prev;         /* to ip headers of fragments */
+#else
+        struct mbuf *ipq_frags;                 /* to ip headers of fragments */
+#endif
+
         struct  in_addr ipq_src,ipq_dst;
 };

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

@@ -54 +54 @@
 ip_init(PNATState pData)
 {
+#ifndef VBOX_WITH_BSD_REASS
         ipq.next = ipq.prev = ptr_to_u32(pData, &ipq);
+#else /* !VBOX_WITH_BSD_REASS */
+#endif /* VBOX_WITH_BSD_REASS */
         ip_currid = tt.tv_sec & 0xffff;
         udp_init(pData);
@@ -153 +156 @@
          * XXX This should fail, don't fragment yet
          */
+#ifndef VBOX_WITH_BSD_REASS
         if (ip->ip_off &~ IP_DF) {
           register struct ipq_t *fp;
@@ -200 +204 @@
         } else
                 ip->ip_len -= hlen;
+#else /* !VBOX_WITH_BSD_REASS */
+#endif /* !VBOX_WITH_BSD_REASS */
 
         /*
@@ -225 +231 @@
 }
 
+#ifndef VBOX_WITH_BSD_REASS
 /*
  * Take incoming datagram fragment and try to
@@ -402 +409 @@
         (void) m_free(pData, dtom(pData, fp));
 }
+#else /* !VBOX_WITH_BSD_REASS */
+struct mbuf *
+ip_reass(PNATState pData, struct mbuf* m) {
+    return (NULL);
+}
+
+void
+ip_freef(PNATState pData, struct ipq_t *fp) {
+}
+#endif /* VBOX_WITH_BSD_REASS */
 
 /*
@@ -443 +460 @@
         DEBUG_CALL("ip_slowtimo");
 
+#ifndef VBOX_WITH_BSD_REASS
         fp = u32_to_ptr(pData, ipq.next, struct ipq_t *);
         if (fp == 0)
@@ -455 +473 @@
                 }
         }
+#else /* !VBOX_WITH_BSD_REASS */
+    /* XXX: the fragment expiration is the same but requier
+     * additional loop see (see ip_input.c in FreeBSD tree)
+     */
+#endif /* VBOX_WITH_BSD_REASS */
 }
 

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

@@ -120 +120 @@
 #define M_DOFREE                0x08    /* when m_free is called on the mbuf, free()
                                          * it rather than putting it on the free list */
+#ifdef VBOX_WITH_BSD_REASS
+#define M_FRAG                  0x0800  /* packet is a fragment of a larger packet */`
+#define M_FIRSTFRAG             0x1000  /* paket is first fragment */
+#define M_LASTFRAG              0x2000  /* paket is last fragment */
+#endif /* VBOX_WITH_BSD_REASS */
 
 /*

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

@@ -399 +399 @@
                  * in the fragment queue, or there are TCP connections active
                  */
+#ifndef VBOX_WITH_BSD_REASS
                 do_slowtimo = ((tcb.so_next != &tcb) ||
                                ((struct ipasfrag *)&ipq != u32_to_ptr(pData, ipq.next, struct ipasfrag *)));
+#else /* !VBOX_WITH_BSD_REASS */
+    /* XXX: triggering of fragment expiration should be the same but use
+     * new macroses
+     */
+#endif /* VBOX_WITH_BSD_REASS */
 
                 STAM_REL_COUNTER_RESET(&pData->StatTCP);
@@ -792 +798 @@
 
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                        rc = WSAEnumNetworkEvents(so->s, VBOX_SOCKET_EVENT, &NetworkEvents);    
+                        rc = WSAEnumNetworkEvents(so->s, VBOX_SOCKET_EVENT, &NetworkEvents);
                         if (rc == SOCKET_ERROR)
                         {

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

@@ -333 +333 @@
 void ip_init _P((PNATState));
 void ip_input _P((PNATState, struct mbuf *));
+#ifndef VBOX_WITH_BSD_REASS
 struct ip * ip_reass _P((PNATState, register struct ipasfrag *, register struct ipq_t *));
+#else /* !VBOX_WITH_BSD_REASS */
+struct mbuf * ip_reass _P((PNATState, register struct mbuf *));
+#endif  /* VBOX_WITH_BSD_REASS */
 void ip_freef _P((PNATState, struct ipq_t *));
 void ip_enq _P((PNATState, register struct ipasfrag *, register struct ipasfrag *));