Changeset 3896 for pjproject/branches/1.x/pjlib-util/src/pjlib-util/stun_simple_client.c

Timestamp:

Dec 5, 2011 2:12:38 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1418 (Library restart fails with PJLIB_UTIL_ESTUNNOTRESPOND error after several times) due to bug in calling pj_sock_select(). Thanks Régis Montoya for the report and testing the fix

File:

• pjproject/branches/1.x/pjlib-util/src/pjlib-util/stun_simple_client.c (modified) (4 diffs)

pjproject/branches/1.x/pjlib-util/src/pjlib-util/stun_simple_client.c

@@ -20 +20 @@
 #include <pjlib-util/stun_simple.h>
 #include <pjlib-util/errno.h>
+#include <pj/compat/socket.h>
 #include <pj/log.h>
 #include <pj/os.h>
@@ -45 +46 @@
     unsigned srv_cnt;
     pj_sockaddr_in srv_addr[2];
-    int i, j, send_cnt = 0;
+    int i, j, send_cnt = 0, nfds;
     pj_pool_t *pool;
     struct query_rec {
@@ -114 +115 @@
     TRACE_((THIS_FILE, "  Done initialization."));
 
+#if defined(PJ_SELECT_NEEDS_NFDS) && PJ_SELECT_NEEDS_NFDS!=0
+    nfds = -1;
+    for (i=0; i<sock_cnt; ++i) {
+        if (sock[i] > nfds) {
+            nfds = sock[i];
+        }
+    }
+#else
+    nfds = FD_SETSIZE-1;
+#endif
+
     /* Main retransmission loop. */
     for (send_cnt=0; send_cnt<MAX_REQUEST; ++send_cnt) {
@@ -170 +182 @@
             }
 
-            select_rc = pj_sock_select(PJ_IOQUEUE_MAX_HANDLES, &r, NULL, NULL, &timeout);
+            select_rc = pj_sock_select(nfds+1, &r, NULL, NULL, &timeout);
             TRACE_((THIS_FILE, "  select() rc=%d", select_rc));
             if (select_rc < 1)