Changeset 58592 in vbox for trunk/src/VBox/Devices/Network/lwip-new

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.

Location:

trunk/src/VBox/Devices/Network/lwip-new/src

Files:

• core/tcp.c (modified) (4 diffs)
• core/tcp_in.c (modified) (9 diffs)
• include/lwip/tcp.h (modified) (2 diffs)
• include/lwip/tcp_impl.h (modified) (2 diffs)

trunk/src/VBox/Devices/Network/lwip-new/src/core/tcp.c

@@ -543 +543 @@
 #endif /* LWIP_CALLBACK_API */
 
+#if LWIP_CONNECTION_PROXY
+/**
+ * Default proxy accept syn callback if no accept callback is specified by the user.
+ */
+err_t
+tcp_accept_syn_null(void *arg, struct tcp_pcb *newpcb, struct pbuf *syn)
+{
+  LWIP_UNUSED_ARG(arg);
+  LWIP_UNUSED_ARG(syn);
+
+  tcp_abort(newpcb);
+  return ERR_ABRT;
+}
+#endif /* LWIP_CONNECTION_PROXY */
+
 /**
  * Set the state of the connection to be LISTEN, which means that it
@@ -1559 +1574 @@
  */ 
 void
-tcp_proxy_accept(tcp_accept_fn accept)
-{
-  tcp_proxy_accept_callback = accept;
+tcp_proxy_accept(tcp_accept_syn_fn accept_syn)
+{
+  tcp_proxy_accept_callback = accept_syn;
 }
 
@@ -1571 +1586 @@
  */
 void
-tcp_accept_syn(struct tcp_pcb *pcb, tcp_accept_fn accept)
+tcp_accept_syn(struct tcp_pcb *pcb, tcp_accept_syn_fn accept_syn)
 {
   struct tcp_pcb_listen *lpcb;
@@ -1578 +1593 @@
   lpcb = (struct tcp_pcb_listen *)pcb;
 
-  lpcb->accept = accept;
+  lpcb->accept = (tcp_accept_fn)accept_syn;
   lpcb->accept_on_syn = 1;
 }

trunk/src/VBox/Devices/Network/lwip-new/src/core/tcp_in.c

@@ -64 +64 @@
 
 #if LWIP_CONNECTION_PROXY
-tcp_accept_fn tcp_proxy_accept_callback = tcp_accept_null;
+tcp_accept_syn_fn tcp_proxy_accept_callback = tcp_accept_syn_null;
 #endif
 
@@ -90 +90 @@
 static void tcp_parseopt(struct tcp_pcb *pcb);
 
-static err_t tcp_listen_input(struct tcp_pcb_listen *pcb);
+static err_t tcp_listen_input(struct tcp_pcb_listen *pcb, struct pbuf *syn);
 static err_t tcp_timewait_input(struct tcp_pcb *pcb);
 
 #if LWIP_CONNECTION_PROXY
-static err_t tcp_proxy_listen_input(struct pbuf *p);
+static err_t tcp_proxy_listen_input(struct pbuf *syn);
 static void tcp_restore_pbuf(struct pbuf *p);
 
@@ -314 +314 @@
     
       LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: packed for LISTENing connection.\n"));
-      tcp_listen_input(lpcb);
+      tcp_listen_input(lpcb, p);
       pbuf_free(p);
       return;
@@ -498 +498 @@
  */
 static err_t
-tcp_listen_input(struct tcp_pcb_listen *pcb)
+tcp_listen_input(struct tcp_pcb_listen *pcb, struct pbuf *syn)
 {
   struct tcp_pcb *npcb;
@@ -572 +572 @@
     /* Early accept on SYN, like we do in tcp_proxy_listen_input() */
     if (pcb->accept_on_syn) {
+      tcp_accept_syn_fn accept_syn;
       err_t err;
 
@@ -578 +579 @@
 
       /*
-       * XXX: TODO: how to pass syn pbuf?  Need to be consistent with
-       * proxy version, but can't abuse callback_arg here since it's
-       * actually used in this case.
+       * Call the accept syn function.  Note, that it comes from the
+       * listening pcb and we reset the normal accept callback of the
+       * new pcb.  The latter should be set by the client along with
+       * other callbacks if necessary.
        */
-      /* Call the accept function. */
-      TCP_EVENT_ACCEPT(npcb, ERR_OK, err);
+      accept_syn = (tcp_accept_syn_fn)npcb->accept;
+      npcb->accept = tcp_accept_null;
+
+      /* TCP_EVENT_ACCEPT_SYN */
+      if (accept_syn != NULL)
+        err = (*accept_syn)(npcb->callback_arg, npcb, syn);
+      else
+        err = ERR_ARG;
+
       if (err != ERR_OK) {
         /* If the accept function returns with an error, we abort
@@ -645 +654 @@
  */
 static err_t
-tcp_proxy_listen_input(struct pbuf *p)
+tcp_proxy_listen_input(struct pbuf *syn)
 {
   struct tcp_pcb *npcb;
@@ -700 +709 @@
     npcb->callback_arg = /* pcb->callback_arg */ NULL;
 #if LWIP_CALLBACK_API
-    npcb->accept = /* pcb->accept */ tcp_proxy_accept_callback;
+    npcb->accept = /* pcb->accept */ tcp_accept_null;
 #endif /* LWIP_CALLBACK_API */
     /* inherit socket options */
@@ -733 +742 @@
      */
 
-    tcp_restore_pbuf(p);
-    npcb->callback_arg = (void *)p;
- 
-    /* Call the accept function. */
-    TCP_EVENT_ACCEPT(npcb, ERR_OK, err);
+    tcp_restore_pbuf(syn);
+
+    /* TCP_EVENT_ACCEPT_SYN */
+    if (tcp_proxy_accept_callback != NULL)
+      err = (*tcp_proxy_accept_callback)(NULL, npcb, syn);
+    else
+      err = ERR_ARG;
+
     if (err != ERR_OK) {
         /* If the accept function returns with an error, we abort

trunk/src/VBox/Devices/Network/lwip-new/src/include/lwip/tcp.h

@@ -61 +61 @@
  */
 typedef err_t (*tcp_accept_fn)(void *arg, struct tcp_pcb *newpcb, err_t err);
+
+#if LWIP_CONNECTION_PROXY
+/** Function prototype for tcp accept callback functions. Called when
+ * a new connection is about to be accepted by the proxy or on a
+ * listening pcb that requested proxy-like accept on syn.
+ *
+ * @param arg Additional argument to pass to the callback function (@see tcp_arg())
+ * @param newpcb The new connection pcb
+ * @param syn The pbuf with the SYN segment (may be used to reply with ICMP).
+ */
+typedef err_t (*tcp_accept_syn_fn)(void *arg, struct tcp_pcb *newpcb, struct pbuf *syn);
+#endif /* LWIP_CONNECTION_PROXY */
 
 /** Function prototype for tcp receive callback functions. Called when data has
@@ -333 +345 @@
 /* when proxied connection is accepted there's no listening pcb */
 void             tcp_proxy_arg(void *arg);
-void             tcp_proxy_accept(tcp_accept_fn accept);
+void             tcp_proxy_accept(tcp_accept_syn_fn accept);
 /* but we also provide proxy-like early accept for listening pcbs */
-void             tcp_accept_syn(struct tcp_pcb *lpcb, tcp_accept_fn accept);
+void             tcp_accept_syn(struct tcp_pcb *lpcb, tcp_accept_syn_fn accept);
 #endif
 void             tcp_recv    (struct tcp_pcb *pcb, tcp_recv_fn recv);

trunk/src/VBox/Devices/Network/lwip-new/src/include/lwip/tcp_impl.h

@@ -314 +314 @@
 
 #if LWIP_CONNECTION_PROXY
-extern tcp_accept_fn tcp_proxy_accept_callback;
+extern tcp_accept_syn_fn tcp_proxy_accept_callback;
 #endif
 
@@ -489 +489 @@
 #endif /* LWIP_CALLBACK_API */
 
+#if LWIP_CONNECTION_PROXY
+err_t tcp_accept_syn_null(void *arg, struct tcp_pcb *newpcb, struct pbuf *syn);
+#endif /* LWIP_CONNECTION_PROXY */
+
 #if TCP_DEBUG || TCP_INPUT_DEBUG || TCP_OUTPUT_DEBUG
 void tcp_debug_print(struct tcp_hdr *tcphdr);