From: Scott Griepentrog <sgriepentrog@digium.com>
Date: Fri, 29 Aug 2014 19:05:47 +0000 (+0000)
Subject: The assertion that peer was not found on final event
X-Git-Tag: 13.0.0-beta2~2^2~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd99a96b21f7c0822122252b211a84dfe3d5bb34;p=thirdparty%2Fasterisk.git

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
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7a522e8176..4a2ff08a94 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;
 	}