omc-commit Mailing List for OMC - Open Management with CIM (Page 15)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 807
          http://omc.svn.sourceforge.net/omc/?rev=807&view=rev
Author:   mike-brasher
Date:     2008-07-31 21:34:47 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Added diags to track down lsif bug.

Modified Paths:
--------------
    cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
    cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/lsif.mak

Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
===================================================================

--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c	2008-07-31 21:02:47 UTC (rev 806)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c	2008-07-31 21:34:47 UTC (rev 807)
@@ -12,6 +12,8 @@
 #include "Resource.h"
 #include "common.h"
 
+#define MAX_IFREQ 64
+
 struct EthtoolInfo
 {
     /* Non-zero if full duplex */
@@ -102,9 +104,9 @@
 struct EthernetPortResource* GetEthernetPortResources()
 {
     int sock;
-    char* buf;
     int len;
     int prev_len;
+    char buf[MAX_IFREQ * sizeof(struct ifreq)];
     struct ifconf ifc;
     char* p;
     int flags;
@@ -116,41 +118,15 @@
     if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
         return NULL;
 
-    /* Create buffer large enough to hold all interfaces. Increase buffer
-     * size until the resulting size quits growing.
-     */
+    /* Disover interfaces with ioctl() */
 
-    len = 1 * sizeof(struct ifreq);
-    prev_len = 0;
+    ifc.ifc_buf = buf;
+    ifc.ifc_len = sizeof(buf);
 
-    for (;;)
+    if (ioctl(sock, SIOCGIFCONF, &ifc) < 0)
     {
-        if (!(buf = malloc(len)))
-            return NULL;
-
-        ifc.ifc_buf = buf;
-        ifc.ifc_len = len;
-
-        if (ioctl(sock, SIOCGIFCONF, &ifc) < 0)
-        {
-            if (errno != EINVAL || prev_len)
-            {
-                close(sock);
-                free(buf);
-                return NULL;
-            }
-
-            continue;
-        }
-        else
-        {
-            if (ifc.ifc_len == prev_len)
-                break;
-            prev_len = ifc.ifc_len;
-        }
-
-        len += 1 * sizeof(struct ifreq);
-        free(buf);
+        close(sock);
+        return NULL;
     }
 
     /* For each interface */
@@ -164,8 +140,13 @@
         int family;
         struct EthtoolInfo eti;
 
+        /* Get pointer to current element */
+
         ifr = (struct ifreq*)p;
+        p += sizeof(struct ifreq);
 
+        /* Clear info structure */
+
         memset(&info, 0, sizeof(info));
 
         /* Get socket address length */
@@ -185,10 +166,6 @@
             addr_len = sizeof(struct sockaddr);
         }
 
-        /* Skip pointer to next interface */
-
-        p += sizeof(struct ifreq);
-
         /* Skip non-eth? ports */
 
 #if defined(ETHERNET_INTERFACES_ONLY)
@@ -198,8 +175,26 @@
 
         /* Get EthernetPortResource.name */
 
+printf("NAME[%s]\n", ifr->ifr_name);
+
         strlcpy(info.name, ifr->ifr_name, sizeof(info.name));
 
+{
+    struct EthernetPortResource* p;
+    int size = 0;
+
+    for (p = head; p; p = p->next)
+    {
+        size++;
+        if (strcasecmp(p->name, ifr->ifr_name) == 0)
+        {
+printf("ALREADY IN LIST[%s]\n", ifr->ifr_name);
+        }
+    }
+
+printf("SIZE[%d]\n", size);
+}
+
         /* Get EthernetPortResource.family_name */
 
         if (family == AF_INET)
@@ -229,7 +224,6 @@
             if (ioctl(sock, SIOCGIFHWADDR, &tmp) != 0)
             {
                 close(sock);
-                free(buf);
                 return NULL;
             }
 
@@ -248,7 +242,6 @@
             if (ioctl(sock, SIOCGIFFLAGS, &tmp) != 0)
             {
                 close(sock);
-                free(buf);
                 return NULL;
             }
 
@@ -277,7 +270,6 @@
             if (ioctl(sock, SIOCGIFADDR, &tmp) != 0)
             {
                 close(sock);
-                free(buf);
                 return NULL;
             }
 
@@ -296,7 +288,6 @@
             if (ioctl(sock, SIOCGIFADDR, &tmp) != 0)
             {
                 close(sock);
-                free(buf);
                 return NULL;
             }
             
@@ -320,7 +311,6 @@
             if (ioctl(sock, SIOCGIFBRDADDR, &tmp) != 0)
             {
                 close(sock);
-                free(buf);
                 return NULL;
             }
             
@@ -341,7 +331,6 @@
             if (ioctl(sock, SIOCGIFNETMASK, &tmp) != 0)
             {
                 close(sock);
-                free(buf);
                 return NULL;
             }
             
@@ -363,12 +352,12 @@
 
         /* Create new node and insert at end of list */
 
-        node = (struct EthernetPortResource*)malloc(sizeof(struct EthernetPortResource));
+        node = (struct EthernetPortResource*)malloc(
+            sizeof(struct EthernetPortResource));
 
         if (!node)
         {
             close(sock);
-            free(buf);
             return NULL;
         }
 
@@ -386,7 +375,6 @@
         }
     }
 
-    free(buf);
     close(sock);
     return head;
 }
@@ -403,7 +391,8 @@
     }
 }
 
-#if defined(LSIF_MAIN)
+#if defined(LSIF)
+
 void PrintEtherPortResources(const struct EthernetPortResource* head)
 {
     const struct EthernetPortResource* p;
@@ -412,6 +401,7 @@
     {
         printf("EthernetPortResource\n");
         printf("{\n");
+printf("    ptr{%p}\n", p);
         printf("    name{%s}\n", p->name);
         printf("    index{%d}\n", p->index);
         printf("    mac{%s}\n", p->mac);
@@ -446,4 +436,5 @@
 
     return 0;
 }
-#endif
+
+#endif /* defined(LSIF) */

Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/lsif.mak
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/lsif.mak	2008-07-31 21:02:47 UTC (rev 806)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/lsif.mak	2008-07-31 21:34:47 UTC (rev 807)
@@ -1,2 +1,2 @@
 all:
-	gcc -o lsif -DLSIF_MAIN Resource.c common.c
+	gcc -o lsif -DLSIF Resource.c common.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (26)	Dec (13)
2007	Jan (5)	Feb (16)	Mar (5)	Apr (5)	May (13)	Jun (12)	Jul (1)	Aug (2)	Sep (13)	Oct (6)	Nov (1)	Dec (29)
2008	Jan (2)	Feb (2)	Mar (2)	Apr (57)	May (35)	Jun (45)	Jul (132)	Aug (87)	Sep (141)	Oct (86)	Nov (17)	Dec (2)
2009	Jan (3)	Feb (2)	Mar (3)	Apr (3)	May (1)	Jun	Jul	Aug (1)	Sep	Oct	Nov (1)	Dec
2010	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec

omc-commit Mailing List for OMC - Open Management with CIM (Page 15)

omc-commit — Mailing list for subversion commit activity