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

Timestamp:

Nov 5, 2015 2:40:13 PM (9 years ago)

Author:

vboxsync

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

103939

Message:

lwip: make tcp_accept_null globally visible, use it instead of
tcp_proxy_accept_null and g/c the latter.

Location:

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

Files:

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

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

@@ -532 +532 @@
  * Default accept callback if no accept callback is specified by the user.
  */
-static err_t
+err_t
 tcp_accept_null(void *arg, struct tcp_pcb *pcb, err_t err)
 {

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

@@ -64 +64 @@
 
 #if LWIP_CONNECTION_PROXY
-static err_t tcp_proxy_accept_null(void *arg, struct tcp_pcb *pcb, err_t err);
-
-tcp_accept_fn tcp_proxy_accept_callback = tcp_proxy_accept_null;
+tcp_accept_fn tcp_proxy_accept_callback = tcp_accept_null;
 #endif
 
@@ -615 +613 @@
 
 #if LWIP_CONNECTION_PROXY
-/**
- * XXX: This is a copy-pasted tcp_accept_null(), a static function
- * from tcp.c.  For normal listening PCB tcp_pcb::accept is set to
- * that function when PCB is created in tcp_listen_with_backlog().  I
- * don't want to shuffle code around or mess with visibility for now,
- * so just provide a copy here.
- */
-static err_t
-tcp_proxy_accept_null(void *arg, struct tcp_pcb *pcb, err_t err)
-{
-  LWIP_UNUSED_ARG(arg);
-  LWIP_UNUSED_ARG(err);
-
-  tcp_abort(pcb);
-  return ERR_ABRT;
-}
-
-
 /**
  * We run proxied packets through tcp_input() since it mostly does

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

@@ -485 +485 @@
 
 #if LWIP_CALLBACK_API
+err_t tcp_accept_null(void *arg, struct tcp_pcb *pcb, err_t err);
 err_t tcp_recv_null(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err);
 #endif /* LWIP_CALLBACK_API */