diff options
author | Joshua Colp <jcolp@digium.com> | 2015-01-15 12:10:22 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2015-01-15 12:10:22 +0000 |
commit | 1e605d950bfe7c7b20fd72bdcfca41bbcbfc7470 (patch) | |
tree | 1500117187164d3a939fe4c525d721d119731f03 /res/res_pjsip_outbound_registration.c | |
parent | f11fb7620540518192bb180c12e6d5b5d5d034a7 (diff) |
res_pjsip_outbound_registration: Fix race condition when reloading and listing registrations.
Due to the split of outbound registration state from configuration it is possible during
a reload for a "pjsip show registrations" CLI command to be executed which gets an older
snapshot of the configuration. This configuration may include outbound registrations which
have been removed due to a reload operation occurring at the same time. The code for
printing the outbound registration did not take this into account but now it does.
AST-1506 #close
Review: https://reviewboard.asterisk.org/r/4338/
........
Merged revisions 430664 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_outbound_registration.c')
-rw-r--r-- | res/res_pjsip_outbound_registration.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c index 3a01a9426..167bf7f3d 100644 --- a/res/res_pjsip_outbound_registration.c +++ b/res/res_pjsip_outbound_registration.c @@ -1503,6 +1503,10 @@ static int cli_print_body(void *obj, void *arg, int flags) ast_assert(context->output_buffer != NULL); + if (!state) { + return 0; + } + ast_str_append(&context->output_buffer, 0, " %-s/%-*.*s %-16s %-16s\n", id, (int) (REGISTRATION_URI_FIELD_LEN - strlen(id)), |