From 3b3b82b6b6a93f67af0818bed2e3fff232d9107f Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Mon, 8 Jun 2015 08:39:42 +0200 Subject: [PATCH 2/2] conncheck: rename priv_process_response_check_for_peer_reflexive() Renamed the function to priv_process_response_check_for_reflexive() because it now checks also for server reflexive candidates. Updated the documentation to indicate that the function never returns NULL. --- agent/conncheck.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/conncheck.c b/agent/conncheck.c index 5a669c1..5af3219 100644 --- a/agent/conncheck.c +++ b/agent/conncheck.c @@ -2269,9 +2269,9 @@ static void priv_check_for_role_conflict (NiceAgent *agent, gboolean control) * @param socketptr socket used to send the reply * @param mapped_sockaddr mapped address in the response * - * @return pointer to a new pair if one was created, otherwise NULL + * @return pointer to a candidate pair, found in conncheck list or newly created */ -static CandidateCheckPair *priv_process_response_check_for_peer_reflexive(NiceAgent *agent, Stream *stream, Component *component, CandidateCheckPair *p, NiceSocket *sockptr, struct sockaddr *mapped_sockaddr, NiceCandidate *local_candidate, NiceCandidate *remote_candidate) +static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *agent, Stream *stream, Component *component, CandidateCheckPair *p, NiceSocket *sockptr, struct sockaddr *mapped_sockaddr, NiceCandidate *local_candidate, NiceCandidate *remote_candidate) { CandidateCheckPair *new_pair = NULL; NiceAddress mapped; @@ -2410,7 +2410,7 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, Stream * " conncheck %p SUCCEEDED.", agent, p); priv_conn_check_unfreeze_related (agent, stream, p); } else { - ok_pair = priv_process_response_check_for_peer_reflexive (agent, + ok_pair = priv_process_response_check_for_reflexive (agent, stream, component, p, sockptr, &sockaddr.addr, local_candidate, remote_candidate); } -- 2.1.4