diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2019-01-22 18:15:28 -0500 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2019-01-22 18:48:24 -0500 |
| commit | df5b9e64c224f61a53133d4aec34069f88d45068 (patch) | |
| tree | 23c012866cd474abaf7ad10e068c9dd23969be18 | |
| parent | 2e044ea100d7c831e50851402acbd495bacb8043 (diff) | |
| download | libnice-df5b9e64c224f61a53133d4aec34069f88d45068.tar.gz | |
turn: Replace magic numbers with define
| -rw-r--r-- | agent/conncheck.c | 8 | ||||
| -rw-r--r-- | socket/udp-turn.c | 30 |
2 files changed, 20 insertions, 18 deletions
diff --git a/agent/conncheck.c b/agent/conncheck.c index b3093e0..ff912f7 100644 --- a/agent/conncheck.c +++ b/agent/conncheck.c @@ -3674,8 +3674,8 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage * STUN_MESSAGE_RETURN_SUCCESS && recv_realm != NULL && recv_realm_len > 0) { - if (code == 438 || - (code == 401 && + if (code == STUN_ERROR_STALE_NONCE || + (code == STUN_ERROR_UNAUTHORIZED && !(recv_realm_len == sent_realm_len && sent_realm != NULL && memcmp (sent_realm, recv_realm, sent_realm_len) == 0))) { @@ -3764,8 +3764,8 @@ static gboolean priv_map_reply_to_relay_refresh (NiceAgent *agent, StunMessage * STUN_MESSAGE_RETURN_SUCCESS && recv_realm != NULL && recv_realm_len > 0) { - if (code == 438 || - (code == 401 && + if (code == STUN_ERROR_STALE_NONCE || + (code == STUN_ERROR_UNAUTHORIZED && !(recv_realm_len == sent_realm_len && sent_realm != NULL && memcmp (sent_realm, recv_realm, sent_realm_len) == 0))) { diff --git a/socket/udp-turn.c b/socket/udp-turn.c index c3b152d..b665edc 100644 --- a/socket/udp-turn.c +++ b/socket/udp-turn.c @@ -1451,13 +1451,14 @@ nice_udp_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock, /* check for unauthorized error response */ if (stun_message_find_error (&msg, &code) == STUN_MESSAGE_RETURN_SUCCESS && - (code == 438 || (code == 401 && - !(recv_realm != NULL && - recv_realm_len > 0 && - recv_realm_len == sent_realm_len && - sent_realm != NULL && - memcmp (sent_realm, recv_realm, - sent_realm_len) == 0)))) { + (code == STUN_ERROR_STALE_NONCE || + (code == STUN_ERROR_UNAUTHORIZED && + !(recv_realm != NULL && + recv_realm_len > 0 && + recv_realm_len == sent_realm_len && + sent_realm != NULL && + memcmp (sent_realm, recv_realm, + sent_realm_len) == 0)))) { g_free (priv->current_binding_msg); priv->current_binding_msg = NULL; @@ -1552,13 +1553,14 @@ nice_udp_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock, /* check for unauthorized error response */ if (stun_message_find_error (&msg, &code) == STUN_MESSAGE_RETURN_SUCCESS && - (code == 438 || (code == 401 && - !(recv_realm != NULL && - recv_realm_len > 0 && - recv_realm_len == sent_realm_len && - sent_realm != NULL && - memcmp (sent_realm, recv_realm, - sent_realm_len) == 0)))) { + (code == STUN_ERROR_STALE_NONCE || + (code == STUN_ERROR_UNAUTHORIZED && + !(recv_realm != NULL && + recv_realm_len > 0 && + recv_realm_len == sent_realm_len && + sent_realm != NULL && + memcmp (sent_realm, recv_realm, + sent_realm_len) == 0)))) { priv->pending_permissions = g_list_delete_link ( priv->pending_permissions, i); |