Changeset 54838 in vbox for trunk/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp

Timestamp:

Mar 18, 2015 5:44:08 PM (10 years ago)

Author:

vboxsync

Message:

Main/src-server/solaris: Fix description matching for vboxvnic_templates that don't have an instance number immediately following it.

File:

• trunk/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp

@@ -52 +52 @@
 
 #include "DynLoadLibSolaris.h"
+
+/** @todo Unify this define with VBoxNetFltBow-solaris.c */
+#define VBOXBOW_VNIC_TEMPLATE_NAME      "vboxvnic_template"
+
 
 static uint32_t getInstance(const char *pszIfaceName, char *pszDevName)
@@ -172 +176 @@
         SolarisNICMap.insert(NICPair("spwr", "SMC EtherPower II 10/100 (9432) Ethernet"));
         SolarisNICMap.insert(NICPair("vboxnet", "VirtualBox Host Ethernet"));
-        SolarisNICMap.insert(NICPair("vboxvnic_template", "VirtualBox Virtual Network Interface Template"));
+        SolarisNICMap.insert(NICPair(VBOXBOW_VNIC_TEMPLATE_NAME, "VirtualBox Virtual Network Interface Template"));
         SolarisNICMap.insert(NICPair("vlan", "Virtual LAN Ethernet"));
         SolarisNICMap.insert(NICPair("vr", "VIA Rhine Fast Ethernet"));
@@ -191 +195 @@
         if (Description != "")
             RTStrPrintf(szNICDesc, sizeof(szNICDesc), "%s - %s", szNICInstance, Description.c_str());
+        else if (!strncmp(szNICInstance, RT_STR_TUPLE(VBOXBOW_VNIC_TEMPLATE_NAME)))
+        {
+            /*
+             * We want prefix matching only for "vboxvnic_template" as it's possible to create "vboxvnic_template_abcd123",
+             * which our Solaris Crossbow NetFilter driver will interpret as a VNIC template.
+             */
+            Description = SolarisNICMap[VBOXBOW_VNIC_TEMPLATE_NAME];
+            RTStrPrintf(szNICDesc, sizeof(szNICDesc), "%s - %s", szNICInstance, Description.c_str());
+        }
         else
             RTStrPrintf(szNICDesc, sizeof(szNICDesc), "%s - Ethernet", szNICInstance);
@@ -300 +313 @@
      * Skip our own dynamic VNICs but don't skip VNIC templates.
      * These names originate from VBoxNetFltBow-solaris.c, hardcoded here for now.
-     */
-    if (    strncmp(pszIface, RT_STR_TUPLE("vboxvnic_template"))
+     *                                                                           .
+     * ASSUMES template name is longer than 'vboxvnic'.
+     */
+    if (    strncmp(pszIface, RT_STR_TUPLE(VBOXBOW_VNIC_TEMPLATE_NAME))
         && !strncmp(pszIface, RT_STR_TUPLE("vboxvnic")))
         return _B_FALSE;