Changeset 5388

Timestamp:

Jul 18, 2016 11:02:02 AM (8 years ago)

Author:

nanang

Message:

Misc (re #1928): Fixed possible stuck issue in pjnath-test caused by blocking recvfrom() upon concurrent socket events.

Location:

pjproject/trunk/pjnath/src/pjnath-test

Files:

• concur_test.c (modified) (1 diff)
• test.c (modified) (2 diffs)
• test.h (modified) (1 diff)

pjproject/trunk/pjnath/src/pjnath-test/concur_test.c

@@ -264 +264 @@
     pj_assert(status == PJ_SUCCESS);
 
+    /* Set socket to nonblocking to avoid stuck in recv/recvfrom() on concurrent events */
+    app_set_sock_nb(test_sess.server_sock);
+
     addr_len = sizeof(bind_addr);
     status = pj_sock_getsockname(test_sess.server_sock, &bind_addr, &addr_len);

pjproject/trunk/pjnath/src/pjnath-test/test.c

@@ -20 +20 @@
 #include "test.h"
 #include <pjlib.h>
+#include <pj/compat/socket.h>
 
 void app_perror(const char *msg, pj_status_t rc)
@@ -29 +30 @@
     pj_strerror(rc, errbuf, sizeof(errbuf));
     PJ_LOG(1,("test", "%s: [pj_status_t=%d] %s", msg, rc, errbuf));
+}
+
+/* Set socket to nonblocking. */
+void app_set_sock_nb(pj_sock_t sock)
+{
+#if defined(PJ_WIN32) && PJ_WIN32!=0 || \
+    defined(PJ_WIN64) && PJ_WIN64 != 0 || \
+    defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE!=0
+    u_long value = 1;
+    ioctlsocket(sock, FIONBIO, &value);
+#else
+    pj_uint32_t value = 1;
+    ioctl(sock, FIONBIO, &value);
+#endif
 }
 

pjproject/trunk/pjnath/src/pjnath-test/test.h

@@ -45 +45 @@
 
 extern void app_perror(const char *title, pj_status_t rc);
+extern void app_set_sock_nb(pj_sock_t sock);
 extern pj_pool_factory *mem;