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

Timestamp:

Jul 29, 2016 2:50:18 PM (8 years ago)

Author:

vboxsync

Message:

slirp: some warning and HN fixes.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bsd/sys/mbuf.h (modified) (1 diff)
• ip_icmpwin.c (modified) (11 diffs)
• slirp.c (modified) (7 diffs)
• slirp.h (modified) (1 diff)
• slirp_dns.c (modified) (2 diffs)
• slirp_state.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h

@@ -623 +623 @@
         AssertMsg(SLIST_EMPTY(&m->m_pkthdr.tags), ("doing fast free of mbuf with tags"));
 
-        uma_zfree_arg(zone_mbuf, m, (void *)MB_NOTAGS);
+        uma_zfree_arg(zone_mbuf, m, (void *)(uintptr_t)MB_NOTAGS);
 }
 #endif

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

@@ -71 +71 @@
  * XXX: this is system-wide, but what about multiple NAT threads?
  */
-static void *pfIcmpCallback;
+static PIO_APC_ROUTINE pfnIcmpCallback;
 
 
@@ -77 +77 @@
 icmpwin_init(PNATState pData)
 {
-    if (pfIcmpCallback == NULL)
+    if (pfnIcmpCallback == NULL)
     {
         OSVERSIONINFO osvi;
@@ -89 +89 @@
 
         if (osvi.dwMajorVersion >= 6)
-            pfIcmpCallback = icmpwin_callback_apc;
+            pfnIcmpCallback = icmpwin_callback_apc;
         else
-            pfIcmpCallback = icmpwin_callback_old;
+            pfnIcmpCallback = (PIO_APC_ROUTINE)icmpwin_callback_old;
     }
 
@@ -176 +176 @@
         reqdata = pong->buf;
         m_copydata(m, sizeof(struct ip) + sizeof(struct icmp_echo),
-                   reqsize, reqdata);
+                   (int)reqsize, reqdata);
     }
 
@@ -189 +189 @@
 
     status = IcmpSendEcho2(pData->icmp_socket.sh, NULL,
-                           pfIcmpCallback, pong,
+                           (FARPROC)pfnIcmpCallback, pong,
                            dst, reqdata, (WORD)reqsize, &opts,
                            pong->buf, (DWORD)pong->bufsize,
@@ -250 +250 @@
     if (pong != NULL)
         icmpwin_callback(pong);
+    RT_NOREF2(iob, reserved);
 }
 
@@ -389 +390 @@
         /* fill in ip (ip_output0() does the boilerplate for us) */
         ip->ip_tos = reply->Options.Tos;
-        ip->ip_len = sizeof(*ip) + sizeof(*icmp) + reqsize;
+        ip->ip_len = sizeof(*ip) + sizeof(*icmp) + (int)reqsize;
         ip->ip_off = 0;
         ip->ip_ttl = reply->Options.Ttl;
@@ -402 +403 @@
         icmp->icmp_echo_seq = pong->reqicmph.icmp_echo_seq;
 
-        m_append(pData, m, reqsize, reply->Data);
+        m_append(pData, m, (int)reqsize, reply->Data);
 
         icmp->icmp_cksum = in_cksum_skip(m, ip->ip_len, sizeof(*ip));
@@ -485 +486 @@
 
     ip->ip_tos = 0;
-    ip->ip_len = sizeof(*ip) + sizeof(*icmp) + reqsize;
+    ip->ip_len = sizeof(*ip) + sizeof(*icmp) + (int)reqsize;
     ip->ip_off = 0;
     ip->ip_ttl = IPDEFTTL;
@@ -524 +525 @@
         m = m_gethdr(pData, M_NOWAIT, MT_HEADER);
     else
-        m = m_getjcl(pData, M_NOWAIT, MT_HEADER, M_PKTHDR, slirp_size(pData));
+        m = m_getjcl(pData, M_NOWAIT, MT_HEADER, M_PKTHDR, (int)slirp_size(pData));
 
     if (m == NULL)
@@ -537 +538 @@
     return m;
 }
+

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

@@ -236 +236 @@
  * Loging macros
  */
-#if VBOX_WITH_DEBUG_NAT_SOCKETS
+#ifdef VBOX_WITH_DEBUG_NAT_SOCKETS
 # if defined(RT_OS_WINDOWS)
 #  define  DO_LOG_NAT_SOCK(so, proto, winevent, r_fdset, w_fdset, x_fdset)             \
