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

Timestamp:

Aug 10, 2016 2:31:08 PM (9 years ago)

Author:

vboxsync

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

109910

Message:

NetworkServices: warnings

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• pxdns.c (modified) (5 diffs)
• pxtcp.c (modified) (3 diffs)
• pxudp.c (modified) (2 diffs)

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

@@ -313 +313 @@
 
     if (g_proxy_options->nameservers != NULL) {
-        RTMemFree(g_proxy_options->nameservers);
+        RTMemFree((void *)g_proxy_options->nameservers);
     }
     g_proxy_options->nameservers = nameservers;
@@ -703 +703 @@
     union sockaddr_inet *resolver;
     ssize_t nsent;
+#ifdef RT_OS_WINDOWS
+    const char *pSendData = (const char *)&req->data[0];
+    int         cbSendData = (int)req->size;
+    Assert((size_t)cbSendData == req->size);
+#else
+    const void *pSendData = &req->data[0];
+    size_t      cbSendData = req->size;
+#endif
 
     DPRINTF2(("%s: req %p: sending to resolver #%lu\n",
@@ -712 +720 @@
 
     if (resolver->sa.sa_family == AF_INET) {
-        nsent = sendto(pxdns->sock4, req->data, req->size, 0,
+        nsent = sendto(pxdns->sock4, pSendData, cbSendData, 0,
                        &resolver->sa, sizeof(resolver->sin));
 
@@ -718 +726 @@
     else if (resolver->sa.sa_family == AF_INET6) {
         if (pxdns->sock6 != INVALID_SOCKET) {
-            nsent = sendto(pxdns->sock6, req->data, req->size, 0,
+            nsent = sendto(pxdns->sock6, pSendData, cbSendData, 0,
                            &resolver->sa, sizeof(resolver->sin6));
         }
@@ -816 +824 @@
 
 
+#ifdef RT_OS_WINDOWS
+    nread = recv(fd, (char *)pollmgr_udpbuf, sizeof(pollmgr_udpbuf), 0);
+#else
     nread = recv(fd, pollmgr_udpbuf, sizeof(pollmgr_udpbuf), 0);
+#endif
     if (nread < 0) {
         DPRINTF(("%s: %R[sockerr]\n", __func__, SOCKERRNO()));

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

@@ -1116 +1116 @@
 {
     struct pxtcp *pxtcp;
+    RT_NOREF(fd);
 
     pxtcp = (struct pxtcp *)handler->data;
@@ -1690 +1691 @@
     int status;
     int sockerr;
+    RT_NOREF(fd);
 
     pxtcp = (struct pxtcp *)handler->data;
@@ -2144 +2146 @@
             }
 
-            error = tcp_write(pcb, &pxtcp->inbuf.buf[beg], toeob, maybemore);
+            Assert(toeob == (u16)toeob);
+            error = tcp_write(pcb, &pxtcp->inbuf.buf[beg], (u16_t)toeob, maybemore);
             if (error != ERR_OK) {
                 goto writeerr;

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

@@ -599 +599 @@
          * valid for SOCK_RAW.
          */
-#     define USE_DF_OPTION(_Optname)                    \
-        const int dfopt = _Optname;                     \
-        const char * const dfoptname = #_Optname;
+#     define USE_DF_OPTION(_Optname) \
+            const int dfopt = _Optname; \
+            const char * const dfoptname = #_Optname; \
+            RT_NOREF_PV(dfoptname)
 #if   defined(IP_MTU_DISCOVER)  /* Linux */
         USE_DF_OPTION(IP_MTU_DISCOVER);
@@ -759 +760 @@
     }
 
+#ifdef RT_OS_WINDOWS
+    nread = recv(pxudp->sock, (char *)pollmgr_udpbuf, sizeof(pollmgr_udpbuf), 0);
+#else
     nread = recv(pxudp->sock, pollmgr_udpbuf, sizeof(pollmgr_udpbuf), 0);
+#endif
     if (nread == SOCKET_ERROR) {
         DPRINTF(("%s: %R[sockerr]\n", __func__, SOCKERRNO()));