Changeset 36023 in vbox

Timestamp:

Feb 18, 2011 3:01:20 PM (14 years ago)

Author:

vboxsync

Message:

DevINIP: Make it work again after the network overhaul.

File:

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

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

@@ -75 +75 @@
     /** The network port this device provides (LUN\#0). */
     PDMINETWORKDOWN         INetworkDown;
+    /** Tzhe network configuration port this device provides (LUN\#0). */
+    PDMINETWORKCONFIG       INetworkConfig;
     /** The base interface of the network driver below us. */
     PPDMIBASE               pDrvBase;
@@ -102 +104 @@
      * provides a proper interface to all IP stack functions. */
     const void             *pLinkHack;
+    /** Flag whether the link is up. */
+    bool                    fLnkUp;
 } DEVINTNETIP, *PDEVINTNETIP;
 
@@ -226 +230 @@
     {
         PPDMSCATTERGATHER pSgBuf;
+
+        rc = g_pDevINIPData->pDrv->pfnBeginXmit(g_pDevINIPData->pDrv, true /* fOnWorkerThread */);
+        if (RT_FAILURE(rc))
+            return ERR_IF;
+
         rc = g_pDevINIPData->pDrv->pfnAllocBuf(g_pDevINIPData->pDrv, DEVINIP_MAX_FRAME, NULL /*pGso*/, &pSgBuf);
         if (RT_SUCCESS(rc))
@@ -253 +262 @@
             }
             if (cbBuf)
-                rc = g_pDevINIPData->pDrv->pfnSendBuf(g_pDevINIPData->pDrv, pSgBuf, false);
+            {
+                pSgBuf->cbUsed = cbBuf;
+                rc = g_pDevINIPData->pDrv->pfnSendBuf(g_pDevINIPData->pDrv, pSgBuf, true /* fOnWorkerThread */);
+            }
             else
                 rc = g_pDevINIPData->pDrv->pfnFreeBuf(g_pDevINIPData->pDrv, pSgBuf);
@@ -261 +273 @@
 #endif
         }
+
+        g_pDevINIPData->pDrv->pfnEndXmit(g_pDevINIPData->pDrv);
     }
 
@@ -400 +414 @@
 }
 
+
+/**
+ * Gets the current Media Access Control (MAC) address.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   pMac            Where to store the MAC address.
+ * @thread  EMT
+ */
+static DECLCALLBACK(int) devINIPGetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
+{
+    PDEVINTNETIP pThis = RT_FROM_MEMBER(pInterface, DEVINTNETIP, INetworkConfig);
+    memcpy(pMac, pThis->MAC.au8, sizeof(RTMAC));
+    return VINF_SUCCESS;
+}
+
+/**
+ * Gets the new link state.
+ *
+ * @returns The current link state.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @thread  EMT
+ */
+static DECLCALLBACK(PDMNETWORKLINKSTATE) devINIPGetLinkState(PPDMINETWORKCONFIG pInterface)
+{
+    PDEVINTNETIP pThis = RT_FROM_MEMBER(pInterface, DEVINTNETIP, INetworkConfig);
+    if (pThis->fLnkUp)
+        return PDMNETWORKLINKSTATE_UP;
+    return PDMNETWORKLINKSTATE_DOWN;
+}
+
+
+/**
+ * Sets the new link state.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   enmState        The new link state
+ */
+static DECLCALLBACK(int) devINIPSetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
+{
+    PDEVINTNETIP pThis = RT_FROM_MEMBER(pInterface, DEVINTNETIP, INetworkConfig);
+    bool fNewUp = enmState == PDMNETWORKLINKSTATE_UP;
+
+    if (fNewUp != pThis->fLnkUp)
+    {
+        if (fNewUp)
+        {
+            LogFlowFunc(("Link is up\n"));
+            pThis->fLnkUp = true;
+        }
+        else
+        {
+            LogFlowFunc(("Link is down\n"));
+            pThis->fLnkUp = false;
+        }
+        if (pThis->pDrv)
+            pThis->pDrv->pfnNotifyLinkChanged(pThis->pDrv, enmState);
+    }
+    return VINF_SUCCESS;
+}
+
 /* -=-=-=-=- PDMIBASE -=-=-=-=- */
 
@@ -411 +487 @@
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThis->IBase);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKDOWN, &pThis->INetworkDown);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKCONFIG, &pThis->INetworkConfig);
     return NULL;
 }
@@ -491 +568 @@
     pThis->INetworkDown.pfnReceive          = devINIPNetworkDown_Input;
     pThis->INetworkDown.pfnXmitPending      = devINIPNetworkDown_XmitPending;
+    /* INetworkConfig */
+    pThis->INetworkConfig.pfnGetMac         = devINIPGetMac;
+    pThis->INetworkConfig.pfnGetLinkState   = devINIPGetLinkState;
+    pThis->INetworkConfig.pfnSetLinkState   = devINIPSetLinkState;
 
     /*