Changeset 63283 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Aug 10, 2016 2:55:28 PM (9 years ago)

Author:

vboxsync

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

109916

Message:

NetworkServices: warnings

Location:

trunk/src/VBox/Devices/Network

Files:

• lwip-new/src/core/ipv4/icmp.c (modified) (1 diff)
• lwip-new/src/core/ipv6/icmp6.c (modified) (1 diff)
• lwip-new/src/netif/etharp.c (modified) (1 diff)
• slirp/ip_icmpwin.c (modified) (5 diffs)

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

@@ -282 +282 @@
 {
   u8_t type, code;
+# ifdef VBOX
+  (void)inp;
+# endif
 
   ICMP_STATS_INC(icmp.recv);

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

@@ -221 +221 @@
 {
   struct icmp6_hdr *icmp6hdr;
+# ifdef VBOX
+  (void)inp;
+# endif
 
   ICMP6_STATS_INC(icmp6.recv);

trunk/src/VBox/Devices/Network/lwip-new/src/netif/etharp.c

@@ -756 +756 @@
   if (ip_addr_isany(&netif->ip_addr)) {
     for_us = 0;
+#ifdef VBOX
+    proxy = 0; /* Shup up MSC. */
+#endif
   } else {
     /* ARP packet directed to us? */

trunk/src/VBox/Devices/Network/slirp/ip_icmpwin.c

@@ -20 +20 @@
 
 #include <winternl.h>           /* for PIO_APC_ROUTINE &c */
+#ifndef PIO_APC_ROUTINE_DEFINED
+# define PIO_APC_ROUTINE_DEFINED 1
+#endif
 #include <iprt/win/iphlpapi.h>
 #include <icmpapi.h>
@@ -71 +74 @@
  * XXX: this is system-wide, but what about multiple NAT threads?
  */
-static PIO_APC_ROUTINE pfnIcmpCallback;
+static PIO_APC_ROUTINE g_pfnIcmpCallback;
 
 
@@ -77 +80 @@
 icmpwin_init(PNATState pData)
 {
-    if (pfnIcmpCallback == NULL)
+    if (g_pfnIcmpCallback == NULL)
     {
         OSVERSIONINFO osvi;
@@ -89 +92 @@
 
         if (osvi.dwMajorVersion >= 6)
-            pfnIcmpCallback = icmpwin_callback_apc;
+            g_pfnIcmpCallback = icmpwin_callback_apc;
         else
-            pfnIcmpCallback = (PIO_APC_ROUTINE)icmpwin_callback_old;
+            g_pfnIcmpCallback = (PIO_APC_ROUTINE)icmpwin_callback_old;
     }
 
@@ -189 +192 @@
 
     status = IcmpSendEcho2(pData->icmp_socket.sh, NULL,
-                           (FARPROC)pfnIcmpCallback, pong,
+                           g_pfnIcmpCallback, pong,
                            dst, reqdata, (WORD)reqsize, &opts,
                            pong->buf, (DWORD)pong->bufsize,