Changeset 58548 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Nov 3, 2015 2:06:48 AM (9 years ago)

Author:

vboxsync

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

103880

Message:

NAT/Net: pxtcp_pcb_heard - factor most of the code out into
pxtcp_pcb_accept_outbound and call it with address/port from the new
pcb. No functional change intended. This is in preparation to
provide proxy-like early accept for normal listening pcbs.

File:

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

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

@@ -276 +276 @@
 static void pxtcp_pcb_err(void *, err_t);
 
+static err_t pxtcp_pcb_accept_outbound(struct tcp_pcb *, struct pbuf *, int, ipX_addr_t *, u16_t);
+
 static err_t pxtcp_pcb_forward_outbound(struct pxtcp *, struct pbuf *);
 static void pxtcp_pcb_forward_outbound_close(struct pxtcp *);
@@ -1004 +1006 @@
 {
     struct pbuf *p = (struct pbuf *)arg;
+
+    LWIP_UNUSED_ARG(error);     /* always ERR_OK */
+
+    return pxtcp_pcb_accept_outbound(newpcb, p,
+               PCB_ISIPV6(newpcb), &newpcb->local_ip, newpcb->local_port);
+}
+
+
+static err_t
+pxtcp_pcb_accept_outbound(struct tcp_pcb *newpcb, struct pbuf *p,
+                          int is_ipv6, ipX_addr_t *dst_addr, u16_t dst_port)
+{
     struct pxtcp *pxtcp;
-    ipX_addr_t dst_addr;
+    ipX_addr_t mapped_dst_addr;
     int sdom;
     SOCKET sock;
     ssize_t nsent;
     int sockerr = 0;
-
-    LWIP_UNUSED_ARG(error);     /* always ERR_OK */
 
     /*
@@ -1026 +1038 @@
     tcp_setprio(newpcb, TCP_PRIO_MAX);
 
-    pxremap_outbound_ipX(PCB_ISIPV6(newpcb), &dst_addr, &newpcb->local_ip);
-
-    sdom = PCB_ISIPV6(newpcb) ? PF_INET6 : PF_INET;
+    pxremap_outbound_ipX(is_ipv6, &mapped_dst_addr, dst_addr);
+
+    sdom = is_ipv6 ? PF_INET6 : PF_INET;
     sock = proxy_connected_socket(sdom, SOCK_STREAM,
-                                  &dst_addr, newpcb->local_port);
+                                  &mapped_dst_addr, dst_port);
     if (sock == INVALID_SOCKET) {
         sockerr = SOCKERRNO();