diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2014-03-21 16:04:09 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2014-03-21 16:04:09 +0000 |
| commit | 236d17362d3f82504773fc73592a1b7b9544267e (patch) | |
| tree | af8c74a3ee7c78d54c99fd800f18607f3b00bdae /res/res_pjsip_registrar.c | |
| parent | b44d324891b5d7a823b537777ca4fb00230e44dc (diff) | |
res_pjsip_registrar.c: Miscellaneous cleanup in rx_task().
* Fix variable shadowing of 'updated' by renaming it to 'contact_update'.
* Checked 'contact_update' for ast_sorcery_copy() failure.
* Removed silly use of RAII_VAR() for 'contact_update'.
........
Merged revisions 410995 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410996 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_registrar.c')
| -rw-r--r-- | res/res_pjsip_registrar.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c index 5f020873b..2eada0748 100644 --- a/res/res_pjsip_registrar.c +++ b/res/res_pjsip_registrar.c @@ -518,18 +518,26 @@ static int rx_task(void *data) expiration, user_agent); } else if (expiration) { - RAII_VAR(struct ast_sip_contact *, updated, ast_sorcery_copy(ast_sip_get_sorcery(), contact), ao2_cleanup); - updated->expiration_time = ast_tvadd(ast_tvnow(), ast_samp2tv(expiration, 1)); - updated->qualify_frequency = task_data->aor->qualify_frequency; - updated->authenticate_qualify = task_data->aor->authenticate_qualify; + struct ast_sip_contact *contact_update; + + contact_update = ast_sorcery_copy(ast_sip_get_sorcery(), contact); + if (!contact_update) { + ast_log(LOG_ERROR, "Failed to update contact '%s' expiration time to %d seconds.\n", + contact->uri, expiration); + continue; + } + + contact_update->expiration_time = ast_tvadd(ast_tvnow(), ast_samp2tv(expiration, 1)); + contact_update->qualify_frequency = task_data->aor->qualify_frequency; + contact_update->authenticate_qualify = task_data->aor->authenticate_qualify; if (path_str) { - ast_string_field_set(updated, path, ast_str_buffer(path_str)); + ast_string_field_set(contact_update, path, ast_str_buffer(path_str)); } if (user_agent) { - ast_string_field_set(updated, user_agent, user_agent); + ast_string_field_set(contact_update, user_agent, user_agent); } - ast_sip_location_update_contact(updated); + ast_sip_location_update_contact(contact_update); ast_debug(3, "Refreshed contact '%s' on AOR '%s' with new expiration of %d seconds\n", contact_uri, aor_name, expiration); ast_test_suite_event_notify("AOR_CONTACT_REFRESHED", @@ -540,7 +548,8 @@ static int rx_task(void *data) contact_uri, aor_name, expiration, - updated->user_agent); + contact_update->user_agent); + ao2_cleanup(contact_update); } else { /* We want to report the user agent that was actually in the removed contact */ user_agent = ast_strdupa(contact->user_agent); |