Changeset 58542 in vbox

Timestamp:

Nov 2, 2015 2:56:15 PM (9 years ago)

Author:

vboxsync

Message:

NAT/Net: pxtcp_pcb_heard, pxtcp_pcb_accept_confirm - be preapred for
initial SYN pbuf not passed to us. Follow up to r103830. This is for
playing with proxy-like early accept for normal listening pcbs for
which we don't have a way to pass the pbuf yet.

File:

• trunk/src/VBox/NetworkServices/NAT/pxtcp.c (modified) (2 diffs)

trunk/src/VBox/NetworkServices/NAT/pxtcp.c

@@ -1043 +1043 @@
 
     /* save initial datagram in case we need to reply with ICMP */
-    pbuf_ref(p);
-    pxtcp->unsent = p;
-    pxtcp->netif = ip_current_netif();
+    if (p != NULL) {
+        pbuf_ref(p);
+        pxtcp->unsent = p;
+        pxtcp->netif = ip_current_netif();
+    }
 
     pxtcp_pcb_associate(pxtcp, newpcb);
@@ -1213 +1215 @@
 
     /* we are not going to reply with ICMP, so we can drop initial pbuf */
-    LWIP_ASSERT1(pxtcp->unsent != NULL);
-    pbuf_free(pxtcp->unsent);
-    pxtcp->unsent = NULL;
+    if (pxtcp->unsent != NULL) {
+        pbuf_free(pxtcp->unsent);
+        pxtcp->unsent = NULL;
+    }
 
     error = tcp_proxy_accept_confirm(pxtcp->pcb);