儲存庫 vbox 的更動 11868

時間撮記:

2008-8-30 下午01:31:30 (16 年 以前)

作者:

vboxsync

訊息:

Main/vboxnetflt: Solaris NIC enumeration fix for including interfaces that don't have an IP address but are plumbed.

檔案:

• trunk/src/VBox/Main/HostImpl.cpp (修改) (2 筆差異)

trunk/src/VBox/Main/HostImpl.cpp

@@ -47 +47 @@
 #ifdef RT_OS_SOLARIS
 # include <fcntl.h>
+# include <syslog.h>
 # include <unistd.h>
 # include <stropts.h>
@@ -579 +580 @@
                 for (int i = 0; i < IfNum.lifn_count; i++)
                 {
+                    /*
+                     * Skip loopback interfaces.
+                     */
+                    if (!strncmp(Ifaces[i].lifr_name, "lo", 2))
+                        continue;
+
                     rc = ioctl(Sock, SIOCGLIFADDR, &(Ifaces[i]));
                     if (!rc)
                     {
+                        RTMAC Mac;
                         struct arpreq ArpReq;
                         memcpy(&ArpReq.arp_pa, &Ifaces[i].lifr_addr, sizeof(struct sockaddr_in));
+
+                        /*
+                         * We might fail if the interface has not been assigned an IP address.
+                         * That doesn't matter; as long as it's plumbed we can pick it up.
+                         * But, if it has not acquired an IP address we cannot obtain it's MAC
+                         * address this way, so we just use all zeros there.
+                         */
                         rc = ioctl(Sock, SIOCGARP, &ArpReq);
                         if (!rc)
-                        {
-                            RTMAC Mac;
                             memcpy(&Mac, ArpReq.arp_ha.sa_data, sizeof(RTMAC));
-
-                            char *pszIface = Ifaces[i].lifr_name;
-
-                            RTUUID Uuid;
-                            RTUuidClear(&Uuid);
-                            memcpy(&Uuid, pszIface, RT_MIN(strlen(pszIface), sizeof(Uuid)));
-                            Uuid.Gen.u8ClockSeqHiAndReserved = (Uuid.Gen.u8ClockSeqHiAndReserved & 0x3f) | 0x80;
-                            Uuid.Gen.u16TimeHiAndVersion = (Uuid.Gen.u16TimeHiAndVersion & 0x0fff) | 0x4000;
-                            Uuid.Gen.au8Node[0] = Mac.au8[0];
-                            Uuid.Gen.au8Node[1] = Mac.au8[1];
-                            Uuid.Gen.au8Node[2] = Mac.au8[2];
-                            Uuid.Gen.au8Node[3] = Mac.au8[3];
-                            Uuid.Gen.au8Node[4] = Mac.au8[4];
-                            Uuid.Gen.au8Node[5] = Mac.au8[5];
-
-                            ComObjPtr<HostNetworkInterface> IfObj;
-                            IfObj.createObject();
-                            if (SUCCEEDED(IfObj->init(Bstr(pszIface), Guid(Uuid))))
-                                list.push_back(IfObj);
-                        }
+                        else
+                            memset(&Mac, 0, sizeof(Mac));
+
+                        char *pszIface = Ifaces[i].lifr_name;
+
+                        RTUUID Uuid;
+                        RTUuidClear(&Uuid);
+                        memcpy(&Uuid, pszIface, RT_MIN(strlen(pszIface), sizeof(Uuid)));
+                        Uuid.Gen.u8ClockSeqHiAndReserved = (Uuid.Gen.u8ClockSeqHiAndReserved & 0x3f) | 0x80;
+                        Uuid.Gen.u16TimeHiAndVersion = (Uuid.Gen.u16TimeHiAndVersion & 0x0fff) | 0x4000;
+                        Uuid.Gen.au8Node[0] = Mac.au8[0];
+                        Uuid.Gen.au8Node[1] = Mac.au8[1];
+                        Uuid.Gen.au8Node[2] = Mac.au8[2];
+                        Uuid.Gen.au8Node[3] = Mac.au8[3];
+                        Uuid.Gen.au8Node[4] = Mac.au8[4];
+                        Uuid.Gen.au8Node[5] = Mac.au8[5];
+
+                        ComObjPtr<HostNetworkInterface> IfObj;
+                        IfObj.createObject();
+                        if (SUCCEEDED(IfObj->init(Bstr(pszIface), Guid(Uuid))))
+                            list.push_back(IfObj);
                     }
                 }