Changeset 12394 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Sep 11, 2008 7:29:28 AM (16 years ago)

Author:

vboxsync

Message:

VBoxService: Fix for current interface.

File:

• trunk/src/VBox/Additions/WINNT/VBoxService/VBoxVMInfoNet.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxVMInfoNet.cpp

@@ -17 +17 @@
 int vboxVMInfoNet(VBOXINFORMATIONCONTEXT* a_pCtx)
 {
-    DWORD dwCurIface = 0;
-
     SOCKET sd = WSASocket(AF_INET, SOCK_DGRAM, 0, 0, 0, 0);
     if (sd == SOCKET_ERROR)
@@ -39 +37 @@
     char szTemp [_MAX_PATH+1] = {0};
     int nNumInterfaces = nBytesReturned / sizeof(INTERFACE_INFO);
+    int iCurIface = 0;
 
     RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/Count");
     vboxVMInfoWritePropInt(a_pCtx, szPropPath, (nNumInterfaces > 1 ? nNumInterfaces-1 : 0));
-
-    dwCurIface = 0;
 
     for (int i = 0; i < nNumInterfaces; ++i)
@@ -52 +49 @@
         sockaddr_in *pAddress;
         pAddress = (sockaddr_in *) & (InterfaceList[i].iiAddress);
-        RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/V4/IP", i);
+        RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/V4/IP", iCurIface);
         vboxVMInfoWriteProp(a_pCtx, szPropPath, inet_ntoa(pAddress->sin_addr));
 
         pAddress = (sockaddr_in *) & (InterfaceList[i].iiBroadcastAddress);
-        RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/V4/Broadcast", i);
+        RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/V4/Broadcast", iCurIface);
         vboxVMInfoWriteProp(a_pCtx, szPropPath, inet_ntoa(pAddress->sin_addr));
 
         pAddress = (sockaddr_in *) & (InterfaceList[i].iiNetmask);
-        RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/V4/Netmask", i);
+        RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/V4/Netmask", iCurIface);
         vboxVMInfoWriteProp(a_pCtx, szPropPath, inet_ntoa(pAddress->sin_addr));
 
@@ -69 +66 @@
             RTStrPrintf(szTemp, sizeof(szTemp), "Down");
 
-        RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/Status", i);
+        RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/Status", iCurIface);
         vboxVMInfoWriteProp(a_pCtx, szPropPath, szTemp);
+
+        iCurIface++;
     }