Changeset 11993 in vbox for trunk/src/VBox/Main/ConsoleImpl2.cpp

Timestamp:

Sep 2, 2008 3:23:17 PM (16 years ago)

Author:

vboxsync

Message:

Main/vboxnetflt: Ethernet long names for Solaris hosts.

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1225 +1225 @@
 
 # elif defined(RT_OS_SOLARIS) 
-                    /* The name is on the form BSD format 'ifX'; use as-is. */
-                    const char *pszTrunk = pszHifName;
+                    /* The name is on the form BSD format 'ifX - long name, chop it off at space. */
+                    char szTrunk[8];
+                    strncpy(szTrunk, pszHifName, sizeof(szTrunk));
+                    char *pszSpace = (char *)memchr(szTrunk, ' ', sizeof(szTrunk));
+                    if (!pszSpace)
+                    {
+                        hrc = networkAdapter->Detach();                              H();
+                        return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
+                                          N_("Malformed host interface networking name '%ls'"),
+                                          HifName.raw());
+                    }
+                    *pszSpace = '\0';
+                    const char *pszTrunk = szTrunk;
 # else 
 #  error "PORTME (VBOX_WITH_NETFLT)"