儲存庫 vbox 的更動 50173

時間撮記:

2014-1-23 上午05:45:23 (11 年 以前)

作者:

vboxsync

訊息:

lwip: Sync with git master up to
commit 08370c723092e7a8f5cbea3f063f460cb7530d26
Date: Thu Jan 16 21:28:38 2014 +0100

These changes don't affect VBox, same object code is generated.

位置:

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

檔案:

• CHANGELOG (修改) (1 筆差異)
• src/api/tcpip.c (修改) (1 筆差異)
• src/core/snmp/mib2.c (修改) (4 筆差異)
• src/core/timers.c (修改) (3 筆差異)
• src/include/lwip/snmp.h (修改) (2 筆差異)
• src/include/lwip/sockets.h (修改) (1 筆差異)

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

@@ -80 +80 @@
 
  ++ Bugfixes:
+
+  2014-01-14: "Freddie Chopin"
+  * snmp.h, mib2.c: fixed constness and spelling of sysdescr
+
+  2014-01-14: Simon Goldschmidt (patch by Thomas Faber)
+  * tcpip.c: patch #8241: Fix implicit declaration of ip_input with
+    LWIP_TCPIP_CORE_LOCKING_INPUT disabled
+
+  2014-01-14: chrysn
+  * timers.c: patch #8244 make timeouts usable reliably from outside of the
+    timeout routine
 
   2014-01-10: Simon Goldschmidt

trunk/src/VBox/Devices/Network/lwip-new/src/api/tcpip.c

@@ -47 +47 @@
 #include "lwip/tcpip.h"
 #include "lwip/init.h"
+#include "lwip/ip.h"
 #include "netif/etharp.h"
 #include "netif/ppp_oe.h"

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

@@ -773 +773 @@
 static const u8_t sysdescr_len_default = 4;
 static const u8_t sysdescr_default[] = "lwIP";
-static u8_t* sysdescr_len_ptr = (u8_t*)&sysdescr_len_default;
-static u8_t* sysdescr_ptr = (u8_t*)&sysdescr_default[0];
+static const u8_t* sysdescr_len_ptr = &sysdescr_len_default;
+static const u8_t* sysdescr_ptr = &sysdescr_default[0];
 /** mib-2.system.sysContact */
 static const u8_t syscontact_len_default = 0;
@@ -903 +903 @@
  * @param n number of octets to copy.
  */
-static void ocstrncpy(u8_t *dst, u8_t *src, u16_t n)
+static void ocstrncpy(u8_t *dst, const u8_t *src, u16_t n)
 {
   u16_t i = n;
@@ -919 +919 @@
  * @param n number of sub identifiers to copy.
  */
-void objectidncpy(s32_t *dst, s32_t *src, u8_t n)
+void objectidncpy(s32_t *dst, const s32_t *src, u8_t n)
 {
   u8_t i = n;
@@ -934 +934 @@
  * @param len points to string length, excluding zero terminator
  */
-void snmp_set_sysdesr(u8_t *str, u8_t *len)
+void snmp_set_sysdescr(const u8_t *str, const u8_t *len)
 {
   if (str != NULL)

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

@@ -369 +369 @@
 {
   struct sys_timeo *timeout, *t;
+#if NO_SYS
+  u32_t now, diff;
+#endif
 
   timeout = (struct sys_timeo *)memp_malloc(MEMP_SYS_TIMEOUT);
@@ -375 +378 @@
     return;
   }
+
+#if NO_SYS
+  now = sys_now();
+  if (next_timeout == NULL) {
+    diff = 0;
+    timeouts_last_time = now;
+  } else {
+    diff = now - timeouts_last_time;
+  }
+#endif
+
   timeout->next = NULL;
   timeout->h = handler;
   timeout->arg = arg;
+#if NO_SYS
+  timeout->time = msecs + diff;
+#else
   timeout->time = msecs;
+#endif
 #if LWIP_DEBUG_TIMERNAMES
   timeout->handler_name = handler_name;
@@ -480 +498 @@
         /* timeout has expired */
         had_one = 1;
-        timeouts_last_time = now;
+        timeouts_last_time += tmptimeout->time;
         diff -= tmptimeout->time;
         next_timeout = tmptimeout->next;

trunk/src/VBox/Devices/Network/lwip-new/src/include/lwip/snmp.h

@@ -99 +99 @@
 
 /* system */
-void snmp_set_sysdesr(u8_t* str, u8_t* len);
+void snmp_set_sysdescr(const u8_t* str, const u8_t* len);
 void snmp_set_sysobjid(struct snmp_obj_id *oid);
 void snmp_get_sysobjid_ptr(struct snmp_obj_id **oid);
@@ -232 +232 @@
 
 /* system */
-#define snmp_set_sysdesr(str, len)
+#define snmp_set_sysdescr(str, len)
 #define snmp_set_sysobjid(oid);
 #define snmp_get_sysobjid_ptr(oid)

trunk/src/VBox/Devices/Network/lwip-new/src/include/lwip/sockets.h

@@ -168 +168 @@
 
 #define IPPROTO_IP      0
+#define IPPROTO_ICMP    1 
 #define IPPROTO_TCP     6
 #define IPPROTO_UDP     17
 #if LWIP_IPV6
 #define IPPROTO_IPV6    41
+#define IPPROTO_ICMPV6  58
 #endif /* LWIP_IPV6 */
 #define IPPROTO_UDPLITE 136