Changeset 21412 for trunk/src/iphlpapi/iphlpapi.cpp

Timestamp:

Aug 13, 2010, 2:37:57 PM (15 years ago)

Author:

dmik

Message:

iphlpapi: Fix the byte order in the reported interface mask and report the actual broadcast address instead of 0-s.

File:

• trunk/src/iphlpapi/iphlpapi.cpp (modified) (3 diffs)

trunk/src/iphlpapi/iphlpapi.cpp

@@ -104 +104 @@
                         (char)(*(((char*)&data) + 2)),
                         (char)(*(((char*)&data) + 3)));
-}
-
-void stringNetmask(char* dst,u_long data)
-{
-   sprintf(dst,"%u.%u.%u.%u",
-                        (char)(*(((char*)&data) + 3)),
-                        (char)(*(((char*)&data) + 2)),
-                        (char)(*(((char*)&data) + 1)),
-                        (char)data);
 }
 
@@ -251 +242 @@
 
     pmibTable->table[currentInterface].dwDescrLen = strlen(ifmibget.iftable[i].ifDescr);
-    strncpy((char *)pmibTable->table[currentInterface].bDescr, iShortName, strlen(iShortName));
-//    strncpy((char *)pmibTable->table[currentInterface].bDescr, ifmibget.iftable[i].ifDescr, sizeof(pmibTable->table[currentInterface].bDescr));
+    strncpy((char *)pmibTable->table[currentInterface].bDescr, ifmibget.iftable[i].ifDescr, sizeof(pmibTable->table[currentInterface].bDescr));
 
 
     pmipaddrTable->table[currentInterface].dwAddr = ifInfo->IPAddress;
-    pmipaddrTable->table[currentInterface].dwMask = ifInfo->netmask;
-    pmipaddrTable->table[currentInterface].dwBCastAddr = 0; //??
+    // mask is in network byte order for some reason
+    pmipaddrTable->table[currentInterface].dwMask = ntohl(ifInfo->netmask);
+    pmipaddrTable->table[currentInterface].dwBCastAddr = ifInfo->broadcastAddress;
     pmipaddrTable->table[currentInterface].dwIndex = ifmibget.iftable[i].ifIndex;
 
-;  /* MTU of the interface   */
+    /* MTU of the interface   */
 
 
@@ -268 +259 @@
     iasAdapterIP.Next = NULL;
     stringIPAddress((char*)&iasAdapterIP.IpAddress,ifInfo->IPAddress);
-    stringNetmask((char*)&iasAdapterIP.IpMask,ifInfo->netmask);
+    stringIPAddress((char*)&iasAdapterIP.IpMask,ntohl(ifInfo->netmask));
     iasAdapterIP.Context = 0;