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

Timestamp:

Oct 15, 2012 6:40:08 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

81376

Message:

DevINIP: makes compatible with LWIP 1.4.1.

File:

• trunk/src/VBox/Devices/Network/DevINIP.cpp (modified) (10 diffs)

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

@@ -37 +37 @@
 #include "lwip/udp.h"
 #include "lwip/tcp.h"
+#ifdef VBOX_WITH_NEW_LWIP
+# include "lwip/tcp_impl.h"
+#endif
 #include "lwip/tcpip.h"
 #include "lwip/sockets.h"
@@ -205 +208 @@
     LogFlow(("%s: netif=%p p=%p ipaddr=%#04x\n", __FUNCTION__, netif, p,
              ipaddr->addr));
+#ifndef VBOX_WITH_NEW_LWIP
     lrc = lwip_etharp_output(netif, ipaddr, p);
+#else
+    lrc = lwip_etharp_output(netif, p, ipaddr);
+#endif
     LogFlow(("%s: return %d\n", __FUNCTION__, lrc));
     return lrc;
@@ -299 +306 @@
     netif->mtu = DEVINIP_MAX_FRAME;
     netif->flags = NETIF_FLAG_BROADCAST;
+#ifdef VBOX_WITH_NEW_LWIP
+    /* @todo: why explicit ARP routing required for 1.2.0 case? */
+    netif->flags |= NETIF_FLAG_ETHARP;
+    netif->flags |= NETIF_FLAG_ETHERNET;
+#endif
     netif->output = devINIPOutput;
     netif->linkoutput = devINIPOutputRaw;
@@ -376 +388 @@
         {
             case ETHTYPE_IP:    /* IP packet */
+#ifndef VBOX_WITH_NEW_LWIP
                 lwip_pbuf_header(p, -(ssize_t)sizeof(struct eth_hdr));
+#endif
                 lrc = iface->input(p, iface);
                 if (lrc)
@@ -382 +396 @@
                 break;
             case ETHTYPE_ARP:   /* ARP packet */
+#ifndef VBOX_WITH_NEW_LWIP
                 lwip_etharp_arp_input(iface, (struct eth_addr *)iface->hwaddr, p);
+#else
+                ethernet_input(p, iface);
+#endif
                 break;
             default:
@@ -411 +429 @@
 {
     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
 }
 
@@ -513 +535 @@
         netif_set_down(&pThis->IntNetIF);
         netif_remove(&pThis->IntNetIF);
+#ifndef VBOX_WITH_NEW_LWIP
         tcpip_terminate();
         lwip_sys_sem_wait(pThis->LWIPTcpInitSem);
         lwip_sys_sem_free(pThis->LWIPTcpInitSem);
+#else
+        /* no termination on new lwip ??? Hmmm... */
+        lwip_sys_sem_wait(&pThis->LWIPTcpInitSem, 0);
+        lwip_sys_sem_free(&pThis->LWIPTcpInitSem);
+#endif
     }
 
@@ -538 +566 @@
     PDEVINTNETIP pThis = PDMINS_2_DATA(pDevIns, PDEVINTNETIP);
     int rc = VINF_SUCCESS;
+#ifdef VBOX_WITH_NEW_LWIP
+    err_t errRc = ERR_OK;
+#endif
     LogFlow(("%s: pDevIns=%p iInstance=%d pCfg=%p\n", __FUNCTION__,
              pDevIns, iInstance, pCfg));
@@ -718 +749 @@
         goto out;
     TMTimerSetMillies(pThis->TCPFastTimer, TCP_SLOW_INTERVAL);
+#ifndef VBOX_WITH_NEW_LWIP
     pThis->LWIPTcpInitSem = lwip_sys_sem_new(0);
     {
@@ -723 +755 @@
         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);
+    }
+#endif
 
     /*