Changeset 4355 for pjproject/trunk/pjlib/src/pj/ip_helper_generic.c

Timestamp:

Feb 19, 2013 4:27:37 PM (12 years ago)

Author:

bennylp

Message:

More #1613: fixed bugs in the 'fixes' above:

• the socket was closed when ioctl() is called
• the 'iff' structure was not initialized

File:

• pjproject/trunk/pjlib/src/pj/ip_helper_generic.c (modified) (3 diffs)

pjproject/trunk/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;
+        struct ifreq iff = *itf;
         struct sockaddr *ad = &itf->ifr_addr;
         
@@ -228 +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