Changeset 15446 in vbox for trunk/src

Timestamp:

Dec 13, 2008 6:59:25 PM (16 years ago)

Author:

vboxsync

Message:

#3282 HostNetIf API: Solaris implementation revised.

File:

• trunk/src/VBox/Main/solaris/NetIfList-solaris.cpp (modified) (9 diffs)

trunk/src/VBox/Main/solaris/NetIfList-solaris.cpp

@@ -37 +37 @@
 
 #include <iprt/err.h>
-
+#include <iprt/ctype.h>
+#include <list>
+
+#include "HostNetworkInterfaceImpl.h"
 #include "netif.h"
 
-#include <list>
+#ifdef VBOX_WITH_HOSTNETIF_API
+
 #include <map>
-
-#ifdef VBOX_WITH_HOSTNETIF_API
-
+#include <string>
 #include <fcntl.h>
 #include <unistd.h>
@@ -61 +63 @@
 #include <sys/types.h>
 
-static void vboxSolarisAddHostIface(char *pszIface, int Instance, PCRTMAC pMac, void *pvHostNetworkInterfaceList)
+#include "DynLoadLibSolaris.h"
+
+static void vboxSolarisAddHostIface(char *pszIface, int Instance, void *pvHostNetworkInterfaceList)
 {
     std::list<ComObjPtr <HostNetworkInterface> > *pList = (std::list<ComObjPtr <HostNetworkInterface> > *)pvHostNetworkInterfaceList;
@@ -113 +117 @@
         RTStrPrintf(szNICDesc, sizeof(szNICDesc), "%s - Ethernet", szNICInstance);
 
+    NETIFINFO Info;
+    memset(&Info, 0, sizeof(Info));
+    int Sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
+    if (Sock > 0)
+    {
+        struct lifreq IfReq;
+        strcpy(IfReq.lifr_name, szNICInstance);
+        if (ioctl(Sock, SIOCGLIFADDR, &IfReq) >= 0)
+        {
+            memcpy(Info.IPAddress.au8, ((struct sockaddr *)&IfReq.lifr_addr)->sa_data,
+                    sizeof(Info.IPAddress.au8));
+            // SIOCGLIFNETMASK
+            struct arpreq ArpReq;
+            memcpy(&ArpReq.arp_pa, &IfReq.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.
+             */
+            if (ioctl(Sock, SIOCGARP, &ArpReq) >= 0)
+                memcpy(&Info.MACAddress, ArpReq.arp_ha.sa_data, sizeof(Info.MACAddress));
+
+        }
+
+        if (ioctl(Sock, SIOCGLIFNETMASK, &IfReq) >= 0)
+        {
+            memcpy(Info.IPNetMask.au8, ((struct sockaddr *)&IfReq.lifr_addr)->sa_data,
+                    sizeof(Info.IPNetMask.au8));
+        }
+        if (ioctl(Sock, SIOCGLIFFLAGS, &IfReq) >= 0)
+        {
+            Info.enmStatus = IfReq.lifr_flags & IFF_UP ? NETIF_S_UP : NETIF_S_DOWN;
+        }
+        close(Sock);
+    }
     /*
      * Construct UUID with interface name and the MAC address if available.
@@ -121 +162 @@
     Uuid.Gen.u8ClockSeqHiAndReserved = (Uuid.Gen.u8ClockSeqHiAndReserved & 0x3f) | 0x80;
     Uuid.Gen.u16TimeHiAndVersion = (Uuid.Gen.u16TimeHiAndVersion & 0x0fff) | 0x4000;
-    if (pMac)
-    {
-        Uuid.Gen.au8Node[0] = pMac->au8[0];
-        Uuid.Gen.au8Node[1] = pMac->au8[1];
-        Uuid.Gen.au8Node[2] = pMac->au8[2];
-        Uuid.Gen.au8Node[3] = pMac->au8[3];
-        Uuid.Gen.au8Node[4] = pMac->au8[4];
-        Uuid.Gen.au8Node[5] = pMac->au8[5];
-    }
+    Uuid.Gen.au8Node[0] = Info.MACAddress.au8[0];
+    Uuid.Gen.au8Node[1] = Info.MACAddress.au8[1];
+    Uuid.Gen.au8Node[2] = Info.MACAddress.au8[2];
+    Uuid.Gen.au8Node[3] = Info.MACAddress.au8[3];
+    Uuid.Gen.au8Node[4] = Info.MACAddress.au8[4];
+    Uuid.Gen.au8Node[5] = Info.MACAddress.au8[5];
+    Info.Uuid = Uuid;
 
     ComObjPtr<HostNetworkInterface> IfObj;
@@ -169 +208 @@
      * Add the interface.
      */
-    vboxSolarisAddHostIface(szIfaceName, Instance, NULL, pvHostNetworkInterfaceList);
+    vboxSolarisAddHostIface(szIfaceName, Instance, pvHostNetworkInterfaceList);
 
     /*
@@ -214 +253 @@
         return DI_WALK_CONTINUE;
 
-    vboxSolarisAddHostIface(di_driver_name(Node), di_instance(Node), NULL, pvHostNetworkInterfaceList);
+    vboxSolarisAddHostIface(di_driver_name(Node), di_instance(Node), pvHostNetworkInterfaceList);
     return DI_WALK_CONTINUE;
 }
@@ -275 +314 @@
                         continue;
 
-                    NETIFINFO Info;
-                    memset(&Info, 0, sizeof(Info));
+#if 0
                     rc = ioctl(Sock, SIOCGLIFADDR, &(Ifaces[i]));
                     if (rc >= 0)
                     {
-                        memcpy(Info.IPAddress.au8, &Ifaces[i].lifr_addr.sa_data, Info.IPAddress.au8);
+                        memcpy(Info.IPAddress.au8, ((struct sockaddr *)&Ifaces[i].lifr_addr)->sa_data,
+                               sizeof(Info.IPAddress.au8));
                         // SIOCGLIFNETMASK
                         struct arpreq ArpReq;
@@ -295 +334 @@
                             memcpy(&Info.MACAddress, ArpReq.arp_ha.sa_data, sizeof(Info.MACAddress));
 
-#if 0
                         char szNICDesc[LIFNAMSIZ + 256];
                         char *pszIface = Ifaces[i].lifr_name;
@@ -301 +339 @@
 
                         vboxSolarisAddLinkHostIface(pszIface, &list);
+                    }
 #endif
-                    }
-
-                    rc = ioctl(Sock, SIOCGLIFNETMASK, &(Ifaces[i]));
-                    if (rc >= 0)
-                    {
-                        memcpy(Info.IPNetMask.au8, &Ifaces[i].lifr_addr.sa_data, Info.IPNetMask.au8);
-                    }
-                    rc = ioctl(Sock, SIOCGLIFFLAGS, &(Ifaces[i]));
-                    if (rc >= 0)
-                    {
-                        Info.enmStatus = Ifaces[i].lifr_flags & IFF_UP ? NETIF_S_UP : NETIF_S_DOWN;
-                    }
+
                     char *pszIface = Ifaces[i].lifr_name;
                     vboxSolarisAddLinkHostIface(pszIface, &list);