Changeset 2785 for pjproject

Timestamp:

Jun 23, 2009 12:08:20 PM (15 years ago)

Author:

bennylp

Message:

Ticket #894: fixed failed pjnath ice test due to too many network adapter installed in the host

File:

• pjproject/trunk/pjnath/src/pjnath-test/ice_test.c (modified) (5 diffs)

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

@@ -513 +513 @@
     if (rc != PJ_SUCCESS) {
         destroy_sess(sess, 500);
-        if (rc == PJ_ETOOMANY) {
-            /* Ignore this, probably the host has too many interfaces */
-            PJ_LOG(3,("", "    The previous error was ignored"));
-            return 0;
-        }
         return -120;
     }
@@ -678 +673 @@
             goto on_return;
 
-        cfg.ua1.comp_cnt = 4;
-        cfg.ua2.comp_cnt = 4;
-        rc = perform_test("Basic with host candidates, 4 components", 
+        cfg.ua1.comp_cnt = 2;
+        cfg.ua2.comp_cnt = 2;
+        rc = perform_test("Basic with host candidates, 2 components", 
                           &stun_cfg, cfg.server_flag, 
                           &cfg.ua1, &cfg.ua2);
@@ -703 +698 @@
             goto on_return;
 
-        cfg.ua1.comp_cnt = 4;
-        cfg.ua2.comp_cnt = 4;
-
-        rc = perform_test("Basic with srflx candidates, 4 components", 
+        cfg.ua1.comp_cnt = 2;
+        cfg.ua2.comp_cnt = 2;
+
+        rc = perform_test("Basic with srflx candidates, 2 components", 
                           &stun_cfg, cfg.server_flag, 
                           &cfg.ua1, &cfg.ua2);
@@ -729 +724 @@
             goto on_return;
 
-        cfg.ua1.comp_cnt = 4;
-        cfg.ua2.comp_cnt = 4;
-
-        rc = perform_test("Basic with relay candidates, 4 components", 
+        cfg.ua1.comp_cnt = 2;
+        cfg.ua2.comp_cnt = 2;
+
+        rc = perform_test("Basic with relay candidates, 2 components", 
                           &stun_cfg, cfg.server_flag, 
                           &cfg.ua1, &cfg.ua2);
@@ -772 +767 @@
             0xFFFF,
             /*  Role    comp#   host?   stun?   turn?   flag?  ans_del snd_del des_del */
-            {ROLE1,     4,       NO,    NO,     YES, WRONG_TURN,    0,      0,      0, {PJ_STATUS_FROM_STUN_CODE(401), -1}},
-            {ROLE2,     4,       NO,    NO,     YES, WRONG_TURN,    0,      0,      0, {PJ_STATUS_FROM_STUN_CODE(401), -1}}
+            {ROLE1,     2,       NO,    NO,     YES, WRONG_TURN,    0,      0,      0, {PJ_STATUS_FROM_STUN_CODE(401), -1}},
+            {ROLE2,     2,       NO,    NO,     YES, WRONG_TURN,    0,      0,      0, {PJ_STATUS_FROM_STUN_CODE(401), -1}}
         };