Changeset 2561 in vbox

Timestamp:

May 9, 2007 3:39:16 PM (18 years ago)

Author:

vboxsync

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

21021

Message:

Added release logging to the Linux TAP code

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5733 +5733 @@
         Log(("Failed to start the TAP interface setup script %s, error text: %s\n",
               szCommand, strerror(iErr)));
+        LogRel(("Failed to start the TAP interface setup script %s, error text: %s\n",
+              szCommand, strerror(iErr)));
         LogFlowThisFunc(("rc=E_FAIL\n"));
         return setError(E_FAIL, tr ("Failed to run the host networking set up command %s: %s"),
@@ -5756 +5758 @@
             pclose(pfScriptHandle);
             Log(("The TAP interface setup script did not return the name of a TAP device.\n"));
+            LogRel(("The TAP interface setup script did not return the name of a TAP device.\n"));
             LogFlowThisFunc(("rc=E_FAIL\n"));
             return setError(E_FAIL, tr ("The host networking set up command did not supply an interface name"));
@@ -5767 +5770 @@
     {
         Log(("The TAP interface setup script terminated abnormally.\n"));
+        LogRel(("The TAP interface setup script terminated abnormally.\n"));
         LogFlowThisFunc(("rc=E_FAIL\n"));
         return setError(E_FAIL, tr ("The host networking set up command did not run correctly"));
@@ -5773 +5777 @@
     {
         Log(("The TAP interface setup script returned a non-zero exit code.\n"));
+        LogRel(("The TAP interface setup script returned a non-zero exit code.\n"));
         LogFlowThisFunc(("rc=E_FAIL\n"));
         return setError(E_FAIL, tr ("The host networking set up command returned a non-zero exit code"));
@@ -5873 +5878 @@
                 {
                     Log(("Failed to open the host network interface %ls\n", tapDeviceName.raw()));
+                    LogRel(("Failed to open the host network interface %ls\n", tapDeviceName.raw()));
                     rc = setError(E_FAIL, tr ("Failed to open the host network interface %ls"),
                                           tapDeviceName.raw());
@@ -5885 +5891 @@
                     {
                         Log(("No setup application was supplied for the TAP interface.\n"));
+                        LogRel(("No setup application was supplied for the TAP interface.\n"));
                         rc = setError(E_FAIL, tr ("No setup application was supplied for the host networking interface"));
                     }
@@ -5908 +5915 @@
                     {
                         Log(("Failed to open the host network interface %ls returned by the setup script", tapDeviceName.raw()));
+                        LogRel(("Failed to open the host network interface %ls returned by the setup script", tapDeviceName.raw()));
                         rc = setError(E_FAIL, tr ("Failed to open the host network interface %ls returned by the setup script"), tapDeviceName.raw());
                     }
@@ -5930 +5938 @@
                     else
                     {
-                        AssertMsgFailed(("Configuration error: Failed to configure /dev/net/tun non blocking. errno=%d\n", errno));
+                        Log(("Configuration error: Failed to configure /dev/net/tun non blocking. Error: %s\n", strerror(errno)));
+                        LogRel(("Configuration error: Failed to configure /dev/net/tun non blocking. Error: %s\n", strerror(errno)));
                         rcVBox = VERR_HOSTIF_BLOCKING;
                         rc = setError(E_FAIL, tr ("could not set up the host networking device for non blocking access: %s"),
@@ -5940 +5949 @@
         else
         {
-            AssertMsgFailed(("Configuration error: Failed to open /dev/net/tun rc=%Vrc\n", rcVBox));
+            Log(("Configuration error: Failed to open /dev/net/tun rc=%Vrc\n", rcVBox));
+            LogRel(("Configuration error: Failed to open /dev/net/tun rc=%Vrc\n", rcVBox));
             switch (rcVBox)
             {
@@ -5963 +5973 @@
         if (VBOX_FAILURE(rcVBox) && SUCCEEDED(rc))
         {
+            Log(("General failure attaching to host interface\n"));
+            LogRel(("General failure attaching to host interface\n"));
             rc = setError(E_FAIL, tr ("General failure attaching to host interface"));
         }
@@ -6039 +6051 @@
             {
                 Log(("Failed to execute the clean up script for the TAP interface"));
+                LogRel(("Failed to execute the clean up script for the TAP interface"));
                 rc = setError(E_FAIL, tr ("Failed to execute the clean up script for the TAP interface"));
             }
@@ -6044 +6057 @@
             {
                 Log(("The TAP interface clean up script terminated abnormally.\n"));
+                LogRel(("The TAP interface clean up script terminated abnormally.\n"));
                 rc = setError(E_FAIL, tr ("The TAP interface clean up script terminated abnormally"));
             }
@@ -6049 +6063 @@
             {
                 Log(("The TAP interface clean up script returned a non-zero exit code.\n"));
+                LogRel(("The TAP interface clean up script returned a non-zero exit code.\n"));
                 rc = setError(E_FAIL, tr ("The TAP interface clean up script returned a non-zero exit code"));
             }