Changeset 46425 in vbox for trunk

Timestamp:

Jun 7, 2013 5:09:23 AM (12 years ago)

Author:

vboxsync

Message:

LWIP-new/iSCSI: updates.

Location:

trunk/src/VBox

Files:

• Devices/Network/DevINIP.cpp (modified) (10 diffs)
• NetworkServices/NAT/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevINIP.cpp

@@ -56 +56 @@
 #include "VBoxDD.h"
 
+#ifdef VBOX_WITH_NEW_LWIP
+# include "VBoxLwipCore.h"
+#endif
 
 /*******************************************************************************
@@ -142 +145 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
+#ifndef VBOX_WITH_NEW_LWIP
 static DECLCALLBACK(void) devINIPARPTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer);
 static DECLCALLBACK(void) devINIPTCPFastTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer);
 static DECLCALLBACK(void) devINIPTCPSlowTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer);
+#endif
 static DECLCALLBACK(err_t) devINIPOutput(struct netif *netif, struct pbuf *p, struct ip_addr *ipaddr);
 static DECLCALLBACK(err_t) devINIPOutputRaw(struct netif *netif, struct pbuf *p);
@@ -150 +155 @@
 
 
+#ifndef VBOX_WITH_NEW_LWIP
 /**
  * ARP cache timeout handling for lwIP.
@@ -194 +200 @@
     LogFlow(("%s: return\n", __FUNCTION__));
 }
+#endif /* VBOX_WITH_NEW_LWIP */
 
 /**
@@ -314 +321 @@
     netif_ip6_addr_set_state(netif, 0, IP6_ADDR_VALID);
     netif->output_ip6 = ethip6_output;
-#if LWIP_IPV6_AUTOCONFIG
+# if LWIP_IPV6_AUTOCONFIG
     netif->ip6_autoconfig_enabled=1;
-#endif
+# endif
     LogFunc(("netif: ipv6:%RTnaipv6\n", &netif->ip6_addr[0].addr[0]));
     netif->output = lwip_etharp_output;
+
+    lwip_etharp_init();
 #else
     netif->output = devINIPOutput;
-#endif
-    netif->linkoutput = devINIPOutputRaw;
-
+    
     lwip_etharp_init();
     TMTimerSetMillies(g_pDevINIPData->ARPTimer, ARP_TMR_INTERVAL);
+ #endif
+    netif->linkoutput = devINIPOutputRaw;
+
     LogFlow(("%s: success\n", __FUNCTION__));
     return ERR_OK;
@@ -466 +476 @@
 }
 
-
+#ifndef VBOX_WITH_NEW_LWIP
 /**
  * Signals the end of lwIP TCPIP initialization.
@@ -475 +485 @@
 {
     sys_sem_t *sem = (sys_sem_t *)arg;
-#ifndef VBOX_WITH_NEW_LWIP
+
     lwip_sys_sem_signal(*sem);
-#else
-    lwip_sys_sem_signal(sem);
-#endif
-}
+}
+#endif
 
 
@@ -726 +734 @@
      * Initialize lwIP.
      */
+#ifndef VBOX_WITH_NEW_LWIP
     lwip_stats_init();
     lwip_sys_init();
-#if MEM_LIBC_MALLOC == 0
+# if MEM_LIBC_MALLOC == 0
     lwip_mem_init();
-#endif
+# endif
     lwip_memp_init();
     lwip_pbuf_init();
@@ -745 +754 @@
     AssertRCReturn(rc, rc);
     TMTimerSetMillies(pThis->TCPFastTimer, TCP_SLOW_INTERVAL);
-#ifndef VBOX_WITH_NEW_LWIP
+
     pThis->LWIPTcpInitSem = lwip_sys_sem_new(0);
     {
@@ -751 +760 @@
         lwip_sys_sem_wait(pThis->LWIPTcpInitSem);
     }
-#else
-    errRc = lwip_sys_sem_new(&pThis->LWIPTcpInitSem, 0);
-    /* VERR_INTERNAL_ERROR perhaps should be replaced with right error code */
-    AssertReturn(errRc == ERR_OK, VERR_INTERNAL_ERROR);
-    {
-        lwip_tcpip_init(devINIPTcpipInitDone, &pThis->LWIPTcpInitSem);
-        lwip_sys_sem_wait(&pThis->LWIPTcpInitSem, 0);
-    }
+#else /* VBOX_WITH_NEW_LWIP */
+    vboxLwipCoreInitialize();
 #endif
 

trunk/src/VBox/NetworkServices/NAT/Makefile.kmk

@@ -75 +75 @@
 VBoxNetLwipNAT_SOURCES += VBoxNetLwipNAT.cpp    \
         ../NetLib/VBoxNetBaseService.cpp \
-        ../NetLib/VBoxNetPortForwardString.cpp \
-        ../../Devices/Network/VBoxLwipCore.cpp
+        ../NetLib/VBoxNetPortForwardString.cpp
 VBoxNetLwipNAT_LIBS = \
         $(LIB_RUNTIME)