儲存庫 vbox 的更動 11993

時間撮記:

2008-9-2 下午03:23:17 (16 年 以前)

作者:

vboxsync

訊息:

Main/vboxnetflt: Ethernet long names for Solaris hosts.

位置:

trunk/src/VBox/Main

檔案:

• ConsoleImpl2.cpp (修改) (1 筆差異)
• HostImpl.cpp (修改) (5 筆差異)

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)"

trunk/src/VBox/Main/HostImpl.cpp

@@ -52 +52 @@
 # include <limits.h>
 # include <stdio.h>
+# include <net/if.h>
 # include <sys/socket.h>
 # include <sys/sockio.h>
@@ -109 +110 @@
 #ifdef RT_OS_SOLARIS
 # include <iprt/path.h>
+# include <iprt/ctype.h>
 #endif
 
@@ -556 +558 @@
 # elif defined(RT_OS_SOLARIS)
 
+    typedef std::map <std::string, std::string> NICMap;
+    typedef std::pair <std::string, std::string> NICPair;
+    static NICMap SolarisNICMap;
+    SolarisNICMap.insert(NICPair("bge", "Broadcom BCM57xx Gigabit Ethernet"));
+    SolarisNICMap.insert(NICPair("ce", "Cassini Gigabit Ethernet"));
+    SolarisNICMap.insert(NICPair("chxge", "Chelsio Ethernet"));
+    SolarisNICMap.insert(NICPair("dmfe", "Davicom Fast Ethernet"));
+    SolarisNICMap.insert(NICPair("dnet", "DEC 21040/41 21140 Ethernet"));
+    SolarisNICMap.insert(NICPair("e1000", "Intel PRO/1000 Gigabit Ethernet"));
+    SolarisNICMap.insert(NICPair("e1000g", "Intel PRO/1000 Gigabit Ethernet"));
+    SolarisNICMap.insert(NICPair("elx", "3COM EtherLink III Ethernet"));
+    SolarisNICMap.insert(NICPair("elxl", "3COM Ethernet"));
+    SolarisNICMap.insert(NICPair("elxl", "eri Fast Ethernet"));
+    SolarisNICMap.insert(NICPair("ge", "GEM Gigabit Ethernet"));
+    SolarisNICMap.insert(NICPair("hme", "SUNW,hme Fast-Ethernet"));
+    SolarisNICMap.insert(NICPair("ipge", "PCI-E Gigabit Ethernet"));
+    SolarisNICMap.insert(NICPair("iprb", "Intel 82557/58/59 Ethernet"));
+    SolarisNICMap.insert(NICPair("nge", "nVidia Gigabit Ethernet"));
+    SolarisNICMap.insert(NICPair("pcelx", "3COM EtherLink III PCMCIA Ethernet"));
+    SolarisNICMap.insert(NICPair("pcn", "AMD PCnet Ethernet"));
+    SolarisNICMap.insert(NICPair("qfe", "SUNW,qfe Quad Fast-Ethernet"));
+    SolarisNICMap.insert(NICPair("rge", "Realtek Gigabit Ethernet"));
+    SolarisNICMap.insert(NICPair("rtls", "Realtek 8139 Fast Ethernet"));
+    SolarisNICMap.insert(NICPair("skge", "SksKonnect Gigabit Ethernet"));
+    SolarisNICMap.insert(NICPair("spwr", "SMC EtherPower II 10/100 (9432)   Ethernet"));
+    SolarisNICMap.insert(NICPair("xge", "Neterior Xframe Gigabit Ethernet"));
+    SolarisNICMap.insert(NICPair("xge", "Neterior Xframe 10Gigabit Ethernet"));
+
     int Sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
     if (Sock > 0)
@@ -604 +634 @@
                             memset(&Mac, 0, sizeof(Mac));
 
+                        char szNICDesc[LIFNAMSIZ + 256];
                         char *pszIface = Ifaces[i].lifr_name;
-
+                        strcpy(szNICDesc, pszIface);
+
+                        /*
+                         * Clip off the instance number from the interface name.
+                         */
+                        int cbInstance = 0;
+                        int cbIface = strlen(pszIface);
+                        char *pszEnd = pszIface + cbIface - 1;
+                        for (int i = 0; i < cbIface - 1; i++)
+                        {
+                            if (!RT_C_IS_DIGIT(*pszEnd))
+                                break;
+                            cbInstance++;
+                            pszEnd--;
+                        }
+
+                        /*
+                         * Try picking up description from our NIC map.
+                         */
+                        char szIfaceName[LIFNAMSIZ + 1];
+                        strncpy(szIfaceName, pszIface, cbIface - cbInstance);
+                        szIfaceName[cbIface - cbInstance] = '\0';
+                        std::string Description = SolarisNICMap[szIfaceName];
+                        if (Description != "")
+                            RTStrPrintf(szNICDesc, sizeof(szNICDesc), "%s - %s", pszIface, Description.c_str());
+                        else
+                            RTStrPrintf(szNICDesc, sizeof(szNICDesc), "%s - Ethernet", pszIface);
+
+                        /*
+                         * Construct UUID with BSD-name of the interface and the MAC address.
+                         */
                         RTUUID Uuid;
                         RTUuidClear(&Uuid);
@@ -620 +681 @@
                         ComObjPtr<HostNetworkInterface> IfObj;
                         IfObj.createObject();
-                        if (SUCCEEDED(IfObj->init(Bstr(pszIface), Guid(Uuid))))
+                        if (SUCCEEDED(IfObj->init(Bstr(szNICDesc), Guid(Uuid))))
                             list.push_back(IfObj);
                     }