Changeset 63014 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Aug 4, 2016 9:56:04 PM (8 years ago)

Author:

vboxsync

Message:

slirp: warnings

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• hostres.c (modified) (9 diffs)
• libalias/alias.c (modified) (2 diffs)
• libalias/alias_db.c (modified) (1 diff)
• tftp.c (modified) (9 diffs)

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

@@ -175 +175 @@
 {
     struct response *res;
-    size_t mlen;
+    u_int mlen;
     int rc;
 
@@ -380 +380 @@
 
     m->m_len = 0;
-    ok = m_append(pData, m, res->end, (c_caddr_t)res->buf);
+    ok = m_append(pData, m, (int)res->end, (c_caddr_t)res->buf);
     if (!ok)
     {
@@ -536 +536 @@
     if (off < res->qlen)
     {
-        int trailer = res->qlen - off;
+        ssize_t trailer = res->qlen - off;
 
         LogDbg(("NAT: hostres: question %zu < mlen %zu\n", off, res->qlen));
@@ -751 +751 @@
 
   out:
-    pHdr->ancount = RT_H2N_U16(nanswers);
+    pHdr->ancount = RT_H2N_U16((uint16_t)nanswers);
     return VINF_SUCCESS;
 }
@@ -768 +768 @@
     size_t nanswers;
     ssize_t nbytes;
-    int i;
 
     pHdr = (struct dnsmsg_header *)res->buf;
@@ -791 +790 @@
      */
     {
-        PDNSMAPPINGENTRY pReverseMapping = getDNSMapByAddr(res->pData, &in_addr_arpa.s_addr);
+        PDNSMAPPINGENTRY pReverseMapping = getDNSMapByAddr(res->pData, (const uint32_t *)&in_addr_arpa.s_addr);
         if (pReverseMapping != NULL)
         {
@@ -813 +812 @@
     if (h == NULL)
     {
+#ifdef RT_OS_WINDOWS
+        h = gethostbyaddr((const char *)&in_addr_arpa, sizeof(struct in_addr), AF_INET);
+#else
         h = gethostbyaddr(&in_addr_arpa, sizeof(struct in_addr), AF_INET);
+#endif
     }
 
@@ -848 +851 @@
 
   out:
-    pHdr->ancount = RT_H2N_U16(nanswers);
+    pHdr->ancount = RT_H2N_U16((uint16_t)nanswers);
     return VINF_SUCCESS;
 }
@@ -1189 +1192 @@
     struct label *l;
     int i;
+    RT_ZERO(addr); /* makes MSC happy*/
 
     l = root;

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

@@ -162 +162 @@
     uint8_t *c = p;
 
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifdef RT_LITTLE_ENDIAN //BYTE_ORDER == LITTLE_ENDIAN
     uint16_t s1 = ((uint16_t)c[1] << 8) + (uint16_t)c[0];
     uint16_t s2 = ((uint16_t)c[3] << 8) + (uint16_t)c[2];
@@ -977 +977 @@
     int proxy_type, error;
     u_short dest_port;
-    u_short proxy_server_port;
+    u_short proxy_server_port = 0; /* Shut up MSC. */
     struct in_addr dest_address;
     struct in_addr proxy_server_address;

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

@@ -2278 +2278 @@
 #else
         Log2(("NAT: PacketAlias/InitPacketAliasLog: Packet alias logging enabled.\n"));
-        la->logDesc = (void *)1; /* XXX: in vbox we don't use this param */
+        la->logDesc = (void *)(uintptr_t)1; /* XXX: in vbox we don't use this param */
 #endif
         la->packetAliasMode |= PKT_ALIAS_LOG;

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

@@ -254 +254 @@
     char *pszTftpRRQRaw;
     size_t idxTftpRRQRaw = 0;
-    int cbTftpRRQRaw = 0;
+    ssize_t cbTftpRRQRaw = 0;
     int fWithArg = 0;
     int idxOptionArg = 0;
@@ -263 +263 @@
     pszTftpRRQRaw = (char *)&pcTftpIpHeader->Core;
     cbTftpRRQRaw = RT_H2N_U16(pcTftpIpHeader->UdpHdr.uh_ulen) + sizeof(struct ip) - RT_OFFSETOF(TFTPIPHDR, Core);
-    while(cbTftpRRQRaw)
+    while (cbTftpRRQRaw)
     {
         idxTftpRRQRaw = RTStrNLen(pszTftpRRQRaw, 512 - idxTftpRRQRaw) + 1;
@@ -327 +327 @@
         }
         pszTftpRRQRaw += idxTftpRRQRaw;
-        cbTftpRRQRaw -= idxTftpRRQRaw;
+        cbTftpRRQRaw  -= idxTftpRRQRaw;
     }
 
@@ -538 +538 @@
 {
     char aszOptionBuffer[256];
-    size_t iOptLength = 0;
+    size_t iOptLength;
     int rc = VINF_SUCCESS;
     int cbMBufCurrent = pMBuf->m_len;
@@ -546 +546 @@
 
     RT_ZERO(aszOptionBuffer);
-    iOptLength += RTStrPrintf(aszOptionBuffer, 256 , "%s", pszOptName) + 1;
+    iOptLength  = RTStrPrintf(aszOptionBuffer, 256 , "%s", pszOptName) + 1;
     iOptLength += RTStrPrintf(aszOptionBuffer + iOptLength, 256 - iOptLength , "%llu", u64OptValue) + 1;
     if (iOptLength > M_TRAILINGSPACE(pMBuf))
@@ -552 +552 @@
     else
     {
-        pMBuf->m_len += iOptLength;
-        m_copyback(pData, pMBuf, cbMBufCurrent, iOptLength, aszOptionBuffer);
+        pMBuf->m_len += (int)iOptLength;
+        m_copyback(pData, pMBuf, cbMBufCurrent, (int)iOptLength, aszOptionBuffer);
     }
     LogFlowFuncLeaveRC(rc);
@@ -609 +609 @@
     struct mbuf *m = NULL;
     PTFTPIPHDR pTftpIpHeader = NULL;
+    u_int cbMsg = (u_int)strlen(msg) + 1; /* ending zero */
 
     LogFlowFunc(("ENTER: errorcode: %RX16, msg: %s\n", errorcode, msg));
@@ -619 +620 @@
 
     m->m_data += if_maxlinkhdr;
-    m->m_len = sizeof(TFTPIPHDR)
-             + strlen(msg) + 1; /* ending zero */
+    m->m_len = sizeof(TFTPIPHDR) + cbMsg;
     m->m_pkthdr.header = mtod(m, void *);
     pTftpIpHeader = mtod(m, PTFTPIPHDR);
@@ -627 +627 @@
     pTftpIpHeader->Core.u16TftpOpCode = RT_H2N_U16(errorcode);
 
-    m_copyback(pData, m, sizeof(TFTPIPHDR), strlen(msg) + 1 /* copy ending zerro*/, (c_caddr_t)msg);
+    m_copyback(pData, m, sizeof(TFTPIPHDR), cbMsg, (c_caddr_t)msg);
 
     tftpSend(pData, pTftpSession, m, pcTftpIpHeaderRecv);