Changeset 1996

Timestamp:

Jun 7, 2008 11:14:32 AM (16 years ago)

Author:

bennylp

Message:

Ignore 0.0.0.0/8 class IP address in interface enumeration function since this doesnt seem to have practical use for us (thanks Helmut Wolf)

Location:

pjproject/trunk/pjlib/src/pj

Files:

• ip_helper_generic.c (modified) (5 diffs)
• ip_helper_win32.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pj/ip_helper_generic.c

@@ -97 +97 @@
         }
 
+        /* Ignore 0.0.0.0/8 address. This is a special address
+         * which doesn't seem to have practical use.
+         */
+        if (af==pj_AF_INET() &&
+            (pj_ntohl(((pj_sockaddr_in*)ad)->sin_addr.s_addr) >> 24) == 0)
+        {
+            TRACE_((THIS_FILE, "  address %s ignored (0.0.0.0/8 class)", 
+                    get_addr(ad), ad->sa_family));
+            continue;
+        }
+
         TRACE_((THIS_FILE, "  address %s (af=%d) added at index %d", 
                 get_addr(ad), ad->sa_family, *p_cnt));
@@ -178 +189 @@
         }
 
+        /* Ignore 0.0.0.0/8 address. This is a special address
+         * which doesn't seem to have practical use.
+         */
+        if (af==pj_AF_INET() &&
+            (pj_ntohl(((pj_sockaddr_in*)ad)->sin_addr.s_addr) >> 24) == 0)
+        {
+            TRACE_((THIS_FILE, "  address %s ignored (0.0.0.0/8 class)", 
+                    get_addr(ad), ad->sa_family));
+            continue;
+        }
+
         TRACE_((THIS_FILE, "  address %s (af=%d) added at index %d", 
                 get_addr(ad), ad->sa_family, *p_cnt));
@@ -215 +237 @@
     *p_cnt = 0;
     for (i=0; if_list[i].if_index && *p_cnt<max_count; ++i) {
+        struct sockaddr *ad;
         int rc;
 
@@ -244 +267 @@
         }
 
-        if (ifreq.ifr_addr.sa_family != af) {
+        ad = (struct sockaddr*) &ifreq.ifr_addr;
+
+        if (ad->sa_family != af) {
             TRACE_((THIS_FILE, "  address %s family %d ignored", 
                                get_addr(&ifreq.ifr_addr),
@@ -251 +276 @@
         }
 
+        /* Ignore 0.0.0.0/8 address. This is a special address
+         * which doesn't seem to have practical use.
+         */
+        if (af==pj_AF_INET() &&
+            (pj_ntohl(((pj_sockaddr_in*)ad)->sin_addr.s_addr) >> 24) == 0)
+        {
+            TRACE_((THIS_FILE, "  address %s ignored (0.0.0.0/8 class)", 
+                    get_addr(ad), ad->sa_family));
+            continue;
+        }
+
         /* Got an address ! */
         TRACE_((THIS_FILE, "  address %s (af=%d) added at index %d", 
-                get_addr(&ifreq.ifr_addr), ifreq.ifr_addr.sa_family, *p_cnt));
+                get_addr(ad), ad->sa_family, *p_cnt));
 
         pj_bzero(&ifs[*p_cnt], sizeof(ifs[0]));
-        pj_memcpy(&ifs[*p_cnt], &ifreq.ifr_addr, 
-                  pj_sockaddr_get_len(&ifreq.ifr_addr));
+        pj_memcpy(&ifs[*p_cnt], ad, pj_sockaddr_get_len(ad));
         (*p_cnt)++;
     }

pjproject/trunk/pjlib/src/pj/ip_helper_win32.c

@@ -205 +205 @@
             continue;
 
+        /* Ignore 0.0.0.0/8 address. This is a special address
+         * which doesn't seem to have practical use.
+         */
+        if ((pj_ntohl(pTab->table[i].dwAddr) >> 24) == 0)
+            continue;
+
 #if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
         /* Investigate the type of this interface */