Changeset 4403 for pjproject/branches/1.x/pjlib/src/pj/ip_helper_generic.c

Timestamp:

Feb 27, 2013 2:43:38 PM (12 years ago)

Author:

riza

Message:

Re #1613: backported to 1.x

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjlib/src/pj/ip_helper_generic.c (modified) (5 diffs)

pjproject/branches/1.x/pjlib/src/pj/ip_helper_generic.c

@@ -166 +166 @@
     }
 
-    /* Done with socket */
-    pj_sock_close(sock);
-
     /* Interface interfaces */
     ifr = (struct ifreq*) ifc.ifc_req;
@@ -178 +175 @@
     for (i=0; i<count; ++i) {
         struct ifreq *itf = &ifr[i];
+        struct ifreq iff = *itf;
         struct sockaddr *ad = &itf->ifr_addr;
         
@@ -189 +187 @@
         }
 
-        if ((itf->ifr_flags & IFF_UP)==0) {
+        if (ioctl(sock, SIOCGIFFLAGS, &iff) != 0) {
+            TRACE_((THIS_FILE, "  ioctl(SIOCGIFFLAGS) failed: %s",
+                    get_os_errmsg()));
+            continue;   /* Failed to get flags, continue */
+        }
+
+        if ((iff.ifr_flags & IFF_UP)==0) {
             TRACE_((THIS_FILE, "  interface is down"));
             continue; /* Skip when interface is down */
@@ -195 +199 @@
 
 #if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
-        if (itf->ifr_flags & IFF_LOOPBACK) {
+        if (iff.ifr_flags & IFF_LOOPBACK) {
             TRACE_((THIS_FILE, "  loopback interface"));
             continue; /* Skip loopback interface */
@@ -221 +225 @@
     }
 
+    /* Done with socket */
+    pj_sock_close(sock);
+
     TRACE_((THIS_FILE, "done, found %d address(es)", *p_cnt));
     return (*p_cnt != 0) ? PJ_SUCCESS : PJ_ENOTFOUND;
 }
+
 
 #elif defined(PJ_HAS_NET_IF_H) && PJ_HAS_NET_IF_H != 0