Changeset 100251 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 22, 2023 5:33:57 PM (22 months ago)

Author:

vboxsync

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

157962

Message:

Devices/Network: debug impl of libslirp nat. fixed linker collisions with lwip. bugref:10268

Location:

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

Files:

• core/ipv6/icmp6.c (modified) (1 diff)
• core/ipv6/ip6.c (modified) (1 diff)
• include/ipv6/lwip/icmp6.h (modified) (1 diff)
• include/ipv6/lwip/ip6.h (modified) (3 diffs)

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

@@ -83 +83 @@
  */
 void
-icmp6_input(struct pbuf *p, struct netif *inp)
+lwip_icmp6_input(struct pbuf *p, struct netif *inp)
 {
   struct icmp6_hdr *icmp6hdr;

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

@@ -413 +413 @@
  */
 err_t
-ip6_input(struct pbuf *p, struct netif *inp)
+lwip_ip6_input(struct pbuf *p, struct netif *inp)
 {
   struct ip6_hdr *ip6hdr;

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

@@ -147 +147 @@
 #if LWIP_ICMP6 && LWIP_IPV6 /* don't build if not configured for use in lwipopts.h */
 
-void icmp6_input(struct pbuf *p, struct netif *inp);
+/* Renaming functions to avoid linker collisions with libslirp  */
+#define icmp6_input lwip_icmp6_input
+
+void lwip_icmp6_input(struct pbuf *p, struct netif *inp);
 #if LWIP_CONNECTION_PROXY
 void icmp6_proxy_input(struct pbuf *p, struct netif *inp);

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

@@ -7 +7 @@
 /*
  * Copyright (c) 2010 Inico Technologies Ltd.
- * All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
  *
@@ -18 +18 @@
  *    and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
  * This file is part of the lwIP TCP/IP stack.
- * 
+ *
  * Author: Ivan Delamer <[email protected]>
  *
@@ -161 +161 @@
 #define IP6H_HOPLIM_SET(hdr, hl) (hdr)->_hoplim = (u8_t)(hl)
 
+/* Renaming functions to avoid linker collisions with libslirp  */
+#define ip6_input lwip_ip6_input
+
 
 #define ip6_init() /* TODO should we init current addresses and header pointer? */
 struct netif *ip6_route(struct ip6_addr *src, struct ip6_addr *dest);
 ip6_addr_t   *ip6_select_source_address(struct netif *netif, ip6_addr_t * dest);
-err_t         ip6_input(struct pbuf *p, struct netif *inp);
+err_t         lwip_ip6_input(struct pbuf *p, struct netif *inp);
 err_t         ip6_output(struct pbuf *p, struct ip6_addr *src, struct ip6_addr *dest,
                          u8_t hl, u8_t tc, u8_t nexth);