Changeset 28583 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 22, 2010 9:31:09 AM (15 years ago)

Author:

vboxsync

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

60415

Message:

Dropped redundant code for listing network interfaces on Solaris

File:

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

trunk/src/VBox/Main/HostImpl.cpp

@@ -531 +531 @@
         RTMemFree(pvFree);
     }
-
-#  elif defined(RT_OS_SOLARIS)
-
-#   ifdef VBOX_SOLARIS_NSL_RESOLVED
-
-    /*
-     * Use libdevinfo for determining all physical interfaces.
-     */
-    di_node_t Root;
-    Root = di_init("/", DINFOCACHE);
-    if (Root != DI_NODE_NIL)
-    {
-        di_walk_minor(Root, DDI_NT_NET, 0, &list, vboxSolarisAddPhysHostIface);
-        di_fini(Root);
-    }
-
-    /*
-     * Use libdlpi for determining all DLPI interfaces.
-     */
-    if (VBoxSolarisLibDlpiFound())
-        g_pfnLibDlpiWalk(vboxSolarisAddLinkHostIface, &list, 0);
-
-#   endif    /* VBOX_SOLARIS_NSL_RESOLVED */
-
-    /*
-     * This gets only the list of all plumbed logical interfaces.
-     * This is needed for zones which cannot access the device tree
-     * and in this case we just let them use the list of plumbed interfaces
-     * on the zone.
-     */
-    int Sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
-    if (Sock > 0)
-    {
-        struct lifnum IfNum;
-        memset(&IfNum, 0, sizeof(IfNum));
-        IfNum.lifn_family = AF_INET;
-        int rc = ioctl(Sock, SIOCGLIFNUM, &IfNum);
-        if (!rc)
-        {
-            struct lifreq Ifaces[24];
-            struct lifconf IfConfig;
-            memset(&IfConfig, 0, sizeof(IfConfig));
-            IfConfig.lifc_family = AF_INET;
-            IfConfig.lifc_len = sizeof(Ifaces);
-            IfConfig.lifc_buf = (caddr_t)&(Ifaces[0]);
-            rc = ioctl(Sock, SIOCGLIFCONF, &IfConfig);
-            if (!rc)
-            {
-                for (int i = 0; i < IfNum.lifn_count; i++)
-                {
-                    /*
-                     * Skip loopback interfaces.
-                     */
-                    if (!strncmp(Ifaces[i].lifr_name, "lo", 2))
-                        continue;
-
-#if 0
-                    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)
-                            memcpy(&Mac, ArpReq.arp_ha.sa_data, sizeof(RTMAC));
-                        else
-                            memset(&Mac, 0, sizeof(Mac));
-
-                        char szNICDesc[LIFNAMSIZ + 256];
-                        char *pszIface = Ifaces[i].lifr_name;
-                        strcpy(szNICDesc, pszIface);
-
-                        vboxSolarisAddLinkHostIface(pszIface, &list);
-                    }
-#endif
-
-                    char *pszIface = Ifaces[i].lifr_name;
-                    vboxSolarisAddLinkHostIface(pszIface, &list);
-                }
-            }
-        }
-        close(Sock);
-    }
-
-    /*
-     * Weed out duplicates caused by dlpi_walk inconsistencies across Nevadas.
-     */
-    list.sort(vboxSolarisSortNICList);
-    list.unique(vboxSolarisSameNIC);
 
 #  elif defined RT_OS_WINDOWS