]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
The assertion that peer was not found on final event
authorScott Griepentrog <sgriepentrog@digium.com>
Fri, 29 Aug 2014 19:05:47 +0000 (19:05 +0000)
committerScott Griepentrog <sgriepentrog@digium.com>
Fri, 29 Aug 2014 19:05:47 +0000 (19:05 +0000)
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

channels/chan_sip.c

index 7a522e81768033e53330284941a21cd9c1254674..4a2ff08a9434731184c6d9a74e6d454c631bc42f 100644 (file)
@@ -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;
        }