Changeset 559 in vbox

Timestamp:

Feb 2, 2007 3:24:29 PM (18 years ago)

Author:

vboxsync

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

18178

Message:

Added INetworkConnector callback for sending multiple packets

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvIntNet.cpp (modified) (2 diffs)
• DrvNAT.cpp (modified) (2 diffs)
• DrvNetSniffer.cpp (modified) (2 diffs)
• DrvTAP.cpp (modified) (2 diffs)
• DrvTAPWin32.cpp (modified) (2 diffs)

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

@@ -154 +154 @@
 }
 
+
+/**
+ * Send multiple data packets to the network.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   cPackets        Number of packets
+ * @param   paPacket        Packet description array
+ * @thread  EMT
+ */
+static DECLCALLBACK(int) drvIntNetSendEx(PPDMINETWORKCONNECTOR pInterface, uint32_t cPackets, PPDMINETWORKPACKET paPacket)
+{
+    int rc = VERR_INVALID_PARAMETER;
+
+    for (uint32_t i=0;i<cPackets;i++)
+    {
+        rc = drvIntNetSend(pInterface, paPacket[i].pvBuf, paPacket[i].cb);
+        if (VBOX_FAILURE(rc))
+            break;
+    }
+    return rc;
+}
 
 /**
@@ -611 +633 @@
     /* INetwork */
     pThis->INetworkConnector.pfnSend                = drvIntNetSend;
+    pThis->INetworkConnector.pfnSendEx              = drvIntNetSendEx;
     pThis->INetworkConnector.pfnSetPromiscuousMode  = drvIntNetSetPromiscuousMode;
     pThis->INetworkConnector.pfnNotifyLinkChanged   = drvIntNetNotifyLinkChanged;

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

@@ -99 +99 @@
 
 /**
+ * Send multiple data packets to the network.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   cPackets        Number of packets
+ * @param   paPacket        Packet description array
+ * @thread  EMT
+ */
+static DECLCALLBACK(int) drvNATSendEx(PPDMINETWORKCONNECTOR pInterface, uint32_t cPackets, PPDMINETWORKPACKET paPacket)
+{
+    int rc = VERR_INVALID_PARAMETER;
+
+    for (uint32_t i=0;i<cPackets;i++)
+    {
+        rc = drvNATSend(pInterface, paPacket[i].pvBuf, paPacket[i].cb);
+        if (VBOX_FAILURE(rc))
+            break;
+    }
+    return rc;
+}
+
+/**
  * Set promiscuous mode.
  *
@@ -355 +377 @@
     pDrvIns->IBase.pfnQueryInterface    = drvNATQueryInterface;
     /* INetwork */
-    pData->INetworkConnector.pfnSend    = drvNATSend;
+    pData->INetworkConnector.pfnSend               = drvNATSend;
+    pData->INetworkConnector.pfnSendEx             = drvNATSendEx;
     pData->INetworkConnector.pfnSetPromiscuousMode = drvNATSetPromiscuousMode;
-    pData->INetworkConnector.pfnNotifyLinkChanged = drvNATNotifyLinkChanged;
-    pData->INetworkConnector.pfnNotifyCanReceive = drvNATNotifyCanReceive;
+    pData->INetworkConnector.pfnNotifyLinkChanged  = drvNATNotifyLinkChanged;
+    pData->INetworkConnector.pfnNotifyCanReceive   = drvNATNotifyCanReceive;
 
     /*

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

@@ -149 +149 @@
 
 /**
+ * Send multiple data packets to the network.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   cPackets        Number of packets
+ * @param   paPacket        Packet description array
+ * @thread  EMT
+ */
+static DECLCALLBACK(int) drvNetSnifferSendEx(PPDMINETWORKCONNECTOR pInterface, uint32_t cPackets, PPDMINETWORKPACKET paPacket)
+{
+    int rc = VERR_INVALID_PARAMETER;
+
+    for (uint32_t i=0;i<cPackets;i++)
+    {
+        rc = drvNetSnifferSend(pInterface, paPacket[i].pvBuf, paPacket[i].cb);
+        if (VBOX_FAILURE(rc))
+            break;
+    }
+    return rc;
+}
+
+
+/**
  * Set promiscuous mode.
  *
@@ -334 +357 @@
     /* INetworkConnector */
     pData->INetworkConnector.pfnSend                = drvNetSnifferSend;
+    pData->INetworkConnector.pfnSendEx              = drvNetSnifferSendEx;
     pData->INetworkConnector.pfnSetPromiscuousMode  = drvNetSnifferSetPromiscuousMode;
     pData->INetworkConnector.pfnNotifyLinkChanged   = drvNetSnifferNotifyLinkChanged;

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

@@ -157 +157 @@
 }
 
+/**
+ * Send multiple data packets to the network.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   cPackets        Number of packets
+ * @param   paPacket        Packet description array
+ * @thread  EMT
+ */
+static DECLCALLBACK(int) drvTAPSendEx(PPDMINETWORKCONNECTOR pInterface, uint32_t cPackets, PPDMINETWORKPACKET paPacket)
+{
+    int rc = VERR_INVALID_PARAMETER;
+
+    for (uint32_t i=0;i<cPackets;i++)
+    {
+        rc = drvTAPSend(pInterface, paPacket[i].pvBuf, paPacket[i].cb);
+        if (VBOX_FAILURE(rc))
+            break;
+    }
+    return rc;
+}
 
 /**
@@ -509 +530 @@
     /* INetwork */
     pData->INetworkConnector.pfnSend                = drvTAPSend;
+    pData->INetworkConnector.pfnSendEx              = drvTAPSendEx;
     pData->INetworkConnector.pfnSetPromiscuousMode  = drvTAPSetPromiscuousMode;
     pData->INetworkConnector.pfnNotifyLinkChanged   = drvTAPNotifyLinkChanged;

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

@@ -165 +165 @@
 }
 
+/**
+ * Send multiple data packets to the network.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   cPackets        Number of packets
+ * @param   paPacket        Packet description array
+ * @thread  EMT
+ */
+static DECLCALLBACK(int) drvTAPW32SendEx(PPDMINETWORKCONNECTOR pInterface, uint32_t cPackets, PPDMINETWORKPACKET paPacket)
+{
+    int rc = VERR_INVALID_PARAMETER;
+
+    for (uint32_t i=0;i<cPackets;i++)
+    {
+        rc = drvTAPW32Send(pInterface, paPacket[i].pvBuf, paPacket[i].cb);
+        if (VBOX_FAILURE(rc))
+            break;
+    }
+    return rc;
+}
+
 
 /**
@@ -466 +488 @@
     /* INetwork */
     pData->INetworkConnector.pfnSend                = drvTAPW32Send;
+    pData->INetworkConnector.pfnSendEx              = drvTAPW32SendEx;
     pData->INetworkConnector.pfnSetPromiscuousMode  = drvTAPW32SetPromiscuousMode;
     pData->INetworkConnector.pfnNotifyLinkChanged   = drvTAPW32NotifyLinkChanged;