Changeset 1288

Timestamp:

May 22, 2007 9:11:10 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #285: ICE transport stops receiving packet upon getting ICMP unreach on Windows

Location:

pjproject/trunk/pjnath/src

Files:

• pjnath-test/ice_test.c (modified) (3 diffs)
• pjnath-test/test.c (modified) (1 diff)
• pjnath/ice_strans.c (modified) (2 diffs)

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

@@ -293 +293 @@
     /* Start ICE on im2 */
     status = start_ice(im2, im1);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        app_perror("   error starting ICE", status);
         return -30;
+    }
 
     /* Start ICE on im1 */
@@ -329 +331 @@
         data_from_answerer = pj_str("from answerer");
         status = pj_ice_sess_send_data(im2->ice, 1, data_from_answerer.ptr, data_from_answerer.slen);
-        if (status != PJ_SUCCESS)
+        if (status != PJ_SUCCESS) {
+            app_perror("   error sending packet", status);
             return -48;
+        }
 
         /* Poll to allow data to be received */
@@ -477 +481 @@
 
     /* Failure case (all checks fail) */
+#if 0
+    /* Cannot just add an SRFLX candidate; it needs a base */
     rc = perform_ice_test("Failure case (all checks fail)", PJ_FALSE, 1, PJ_FALSE, D3, D3, 1, ocand, 1, acand);
     if (rc != 0)
         goto on_return;
+#endif
 
     /* Direct communication with invalid address */

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

@@ -65 +65 @@
     pj_caching_pool_init( &caching_pool, &pj_pool_factory_default_policy, 0 );
 
+    pjnath_init();
+
 #if INCLUDE_ICE_TEST
     DO_TEST(ice_test());

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

@@ -441 +441 @@
     pj_ice_strans *ice_st = comp->ice_st;
     pj_ssize_t pkt_size;
+    enum { RETRY = 4 };
+    unsigned retry;
     pj_status_t status;
 
@@ -512 +514 @@
 
     /* Read next packet */
-    pkt_size = sizeof(comp->pkt);
-    comp->src_addr_len = sizeof(comp->src_addr);
-    status = pj_ioqueue_recvfrom(key, op_key, comp->pkt, &pkt_size, 
-                                 PJ_IOQUEUE_ALWAYS_ASYNC,
-                                 &comp->src_addr, &comp->src_addr_len);
-    if (status != PJ_SUCCESS && status != PJ_EPENDING) {
-        ice_st_perror(comp->ice_st, "ioqueue recvfrom() error", status);
+    for (retry=0; retry<RETRY; ++retry) {
+        pkt_size = sizeof(comp->pkt);
+        comp->src_addr_len = sizeof(comp->src_addr);
+        status = pj_ioqueue_recvfrom(key, op_key, comp->pkt, &pkt_size, 
+                                     PJ_IOQUEUE_ALWAYS_ASYNC,
+                                     &comp->src_addr, &comp->src_addr_len);
+        if (status != PJ_SUCCESS && status != PJ_EPENDING) {
+            ice_st_perror(comp->ice_st, "ioqueue recvfrom() error", status);
+        } else {
+            break;
+        }
     }
 }