summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Griepentrog <sgriepentrog@digium.com>2014-08-29 18:46:19 +0000
committerScott Griepentrog <sgriepentrog@digium.com>2014-08-29 18:46:19 +0000
commit2df2d785b7a49a7116ec57570c69f283e3c5015f (patch)
tree565825961b50279c825390f24a4f433d7c81d934
parent3194892ea2ce0ffc0d420648455223efd7af14a1 (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/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@422358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-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 8b96f5886..43630fbe0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16656,7 +16656,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;
}