Changeset 63011 in vbox for trunk/src

Timestamp:

Aug 4, 2016 9:08:23 PM (9 years ago)

Author:

vboxsync

Message:

lwip-new: warnings

Location:

trunk/src/VBox/Devices/Network/lwip-new

Files:

• src/core/ipv6/ip6_frag.c (modified) (2 diffs)
• src/core/netif.c (modified) (1 diff)
• src/core/tcp_in.c (modified) (1 diff)
• vbox/sys_arch.c (modified) (4 diffs)

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

@@ -449 +449 @@
   /* Adjust datagram length by adding preceding header lengths. */
   unfrag_len = (u8_t *)p->payload - (u8_t *)ipr->iphdr0;
+# ifndef VBOX
   ipr->datagram_len += unfrag_len - IP6_HLEN + IP6_FRAG_HLEN;
+# else
+  LWIP_ASSERT("overflow", (s16_t)unfrag_len == (ssize_t)unfrag_len); /* s16_t because of pbuf_header call */
+  ipr->datagram_len += (u16_t)(unfrag_len - IP6_HLEN + IP6_FRAG_HLEN);
+# endif
 
   /* Set payload length in ip header. */
@@ -474 +479 @@
 
   /* Move pbuf back to IPv6 header. */
+# ifndef VBOX
   if (pbuf_header(p, unfrag_len) != 0) {
+# else
+  if (pbuf_header(p, (s16_t)unfrag_len) != 0) {
+# endif
     LWIP_ASSERT("ip6_reass: moving p->payload to ip6 header failed\n", 0);
     goto nullreturn;

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

@@ -888 +888 @@
 netif_create_ip6_linklocal_address(struct netif * netif, u8_t from_mac_48bit)
 {
+#ifndef VBOX
   u8_t i, addr_index;
+#else
+  u8_t i;
+#endif
 
   /* Link-local prefix. */

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

@@ -502 +502 @@
   struct tcp_pcb *npcb;
   err_t rc;
+#ifdef VBOX
+  (void)syn;
+#endif
 
   if (flags & TCP_RST) {

trunk/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c

@@ -179 +179 @@
     int rc;
     struct sys_mbox *mbox = NULL;
+    RT_NOREF(size); /** @todo safe to ignore this? */
 
     if (pvMbox == NULL)
@@ -326 +327 @@
     uint64_t tsStart, tsEnd;
     struct sys_mbox *mbox = NULL;
+
     if (!pvMbox || !*pvMbox) return 0;
-    AssertReturn(pvMbox && *pvMbox, ERR_ARG);
     mbox = (struct sys_mbox*)*pvMbox;
 
@@ -493 +494 @@
  * to make lwip thread main function compatible with IPRT thread main function.
  */
-static DECLCALLBACK(int) sys_thread_adapter(RTTHREAD ThreadSelf, void *pvUser)
+static DECLCALLBACK(int) sys_thread_adapter(RTTHREAD hThreadSelf, void *pvUser)
 {
     THREADLOCALSTORAGE *tls = (THREADLOCALSTORAGE *)pvUser;
+    RT_NOREF(hThreadSelf);
+
     tls->thread(tls->arg);
-    return 0;
+
+    return VINF_SUCCESS;
 }
 
@@ -511 +515 @@
     unsigned id;
     RTTHREAD tid;
+
+    RT_NOREF(prio, stacksize, name);
 
 #if SYS_LIGHTWEIGHT_PROT