Changeset 13746 in vbox

Timestamp:

Nov 3, 2008 1:15:07 PM (16 years ago)

Author:

vboxsync

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

38719

Message:

Solaris/VBoxNetFlt: netinfo.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -3158 +3158 @@
     {
 #ifdef VBOXNETFLT_SOLARIS_USE_NETINFO
-        netstack_t *pNetStack = netstack_get_current();
-        if (pNetStack)
-        {
-            net_data_t pNetData = net_lookup_impl(NHF_INET, pNetStack);
-            if (pNetData)
+        mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
+        if (RT_LIKELY(pMsg))
+        {
+            netstack_t *pNetStack = netstack_get_current();
+            if (pNetStack)
             {
-                phy_if_t pInterface = net_phylookup(pNetData, pThis->szName);
-                if (pInterface)
+                net_data_t pNetData = net_lookup_impl(NHF_INET, pNetStack);
+                if (pNetData)
                 {
-                    net_inject_t InjectData;
-                    InjectData.ni_packet = pMsg;
-                    InjectData.ni_physical = pInterface;
-                    bzero(&InjectData.ni_addr, sizeof(InjectData.ni_addr));
-                    InjectData.ni_addr.ss_family = AF_INET;
-
-                    /*
-                     * Queue out rather than direct out transmission.
-                     */
-                    int rc = net_inject(pNetData, NI_QUEUE_OUT, &InjectData);
-                    if (!rc)
-                        rc = VINF_SUCCESS;
+                    phy_if_t pInterface = net_phylookup(pNetData, pThis->szName);
+                    if (pInterface)
+                    {
+                        net_inject_t InjectData;
+                        InjectData.ni_packet = pMsg;
+                        InjectData.ni_physical = pInterface;
+                        bzero(&InjectData.ni_addr, sizeof(InjectData.ni_addr));
+                        InjectData.ni_addr.ss_family = AF_INET;
+
+                        /*
+                         * Queue out rather than direct out transmission.
+                         */
+                        int rc = net_inject(pNetData, NI_QUEUE_OUT, &InjectData);
+                        if (!rc)
+                            rc = VINF_SUCCESS;
+                        else
+                        {
+                            LogRel((DEVICE_NAME ":queuing IP packet for transmission failed. rc=%d\n", rc));
+                            rc = VERR_NET_IO_ERROR;
+                        }
+                    }
                     else
                     {
-                        LogRel((DEVICE_NAME ":queuing IP packet for transmission failed. rc=%d\n", rc));
+                        LogRel((DEVICE_NAME ":vboxNetFltPortOsXmit failed to lookup physical interface.\n"));
                         rc = VERR_NET_IO_ERROR;
                     }
                 }
                 else
-                    LogRel((DEVICE_NAME ":vboxNetFltPortOsXmit failed to lookup physical interface.\n"));
+                {
+                    LogRel((DEVICE_NAME ":vboxNetFltPortOsXmit failed to get IP hooks.\n"));
+                    rc = VERR_NET_IO_ERROR;
+                }
+                netstack_rele(pNetStack);
             }
             else
-                LogRel((DEVICE_NAME ":vboxNetFltPortOsXmit failed to get IP hooks.\n"));
-            netstack_rele(pNetStack);
+            {
+                LogRel((DEVICE_NAME ":vboxNetFltPortOsXmit failed to get current net stack.\n"));
+                rc = VERR_NET_IO_ERROR;
+            }
         }
         else
-            LogRel((DEVICE_NAME ":vboxNetFltPortOsXmit failed to get current net stack.\n"));
+        {
+            LogRel((DEVICE_NAME ":vboxNetFltPortOsXmit vboxNetFltSolarisMBlkFromSG failed.\n"));
+            rc = VERR_NO_MEMORY;
+        }
 #else
         vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);