kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 03:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjsip outbound registration: Log message says received a 408 when we didn't

Browse Source 
If the server didn't exist that we are trying to register to the log message
would say that a 408 was received from that server when in reality one wasn't.
Added log messages stating no response was received if the response does not
exist.

(closes issue ASTERISK-22554)
Reported by: Rusty Newton
Review: https://reviewboard.asterisk.org/r/2893/
........

Merged revisions 400890 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400891 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin Harwell
2013-10-14 15:54:06 +00:00
parent fd4919e466
commit 61b60fab2d
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
res/res_pjsip_outbound_registration.c
View File

@@ -372,6 +372,23 @@ static int sip_outbound_registration_is_temporal(unsigned int code,
} }
} }
static void schedule_retry(struct registration_response *response, unsigned int interval,
const char *server_uri, const char *client_uri)
{
response->client_state->status = SIP_REGISTRATION_REJECTED_TEMPORARY;
schedule_registration(response->client_state, interval);
if (response->rdata) {
ast_log(LOG_WARNING, "Temporal response '%d' received from '%s' on "
"registration attempt to '%s', retrying in '%d'\n",
response->code, server_uri, client_uri, interval);
} else {
ast_log(LOG_WARNING, "No response received from '%s' on "
"registration attempt to '%s', retrying in '%d'\n",
server_uri, client_uri, interval);
}
}
/*! \brief Callback function for handling a response to a registration attempt */ /*! \brief Callback function for handling a response to a registration attempt */
static int handle_registration_response(void *data) static int handle_registration_response(void *data)
{ {
@@ -408,10 +425,7 @@ static int handle_registration_response(void *data)
schedule_registration(response->client_state, response->expiration - REREGISTER_BUFFER_TIME); schedule_registration(response->client_state, response->expiration - REREGISTER_BUFFER_TIME);
} else if (response->retry_after) { } else if (response->retry_after) {
/* If we have been instructed to retry after a period of time, schedule it as such */ /* If we have been instructed to retry after a period of time, schedule it as such */
response->client_state->status = SIP_REGISTRATION_REJECTED_TEMPORARY; schedule_retry(response, response->retry_after, server_uri, client_uri);
schedule_registration(response->client_state, response->retry_after);
ast_log(LOG_WARNING, "Temporal response '%d' received from '%s' on registration attempt to '%s', instructed to retry in '%d'\n",
response->code, server_uri, client_uri, response->retry_after);
} else if (response->client_state->retry_interval && sip_outbound_registration_is_temporal(response->code, response->client_state)) { } else if (response->client_state->retry_interval && sip_outbound_registration_is_temporal(response->code, response->client_state)) {
if (response->client_state->retries == response->client_state->max_retries) { if (response->client_state->retries == response->client_state->max_retries) {
/* If we received enough temporal responses to exceed our maximum give up permanently */ /* If we received enough temporal responses to exceed our maximum give up permanently */
@@ -420,11 +434,8 @@ static int handle_registration_response(void *data)
server_uri, client_uri); server_uri, client_uri);
} else { } else {
/* On the other hand if we can still try some more do so */ /* On the other hand if we can still try some more do so */
response->client_state->status = SIP_REGISTRATION_REJECTED_TEMPORARY;
response->client_state->retries++; response->client_state->retries++;
schedule_registration(response->client_state, response->client_state->retry_interval); schedule_retry(response, response->client_state->retry_interval, server_uri, client_uri);
ast_log(LOG_WARNING, "Temporal response '%d' received from '%s' on registration attempt to '%s', retrying in '%d' seconds\n",
response->code, server_uri, client_uri, response->client_state->retry_interval);
} }
} else { } else {
if (response->code == 403 if (response->code == 403
@@ -439,8 +450,12 @@ static int handle_registration_response(void *data)
} else { } else {
/* Finally if there's no hope of registering give up */ /* Finally if there's no hope of registering give up */
response->client_state->status = SIP_REGISTRATION_REJECTED_PERMANENT; response->client_state->status = SIP_REGISTRATION_REJECTED_PERMANENT;
if (response->rdata) {
ast_log(LOG_WARNING, "Fatal response '%d' received from '%s' on registration attempt to '%s', stopping outbound registration\n", ast_log(LOG_WARNING, "Fatal response '%d' received from '%s' on registration attempt to '%s', stopping outbound registration\n",
response->code, server_uri, client_uri); response->code, server_uri, client_uri);
} else {
ast_log(LOG_WARNING, "Fatal registration attempt to '%s', stopping outbound registration\n", client_uri);
}
} }
} }