@@ -254 +254 @@
    } while (0)
 # endif /* !RT_OS_WINDOWS */
-#else /* !VBOX_WITH_DEBUG_NAT_SOCKETS */
+#else  /* !VBOX_WITH_DEBUG_NAT_SOCKETS */
 # define DO_LOG_NAT_SOCK(so, proto, winevent, r_fdset, w_fdset, x_fdset) do {} while (0)
 #endif /* !VBOX_WITH_DEBUG_NAT_SOCKETS */
@@ -341 +341 @@
         WSAStartup(MAKEWORD(2, 0), &Data);
 
-        rc = RTLdrLoadSystem("Iphlpapi.dll", /* :fNoUnload */ true, &hLdrMod);
+        rc = RTLdrLoadSystem("Iphlpapi.dll", true /*fNoUnload*/, &hLdrMod);
         if (RT_SUCCESS(rc))
         {
-            rc = RTLdrGetSymbol(hLdrMod, "GetAdaptersAddresses", (void **)&pData->pfGetAdaptersAddresses);
+            rc = RTLdrGetSymbol(hLdrMod, "GetAdaptersAddresses", (void **)&pData->pfnGetAdaptersAddresses);
             if (RT_FAILURE(rc))
                 LogRel(("NAT: Can't find GetAdapterAddresses in Iphlpapi.dll\n"));
@@ -411 +411 @@
 #endif
         flags |= pData->i32AliasMode; /* do transparent proxying */
-        flags = LibAliasSetMode(pData->proxy_alias, flags, ~0);
+        flags = LibAliasSetMode(pData->proxy_alias, flags, ~0U);
         proxy_addr.s_addr = RT_H2N_U32(RT_N2H_U32(pData->special_addr.s_addr) | CTL_ALIAS);
         LibAliasSetAddress(pData->proxy_alias, proxy_addr);
@@ -1070 +1070 @@
                 /* should we ignore return value? */
                 bool fRet = slirpConnectOrWrite(pData, so, true);
-                LogFunc(("fRet:%RTbool\n", fRet));
+                LogFunc(("fRet:%RTbool\n", fRet)); NOREF(fRet);
                 if (slirpVerifyAndFreeSocket(pData, so))
                     CONTINUE(tcp);
@@ -1380 +1380 @@
     struct ethhdr *eh;
 
-    m->m_len = cbBuf;
+    m->m_len = (int)cbBuf; Assert((size_t)m->m_len == cbBuf);
     if (cbBuf < ETH_HLEN)
     {
@@ -1431 +1431 @@
     struct ethhdr *eh;
     uint8_t *mbuf = NULL;
-    size_t mlen = 0;
+    int mlen;
     STAM_PROFILE_START(&pData->StatIF_encap, a);
     LogFlowFunc(("ENTER: pData:%p, eth_proto:%RX16, m:%p, flags:%d\n",

trunk/src/VBox/Devices/Network/slirp/slirp.h

@@ -178 +178 @@
 # include <time.h>
 #else
+# ifndef HAVE_SYS_TIME_H
+#  define HAVE_SYS_TIME_H 0
+# endif
 # if HAVE_SYS_TIME_H
 #  include <sys/time.h>

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

@@ -48 +48 @@
     /* determine size of buffer */
     size = 0;
-    ret = pData->pfGetAdaptersAddresses(AF_INET, 0, NULL /* reserved */, pAdapterAddr, &size);
+    ret = pData->pfnGetAdaptersAddresses(AF_INET, 0, NULL /* reserved */, pAdapterAddr, &size);
     if (ret != ERROR_BUFFER_OVERFLOW)
     {
@@ -66 +66 @@
         return -1;
     }
-    ret = pData->pfGetAdaptersAddresses(AF_INET, 0, NULL /* reserved */, pAdapterAddr, &size);
+    ret = pData->pfnGetAdaptersAddresses(AF_INET, 0, NULL /* reserved */, pAdapterAddr, &size);
     if (ret != ERROR_SUCCESS)
     {

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -144 +144 @@
     int soMaxConn;
 #ifdef RT_OS_WINDOWS
-    ULONG (WINAPI * pfGetAdaptersAddresses)(ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG);
+    ULONG (WINAPI * pfnGetAdaptersAddresses)(ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG);
 #endif
     struct dns_list_head pDnsList;