Changeset 1999 for pjproject/trunk

Timestamp:

Jun 9, 2008 10:07:11 AM (16 years ago)

Author:

bennylp

Message:

Related to r1996, do not return 0.0.0.0/8 class IP address in pj_gethostip() (thanks Helmut Wolf)

File:

• pjproject/trunk/pjlib/src/pj/sock_common.c (modified) (1 diff)

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

@@ -469 +469 @@
 
 
-    /* If we end up with 127.x.x.x, resolve the IP by getting the default
-     * interface to connect to some public host.
+    /* If we end up with 127.0.0.0/8 or 0.0.0.0/8, resolve the IP
+     * by getting the default interface to connect to some public host.
+     * The 0.0.0.0/8 is a special IP class that doesn't seem to be
+     * practically useful for our purpose.
      */
     if (status != PJ_SUCCESS || !pj_sockaddr_has_addr(addr) ||
-                (af==PJ_AF_INET && (pj_ntohl(addr->ipv4.sin_addr.s_addr) >> 24)==127))
+        (af==PJ_AF_INET && (pj_ntohl(addr->ipv4.sin_addr.s_addr)>>24)==127) ||
+        (af==PJ_AF_INET && (pj_ntohl(addr->ipv4.sin_addr.s_addr)>>24)==0))
     {
                 status = pj_getdefaultipinterface(af, addr);