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

Timestamp:

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

Author:

vboxsync

Message:

slirp: warnings

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• socket.c (modified) (9 diffs)
• tcp_input.c (modified) (4 diffs)
• tcp_output.c (modified) (2 diffs)
• tcp_subr.c (modified) (1 diff)
• udp.c (modified) (2 diffs)

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

@@ -135 +135 @@
 
 void
-so_init()
+so_init(void)
 {
 }
@@ -163 +163 @@
  */
 struct socket *
-socreate()
+socreate(void)
 {
     struct socket *so;
@@ -241 +241 @@
     int n, nn, lss, total;
     struct sbuf *sb = &so->so_snd;
-    size_t len = sb->sb_datalen - sb->sb_cc;
+    u_int len = sb->sb_datalen - sb->sb_cc;
     struct iovec iov[2];
     int mss = so->so_tcpcb->t_maxseg;
@@ -392 +392 @@
      * A return of -1 wont (shouldn't) happen, since it didn't happen above
      */
-    if (n == 2 && nn == iov[0].iov_len)
+    if (n == 2 && (unsigned)nn == iov[0].iov_len)
     {
         int ret;
@@ -530 +530 @@
     int n, nn;
     struct sbuf *sb = &so->so_rcv;
-    size_t len = sb->sb_cc;
+    u_int len = sb->sb_cc;
     struct iovec iov[2];
 
@@ -634 +634 @@
 
 #ifndef HAVE_READV
-    if (n == 2 && nn == iov[0].iov_len)
+    if (n == 2 && (unsigned)nn == iov[0].iov_len)
     {
         int ret;
@@ -694 +694 @@
 #endif /* !RT_OS_WINDOWS */
     {
-        static uint8_t au8Buf[64 * 1024];
+        static char achBuf[64 * 1024];
 
         /* A "normal" UDP packet */
@@ -724 +724 @@
 
         /* large packets will spill into a temp buffer */
-        iov[1].iov_base = au8Buf;
-        iov[1].iov_len = sizeof(au8Buf);
+        iov[1].iov_base = achBuf;
+        iov[1].iov_len = sizeof(achBuf);
 
 #if !defined(RT_OS_WINDOWS)
@@ -742 +742 @@
         {
             DWORD nbytes; /* NB: can't use nread b/c of different size */
-            DWORD flags;
+            DWORD flags = 0;
             int status;
-
-            flags = 0;
-            status = WSARecvFrom(so->s, iov, 2, &nbytes, &flags,
+            AssertCompile(sizeof(WSABUF) == sizeof(struct iovec));
+            AssertCompileMembersSameSizeAndOffset(WSABUF, len, struct iovec, iov_len);
+            AssertCompileMembersSameSizeAndOffset(WSABUF, buf, struct iovec, iov_base);
+            status = WSARecvFrom(so->s, (WSABUF *)&iov[0], 2, &nbytes, &flags,
                                  (struct sockaddr *)&addr, &addrlen,
                                  NULL, NULL);

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

@@ -294 +294 @@
     caddr_t optp = NULL;
     int optlen = 0;
-    int len, tlen, off;
+    int len, off;
+    int tlen = 0; /* Shut up MSC (didn't check whether MSC was right). */
     register struct tcpcb *tp = 0;
     register int tiflags;
@@ -303 +304 @@
     u_long tiwin;
 /*  int ts_present = 0; */
-    size_t ohdrlen;
+    unsigned ohdrlen;
     uint8_t ohdr[60 + 8]; /* max IP header plus 8 bytes of payload for icmp */
 
@@ -360 +361 @@
 
     /* ip_input() subtracts iphlen from ip::ip_len */
-    AssertStmt((ip->ip_len + iphlen == m_length(m, NULL)), goto drop);
+    AssertStmt(ip->ip_len + iphlen == (ssize_t)m_length(m, NULL), goto drop);
     if (RT_UNLIKELY(ip->ip_len < sizeof(struct tcphdr)))
     {
@@ -1784 +1785 @@
     {
         struct ip *oip;
-        size_t ohdrlen;
+        unsigned ohdrlen;
         struct mbuf *m;
 

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

@@ -439 +439 @@
          * a PUSH comes in.)
          */
-        if (off + len == SBUF_LEN(&so->so_snd))
+        if (off + len == (ssize_t)SBUF_LEN(&so->so_snd))
             flags |= TH_PUSH;
     }
@@ -540 +540 @@
     {
         memcpy((caddr_t)(ti + 1), (caddr_t)opt, optlen);
-        ti->ti_off = (sizeof (struct tcphdr) + optlen) >> 2;
+        ti->ti_off = (uint8_t)((sizeof (struct tcphdr) + optlen) >> 2);
     }
     ti->ti_flags = flags;

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

@@ -315 +315 @@
 
 void
-tcp_drain()
+tcp_drain(void)
 {
     /* XXX */

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

@@ -334 +334 @@
          * can't use IP_HDRINCL here as it's only 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
 #if   defined(IP_MTU_DISCOVER)
         USE_DF_OPTION(IP_MTU_DISCOVER);
@@ -434 +433 @@
     memset(ui->ui_x1, 0, 9);
     ui->ui_pr = IPPROTO_UDP;
-    ui->ui_len = RT_H2N_U16(mlen - sizeof(struct ip));
+    ui->ui_len = RT_H2N_U16((uint16_t)(mlen - sizeof(struct ip)));
     /* XXXXX Check for from-one-location sockets, or from-any-location sockets */
     ui->ui_src = saddr->sin_addr;