Changeset 15455 in vbox for trunk/src/VBox/Main/solaris

Timestamp:

Dec 14, 2008 9:58:42 AM (16 years ago)

Author:

vboxsync

Message:

#3282 HostNetIf API: Solaris implementaion is functional except IP V6 addresses. Fixed erroneous return codes in Host::MemorySize and Host::MemoryAvailable along the way.

File:

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

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

@@ -40 +40 @@
 #include <list>
 
+#include "Logging.h"
 #include "HostNetworkInterfaceImpl.h"
 #include "netif.h"
@@ -126 +127 @@
         if (ioctl(Sock, SIOCGLIFADDR, &IfReq) >= 0)
         {
-            memcpy(Info.IPAddress.au8, ((struct sockaddr *)&IfReq.lifr_addr)->sa_data,
+            memcpy(Info.IPAddress.au8, &((struct sockaddr_in *)&IfReq.lifr_addr)->sin_addr.s_addr,
                     sizeof(Info.IPAddress.au8));
-            // SIOCGLIFNETMASK
             struct arpreq ArpReq;
             memcpy(&ArpReq.arp_pa, &IfReq.lifr_addr, sizeof(struct sockaddr_in));
@@ -139 +139 @@
              */
             if (ioctl(Sock, SIOCGARP, &ArpReq) >= 0)
+            {
                 memcpy(&Info.MACAddress, ArpReq.arp_ha.sa_data, sizeof(Info.MACAddress));
+            }
 
         }
@@ -145 +147 @@
         if (ioctl(Sock, SIOCGLIFNETMASK, &IfReq) >= 0)
         {
-            memcpy(Info.IPNetMask.au8, ((struct sockaddr *)&IfReq.lifr_addr)->sa_data,
+            memcpy(Info.IPNetMask.au8, &((struct sockaddr_in *)&IfReq.lifr_addr)->sin_addr.s_addr,
                     sizeof(Info.IPNetMask.au8));
         }
@@ -169 +171 @@
     Uuid.Gen.au8Node[5] = Info.MACAddress.au8[5];
     Info.Uuid = Uuid;
+    Info.enmType = NETIF_T_ETHERNET;
 
     ComObjPtr<HostNetworkInterface> IfObj;
     IfObj.createObject();
-    if (SUCCEEDED(IfObj->init(Bstr(szNICDesc), Guid(Uuid))))
+    if (SUCCEEDED(IfObj->init(Bstr(szNICDesc), &Info)))
         pList->push_back(IfObj);
 }