Changeset 1503 for pjproject/trunk

Timestamp:

Oct 16, 2007 2:10:58 PM (17 years ago)

Author:

bennylp

Message:

Tolerate more ICMP errors in ICE media transport

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (4 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -26 +26 @@
 #include <pj/rand.h>
 #include <pj/string.h>
+#include <pj/compat/socket.h>
 
 
@@ -441 +442 @@
     pj_ice_strans *ice_st = comp->ice_st;
     pj_ssize_t pkt_size;
-    enum { RETRY = 4 };
+    enum { RETRY = 10 };
     unsigned retry;
     pj_status_t status;
@@ -516 +517 @@
 
     /* Read next packet */
-    for (retry=0; retry<RETRY; ++retry) {
+    for (retry=0; retry<RETRY;) {
         pkt_size = sizeof(comp->pkt);
         comp->src_addr_len = sizeof(comp->src_addr);
@@ -522 +523 @@
                                      PJ_IOQUEUE_ALWAYS_ASYNC,
                                      &comp->src_addr, &comp->src_addr_len);
-        if (status != PJ_SUCCESS && status != PJ_EPENDING) {
+        if (status == PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK) ||
+            status == PJ_STATUS_FROM_OS(OSERR_EINPROGRESS) || 
+            status == PJ_STATUS_FROM_OS(OSERR_ECONNRESET))
+        {
+            ice_st_perror(comp->ice_st, "ioqueue recvfrom() error", status);
+            ++retry;
+            continue;
+        } else if (status != PJ_SUCCESS && status != PJ_EPENDING) {
+            retry += 2;
             ice_st_perror(comp->ice_st, "ioqueue recvfrom() error", status);
         } else {