Changeset 14228 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Nov 16, 2008 6:36:37 AM (16 years ago)

Author:

vboxsync

Message:

hash table for BSD-styled fragmentation/reassembling introduced and its initialization

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip.h (modified) (1 diff)
• ip_input.c (modified) (1 diff)
• slirp_state.h (modified) (2 diffs)

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

@@ -261 +261 @@
 };
 
+#ifdef VBOX_WITH_BSD_REASS
+/*
+* IP datagram reassembly.
+*/
+#define IPREASS_NHASH_LOG2      6
+#define IPREASS_NHASH           (1 << IPREASS_NHASH_LOG2)
+#define IPREASS_HMASK           (IPREASS_NHASH - 1)
+#define IPREASS_HASH(x,y) \
+(((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK)
+TAILQ_HEAD(ipqhead,ipq_t);
+#endif /* VBOX_WITH_BSD_REASS */
+
 /*
  * Ip header, when holding a fragment.

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

@@ -57 +57 @@
         ipq.next = ipq.prev = ptr_to_u32(pData, &ipq);
 #else /* !VBOX_WITH_BSD_REASS */
+        int i = 0;
+        for (i = 0; i < IPREASS_NHASH; ++i)
+            TAILQ_INIT(&ipq[i]);
 #endif /* VBOX_WITH_BSD_REASS */
         ip_currid = tt.tv_sec & 0xffff;

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

@@ -69 +69 @@
     /* Stuff from ip_input.c */
     struct ipstat_t ipstat;
+#ifndef VBOX_WITH_BSD_REASS
     struct ipq_t ipq;
+#else /* !VBOX_WITH_BSD_REASS */
+    struct ipqhead ipq[IPREASS_NHASH];
+#endif /* VBOX_WITH_BSD_REASS */
     uint16_t ip_currid;
     /* Stuff from mbuf.c */
@@ -116 +120 @@
     struct socket udb;
     struct socket *udp_last_so;
-#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) 
+#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
 # define VBOX_SOCKET_EVENT (pData->phEvents[VBOX_SOCKET_EVENT_INDEX])
     HANDLE phEvents[VBOX_EVENT_COUNT];