Changeset 23222 in vbox for trunk

Timestamp:

Sep 22, 2009 3:48:26 PM (15 years ago)

Author:

vboxsync

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

52691

Message:

ConsoleImpl2: Added support for attaching/detaching NetSniffer at Runtime

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• Main/NetworkAdapterImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -772 +772 @@
         }
 #ifdef VBOX_DYNAMIC_NET_ATTACH
+        /* here the order in which strncmp is called is important
+         * cause nictracefile can be very well compared with
+         * nictrace and nic and thus everything will always fail
+         * if the order is changed
+         */
+        else if (!strncmp(a->argv[1], "nictracefile", 12))
+        {
+            /* Get the number of network adapters */
+            ULONG NetworkAdapterCount = 0;
+            ComPtr <ISystemProperties> info;
+            CHECK_ERROR_BREAK (a->virtualBox, COMGETTER(SystemProperties) (info.asOutParam()));
+            CHECK_ERROR_BREAK (info, COMGETTER(NetworkAdapterCount) (&NetworkAdapterCount));
+
+            unsigned n = parseNum(&a->argv[1][12], NetworkAdapterCount, "NIC");
+            if (!n)
+            {
+                rc = E_FAIL;
+                break;
+            }
+            if (a->argc <= 2)
+            {
+                errorArgument("Missing argument to '%s'", a->argv[1]);
+                rc = E_FAIL;
+                break;
+            }
+
+            /* get the corresponding network adapter */
+            ComPtr<INetworkAdapter> adapter;
+            CHECK_ERROR_BREAK (sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam()));
+            if (adapter)
+            {
+                BOOL fEnabled;
+                adapter->COMGETTER(Enabled)(&fEnabled);
+                if (fEnabled)
+                {
+                    if (a->argv[2])
+                    {
+                        CHECK_ERROR_RET(adapter, COMSETTER(TraceFile) (Bstr(a->argv[2])), 1);
+                    }
+                    else
+                    {
+                        errorArgument("Invalid filename or filename not specified for NIC %lu", n);
+                        rc = E_FAIL;
+                        break;
+                    }
+                }
+                else
+                {
+                    RTPrintf("The NIC %d is currently disabled and thus can't change its tracefile\n", n);
+                }
+            }
+        }
+        else if (!strncmp(a->argv[1], "nictrace", 8))
+        {
+            /* Get the number of network adapters */
+            ULONG NetworkAdapterCount = 0;
+            ComPtr <ISystemProperties> info;
+            CHECK_ERROR_BREAK (a->virtualBox, COMGETTER(SystemProperties) (info.asOutParam()));
+            CHECK_ERROR_BREAK (info, COMGETTER(NetworkAdapterCount) (&NetworkAdapterCount));
+
+            unsigned n = parseNum(&a->argv[1][8], NetworkAdapterCount, "NIC");
+            if (!n)
+            {
+                rc = E_FAIL;
+                break;
+            }
+            if (a->argc <= 2)
+            {
+                errorArgument("Missing argument to '%s'", a->argv[1]);
+                rc = E_FAIL;
+                break;
+            }
+
+            /* get the corresponding network adapter */
+            ComPtr<INetworkAdapter> adapter;
+            CHECK_ERROR_BREAK (sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam()));
+            if (adapter)
+            {
+                BOOL fEnabled;
+                adapter->COMGETTER(Enabled)(&fEnabled);
+                if (fEnabled)
+                {
+                    if (!strcmp(a->argv[2], "on"))
+                    {
+                        CHECK_ERROR_RET(adapter, COMSETTER(TraceEnabled)(TRUE), 1);
+                    }
+                    else if (!strcmp(a->argv[2], "off"))
+                    {
+                        CHECK_ERROR_RET(adapter, COMSETTER(TraceEnabled)(FALSE), 1);
+                    }
+                    else
+                    {
+                        errorArgument("Invalid nictrace%lu argument '%s'", n, Utf8Str(a->argv[2]).raw());
+                        rc = E_FAIL;
+                        break;
+                    }
+                }
+                else
+                {
+                    RTPrintf("The NIC %d is currently disabled and thus can't change its tracefile\n", n);
+                }
+            }
+        }
         else if (!strncmp(a->argv[1], "nic", 3))
         {

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2055 +2055 @@
 
         pLunL0 = CFGMR3GetChildF(pInst, "LUN#%u", uLun);
-        CFGMR3RemoveNode(CFGMR3GetChildF(pLunL0, "AttachedDriver"));
+        PCFGMNODE pLunAD = CFGMR3GetChildF(pLunL0, "AttachedDriver");
+        if (pLunAD)
+        {
+            CFGMR3RemoveNode(pLunAD);
+        }
+        else
+        {
+            CFGMR3RemoveNode(pLunL0);
+            rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0);                 RC_CHECK();
+            rc = CFGMR3InsertString(pLunL0, "Driver", "NetSniffer");        RC_CHECK();
+            rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);                 RC_CHECK();
+            hrc = aNetworkAdapter->COMGETTER(TraceFile)(&str);              H();
+            if (str) /* check convention for indicating default file. */
+            {
+                rc = CFGMR3InsertStringW(pCfg, "File", str);                RC_CHECK();
+            }
+            STR_FREE();
+        }
     }
     else if (fAttachDetach && !fSniffer)

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -639 +639 @@
         alock.unlock();
 
-        mParent->onNetworkAdapterChange (this, FALSE);
+        mParent->onNetworkAdapterChange (this, TRUE);
     }