Changeset 2112 for pjproject

Timestamp:

Jul 7, 2008 9:31:02 PM (16 years ago)

Author:

bennylp

Message:

Configuration option to include/exclude loopback interface in enum_ip_interface(), and always include loopback address in the proxy sample (thanks Filippo Zangheri for the suggestion)

Location:

pjproject/trunk

Files:

• pjlib/include/pj/config.h (modified) (1 diff)
• pjlib/src/pj/ip_helper_generic.c (modified) (3 diffs)
• pjlib/src/pj/ip_helper_win32.c (modified) (1 diff)
• pjsip-apps/src/samples/proxy.h (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/config.h

@@ -600 +600 @@
 #       endif
 #   endif
+#endif
+
+
+/**
+ * Specify whether #pj_enum_ip_interface() function should exclude
+ * loopback interfaces.
+ *
+ * Default: 1
+ */
+#ifndef PJ_IP_HELPER_IGNORE_LOOPBACK_IF
+#   define PJ_IP_HELPER_IGNORE_LOOPBACK_IF      1
 #endif
 

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

@@ -86 +86 @@
         }
 
+#if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
         if (it->ifa_flags & IFF_LOOPBACK) {
             TRACE_((THIS_FILE, "  loopback interface"));
             continue; /* Skip loopback interface */
         }
+#endif
 
         if (ad==NULL) {
             TRACE_((THIS_FILE, "  NULL address ignored"));
-            continue; /* reported to happen on Linux 2.6.25.9 */
+            continue; /* reported to happen on Linux 2.6.25.9 
+                         with ppp interface */
         }
 
@@ -189 +192 @@
         }
 
+#if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
         if (itf->ifr_flags & IFF_LOOPBACK) {
             TRACE_((THIS_FILE, "  loopback interface"));
             continue; /* Skip loopback interface */
         }
+#endif
 
         /* Ignore 0.0.0.0/8 address. This is a special address
@@ -260 +265 @@
         }
 
+#if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
         if (ifreq.ifr_flags & IFF_LOOPBACK) {
             TRACE_((THIS_FILE, "  loopback interface"));
             continue; /* Skip loopback interface */
         }
+#endif
 
         /* Note: SIOCGIFADDR does not work for IPv6! */

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

@@ -41 +41 @@
 #include <pj/string.h>
 
-#ifndef PJ_IP_HELPER_IGNORE_LOOPBACK_IF
-#   define PJ_IP_HELPER_IGNORE_LOOPBACK_IF      1
-#endif
-
 typedef DWORD (WINAPI *PFN_GetIpAddrTable)(PMIB_IPADDRTABLE pIpAddrTable, 
                                            PULONG pdwSize, 

pjproject/trunk/pjsip-apps/src/samples/proxy.h

@@ -272 +272 @@
     }
 
-    /* No need to add this, this should have been added above.
+    /* Add loopback address. */
+#if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
     global.name[global.name_cnt].host = pj_str("127.0.0.1");
     global.name[global.name_cnt].port = global.port;
     global.name_cnt++;
-    */
+#endif
 
     global.name[global.name_cnt].host = *pj_gethostname();