diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2017-04-03 12:13:47 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2017-04-03 12:18:23 -0400 |
| commit | 4c80e203b1f722cf4469866ace34c7734391a0b2 (patch) | |
| tree | 9a34d078a7434a37f5861fa9f751e5c3717ba8ba | |
| parent | d71a633089fd0756860afae34bee62f0d2da8303 (diff) | |
| download | libnice-4c80e203b1f722cf4469866ace34c7734391a0b2.tar.gz | |
candidate: Test against possible type
There was a confusion and it tested against a value not in the enum.
| -rw-r--r-- | agent/candidate.c | 6 | ||||
| -rw-r--r-- | tests/test-priority.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/agent/candidate.c b/agent/candidate.c index 68c7714..27966ef 100644 --- a/agent/candidate.c +++ b/agent/candidate.c @@ -191,21 +191,21 @@ nice_candidate_ice_local_preference (const NiceCandidate *candidate) { case NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE: if (candidate->type == NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE || - candidate->type == NICE_CANDIDATE_TYPE_PREF_NAT_ASSISTED) + candidate->type == NICE_CANDIDATE_TYPE_HOST) direction_preference = 4; else direction_preference = 6; break; case NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE: if (candidate->type == NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE || - candidate->type == NICE_CANDIDATE_TYPE_PREF_NAT_ASSISTED) + candidate->type == NICE_CANDIDATE_TYPE_HOST) direction_preference = 2; else direction_preference = 4; break; case NICE_CANDIDATE_TRANSPORT_TCP_SO: if (candidate->type == NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE || - candidate->type == NICE_CANDIDATE_TYPE_PREF_NAT_ASSISTED) + candidate->type == NICE_CANDIDATE_TYPE_HOST) direction_preference = 6; else direction_preference = 2; diff --git a/tests/test-priority.c b/tests/test-priority.c index 1700dd0..5862123 100644 --- a/tests/test-priority.c +++ b/tests/test-priority.c @@ -61,11 +61,11 @@ main (void) g_assert_cmpuint (nice_candidate_ice_priority (candidate, TRUE, FALSE), ==, 0x3C0001FF); /* Host tcp-active unreliable */ candidate->transport = NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE; - g_assert_cmpuint (nice_candidate_ice_priority (candidate, FALSE, FALSE) & 0xFFE000FF, ==, 0x3CC000FF); + g_assert_cmpuint (nice_candidate_ice_priority (candidate, FALSE, FALSE) & 0xFFE000FF, ==, 0x3C8000FF); /* Host tcp-active reliable */ candidate->transport = NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE; /* Host tcp-active reliable */ - g_assert_cmpuint (nice_candidate_ice_priority (candidate, TRUE, FALSE) & 0xFFE000FF, ==, 0x78C000FF); + g_assert_cmpuint (nice_candidate_ice_priority (candidate, TRUE, FALSE) & 0xFFE000FF, ==, 0x788000FF); /* srv-reflexive tcp-active reliable */ candidate->type = NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE; candidate->transport = NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE; |