summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorScott Griepentrog <sgriepentrog@digium.com>2014-08-29 19:05:47 +0000
committerScott Griepentrog <sgriepentrog@digium.com>2014-08-29 19:05:47 +0000
commitbd99a96b21f7c0822122252b211a84dfe3d5bb34 (patch)
treeefa0290a8b456174dfd1e9ed4b9a8301d42f2262 /channels
parented4c696319ea64628e75daa26f2e2b786c456d1a (diff)
The assertion that peer was not found on final event
message was being triggered on configuration reload. This patch changes that case to just return instead. Review: https://reviewboard.asterisk.org/r/3953/ Commited in trunk revision 422358 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@422359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7a522e817..4a2ff08a9 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16650,7 +16650,10 @@ static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct
struct sip_peer *peer = sip_find_peer(peer_name, NULL, TRUE, FINDALLDEVICES, FALSE, 0);
if (stasis_subscription_final_message(sub, msg)) {
- ast_assert(peer == NULL);
+ if (peer) {
+ /* configuration reloaded */
+ return;
+ }
ast_free(peer_name);
return;
}