Changeset 58592 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Nov 6, 2015 1:43:02 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103951

Message:

lwip: Use different callback for proxy accept that is triggered by
receiving a SYN. Pass the SYN pbuf as a separate argument, so that we
can do it for normal listening pcbs too (they do use callback arg
unlike proxy). Adapt pxtcp to the change.

File:

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

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

@@ -268 +268 @@
 
 /* tcp pcb callbacks */
-static err_t pxtcp_pcb_heard(void *, struct tcp_pcb *, err_t); /* global */
+static err_t pxtcp_pcb_heard(void *, struct tcp_pcb *, struct pbuf *); /* global */
 static err_t pxtcp_pcb_accept(void *, struct tcp_pcb *, err_t);
 static err_t pxtcp_pcb_connected(void *, struct tcp_pcb *, err_t);
@@ -1003 +1003 @@
  */
 static err_t
-pxtcp_pcb_heard(void *arg, struct tcp_pcb *newpcb, err_t error)
-{
-    struct pbuf *p = (struct pbuf *)arg;
-
-    LWIP_UNUSED_ARG(error);     /* always ERR_OK */
-
-    return pxtcp_pcb_accept_outbound(newpcb, p,
+pxtcp_pcb_heard(void *arg, struct tcp_pcb *newpcb, struct pbuf *syn)
+{
+    LWIP_UNUSED_ARG(arg);
+
+    return pxtcp_pcb_accept_outbound(newpcb, syn,
                PCB_ISIPV6(newpcb), &newpcb->local_ip, newpcb->local_port);
 }