[prev in list] [next in list] [prev in thread] [next in thread] 

List:       asterisk-commits
Subject:    [asterisk-commits] sgriepentrog: branch 13 r422359 - /branches/13/channels/chan_sip.c
From:       SVN commits to the Asterisk project <asterisk-commits () lists ! digium ! com>
Date:       2014-08-29 19:05:51
Message-ID: mailman.18485.1409339113.1102.asterisk-commits () lists ! digium ! com
[Download RAW message or body]

Author: sgriepentrog
Date: Fri Aug 29 14:05:47 2014
New Revision: 422359

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=422359
Log:
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


Modified:
    branches/13/channels/chan_sip.c

Modified: branches/13/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/channels/chan_sip.c?view=diff&rev=422359&r1=422358&r2=422359
 ==============================================================================
--- branches/13/channels/chan_sip.c (original)
+++ branches/13/channels/chan_sip.c Fri Aug 29 14:05:47 2014
@@ -16650,7 +16650,10 @@
 	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;
 	}


-- 
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-commits mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-commits


[prev in list] [next in list] [prev in thread] [next in thread]