Changeset 1869 for pjproject/trunk/pjnath/src/pjnath/turn_udp.c

Timestamp:

Mar 14, 2008 5:56:11 PM (14 years ago)

Author:

bennylp

Message:

More ticket #485: initial test on TURN client/server

File:

• pjproject/trunk/pjnath/src/pjnath/turn_udp.c (modified) (5 diffs)

pjproject/trunk/pjnath/src/pjnath/turn_udp.c

@@ -20 +20 @@
 #include <pj/assert.h>
 #include <pj/errno.h>
+#include <pj/log.h>
 #include <pj/pool.h>
 #include <pj/ioqueue.h>
@@ -113 +114 @@
     }
 
+    /* Bind to any */
+    pj_sockaddr_init(af, &udp_rel->src_addr, NULL, 0);
+    status = pj_sock_bind(udp_rel->sock, &udp_rel->src_addr, 
+                          pj_sockaddr_get_len(&udp_rel->src_addr));
+    if (status != PJ_SUCCESS) {
+        pj_turn_udp_destroy(udp_rel);
+        return status;
+    }
+
     /* Register to ioqeuue */
     pj_bzero(&ioq_cb, sizeof(ioq_cb));
@@ -256 +266 @@
                              pj_ssize_t bytes_read)
 {
+    enum { MAX_RETRY = 10 };
     pj_turn_udp *udp_rel;
+    int retry = 0;
     pj_status_t status;
 
@@ -271 +283 @@
         bytes_read = sizeof(udp_rel->pkt);
         udp_rel->src_addr_len = sizeof(udp_rel->src_addr);
-
         status = pj_ioqueue_recvfrom(udp_rel->key, op_key,
                                      udp_rel->pkt, &bytes_read, 0,
@@ -277 +288 @@
                                      &udp_rel->src_addr_len);
 
-        if (status != PJ_EPENDING && status != PJ_SUCCESS)
+        if (status != PJ_EPENDING && status != PJ_SUCCESS) {
+            char errmsg[PJ_ERR_MSG_SIZE];
+
+            pj_strerror(status, errmsg, sizeof(errmsg));
+            PJ_LOG(4,(udp_rel->pool->obj_name,
+                      "ioqueue recvfrom error: %s", errmsg));
+
             bytes_read = -status;
-
-    } while (status != PJ_EPENDING && status != PJ_ECANCELLED);
+        }
+
+    } while (status != PJ_EPENDING && status != PJ_ECANCELLED &&
+             ++retry < MAX_RETRY);
 
 }