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

Timestamp:

Nov 18, 2008 3:29:39 PM (16 years ago)

Author:

vboxsync

Message:

#else /* what comes now */

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• tcp_input.c (modified) (5 diffs)
• tcp_subr.c (modified) (2 diffs)
• tcp_var.h (modified) (1 diff)

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

@@ -221 +221 @@
 }
 
-#else /* !VBOX_WITH_BSD_TCP_REASS */
+#else /* VBOX_WITH_BSD_TCP_REASS */
 
 #ifndef TCP_ACK_HACK
@@ -729 +729 @@
 #ifndef VBOX_WITH_BSD_TCP_REASS
                     u32_to_ptr(pData, tp->seg_next, struct tcpcb *) == tp &&
-#else /* !VBOX_WITH_BSD_TCP_REASS */
+#else  /* VBOX_WITH_BSD_TCP_REASS */
                     LIST_FIRST(&tp->t_segq) &&
 #endif /* VBOX_WITH_BSD_TCP_REASS */
@@ -963 +963 @@
                         (void) tcp_reass(pData, tp, (struct tcpiphdr *)0,
                                 (struct mbuf *)0);
-#else /* !VBOX_WITH_BSD_TCP_REASS */
+#else  /* VBOX_WITH_BSD_TCP_REASS */
                         (void) tcp_reass(pData, tp, (struct tcphdr *)0, NULL, (struct mbuf *)0);
 #endif /* VBOX_WITH_BSD_TCP_REASS */
@@ -1236 +1236 @@
 #ifndef VBOX_WITH_BSD_TCP_REASS
                 (void) tcp_reass(pData, tp, (struct tcpiphdr *)0, (struct mbuf *)0);
-#else /* !VBOX_WITH_BSD_TCP_REASS */
+#else  /* VBOX_WITH_BSD_TCP_REASS */
                 (void) tcp_reass(pData, tp, (struct tcphdr *)0, (int *)0, (struct mbuf *)0);
 #endif /*VBOX_WITH_BSD_TCP_REASS*/
@@ -1542 +1542 @@
 #ifndef VBOX_WITH_BSD_TCP_REASS
                 TCP_REASS(pData, tp, ti, m, so, tiflags);
-#else /* !VBOX_WITH_BSD_TCP_REASS */
+#else  /* VBOX_WITH_BSD_TCP_REASS */
                 if (ti->ti_seq == tp->rcv_nxt
                 && LIST_EMPTY(&tp->t_segq)

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

@@ -195 +195 @@
 #ifndef VBOX_WITH_BSD_TCP_REASS
         tp->seg_next = tp->seg_prev = ptr_to_u32(pData, (struct tcpiphdr *)tp);
-#else /* !VBOX_WITH_BSD_TCP_REASS */
+#else  /* VBOX_WITH_BSD_TCP_REASS */
         LIST_INSERT_HEAD(&pData->tcpcbhead, tp, t_list);
 #endif /* VBOX_WITH_BSD_TCP_REASS */
@@ -286 +286 @@
 /*      free(tp, M_PCB);  */
         u32ptr_done(pData, ptr_to_u32(pData, tp), tp);
-#else /* !VBOX_WITH_BSD_TCP_REASS */
+#else  /* VBOX_WITH_BSD_TCP_REASS */
         struct tseg_qent *te;
         DEBUG_CALL("tcp_close");

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

@@ -85 +85 @@
         tcpiphdrp_32 seg_next;  /* sequencing queue */
         tcpiphdrp_32 seg_prev;
-#else /* !VBOX_WITH_BSD_TCP_REASS */
+#else  /* VBOX_WITH_BSD_TCP_REASS */
         LIST_ENTRY(tcpcb) t_list;
         struct  tsegqe_head t_segq;     /* segment reassembly queue */