diff options
| author | Youness Alaoui <kakaroto@kakaroto.(none)> | 2008-10-22 18:28:22 -0400 |
|---|---|---|
| committer | Youness Alaoui <kakaroto@kakaroto.(none)> | 2008-10-22 18:28:22 -0400 |
| commit | 286b812000722ea510d3c47eca7d430273f53823 (patch) | |
| tree | 6a920e3a6c05a1cfac4958add8b77d3ad2fb3108 /agent | |
| parent | be03b19f018dfda38086a51dcd56e04ebd0a2f3f (diff) | |
| download | libnice-286b812000722ea510d3c47eca7d430273f53823.tar.gz | |
Update test-fullmode to work with the new set_relay_info API
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/test-fullmode.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/agent/test-fullmode.c b/agent/test-fullmode.c index 2ecc7d3..83ec4d2 100644 --- a/agent/test-fullmode.c +++ b/agent/test-fullmode.c @@ -68,11 +68,13 @@ #define TURN_PORT TSORG_PORT #define TURN_USER TSORG_USER #define TURN_PASS TSORG_PASS +#define TURN_TYPE NICE_RELAY_TYPE_UDP #else #define TURN_IP NUMB_IP #define TURN_PORT NUMB_PORT #define TURN_USER NUMB_USER #define TURN_PASS NUMB_PASS +#define TURN_TYPE NICE_RELAY_TYPE_UDP #endif @@ -284,13 +286,13 @@ static int run_full_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *bas g_assert (rs_id > 0); #if USE_TURN nice_agent_set_relay_info(lagent, ls_id, 1, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); nice_agent_set_relay_info(lagent, ls_id, 2, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); nice_agent_set_relay_info(ragent, rs_id, 1, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); nice_agent_set_relay_info(ragent, rs_id, 2, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); #endif @@ -426,13 +428,13 @@ static int run_full_test_delayed_answer (NiceAgent *lagent, NiceAgent *ragent, N g_assert (rs_id > 0); #if USE_TURN nice_agent_set_relay_info(lagent, ls_id, 1, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); nice_agent_set_relay_info(lagent, ls_id, 2, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); nice_agent_set_relay_info(ragent, rs_id, 1, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); nice_agent_set_relay_info(ragent, rs_id, 2, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); #endif @@ -585,9 +587,9 @@ static int run_full_test_wrong_password (NiceAgent *lagent, NiceAgent *ragent, N g_assert (rs_id > 0); #if USE_TURN nice_agent_set_relay_info(lagent, ls_id, 1, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); nice_agent_set_relay_info(ragent, rs_id, 1, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); #endif nice_agent_gather_candidates (lagent, ls_id); @@ -705,9 +707,9 @@ static int run_full_test_control_conflict (NiceAgent *lagent, NiceAgent *ragent, g_assert (rs_id > 0); #if USE_TURN nice_agent_set_relay_info(lagent, ls_id, 1, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); nice_agent_set_relay_info(ragent, rs_id, 1, - TURN_IP, TURN_PORT, TURN_USER, TURN_PASS); + TURN_IP, TURN_PORT, TURN_USER, TURN_PASS, TURN_TYPE); #endif nice_agent_gather_candidates (lagent, ls_id); @@ -825,7 +827,7 @@ int main (void) nice_agent_add_local_address (lagent, &baseaddr); nice_agent_add_local_address (ragent, &baseaddr); #else - if (!nice_address_set_from_string (&baseaddr, "192.168.1.106")) + if (!nice_address_set_from_string (&baseaddr, "192.168.1.110")) g_assert_not_reached (); nice_agent_add_local_address (lagent, &baseaddr); nice_agent_add_local_address (ragent, &baseaddr); |