diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-06-23 12:08:20 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-06-23 12:08:20 +0000 |
| commit | ae3e7402f1a741ef292308b41b301dea3e4369c2 (patch) | |
| tree | bc1f10c2e8c1c434374f50955c713a192c012963 | |
| parent | a26cd37ae53979d9b52a693356097a866aa94eb7 (diff) | |
Ticket #894: fixed failed pjnath ice test due to too many network adapter installed in the host
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2785 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjnath/src/pjnath-test/ice_test.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/pjnath/src/pjnath-test/ice_test.c b/pjnath/src/pjnath-test/ice_test.c index 6053d442..237a8f23 100644 --- a/pjnath/src/pjnath-test/ice_test.c +++ b/pjnath/src/pjnath-test/ice_test.c @@ -512,11 +512,6 @@ static int perform_test(const char *title, rc = start_ice(&sess->callee, &sess->caller); 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; } @@ -677,9 +672,9 @@ int ice_test(void) if (rc != 0) 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); if (rc != 0) @@ -702,10 +697,10 @@ int ice_test(void) if (rc != 0) goto on_return; - cfg.ua1.comp_cnt = 4; - cfg.ua2.comp_cnt = 4; + cfg.ua1.comp_cnt = 2; + cfg.ua2.comp_cnt = 2; - rc = perform_test("Basic with srflx candidates, 4 components", + rc = perform_test("Basic with srflx candidates, 2 components", &stun_cfg, cfg.server_flag, &cfg.ua1, &cfg.ua2); if (rc != 0) @@ -728,10 +723,10 @@ int ice_test(void) if (rc != 0) goto on_return; - cfg.ua1.comp_cnt = 4; - cfg.ua2.comp_cnt = 4; + cfg.ua1.comp_cnt = 2; + cfg.ua2.comp_cnt = 2; - rc = perform_test("Basic with relay candidates, 4 components", + rc = perform_test("Basic with relay candidates, 2 components", &stun_cfg, cfg.server_flag, &cfg.ua1, &cfg.ua2); if (rc != 0) @@ -771,8 +766,8 @@ int ice_test(void) "TURN allocation failure", 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}} }; rc = perform_test(cfg.title, &stun_cfg, cfg.server_flag, |