[asterisk-commits] bebuild: tag 1.8.21.0-rc2 r383972 - in /tags/1.8.21.0-rc2: ./ channels/

[SVN commits to the Asterisk project]

Author: bebuild
Date: Wed Mar 27 09:15:39 2013
New Revision: 383972

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383972
Log:
Merge r383863 for ASTERISK-21068

Modified:
    tags/1.8.21.0-rc2/   (props changed)
    tags/1.8.21.0-rc2/channels/chan_sip.c

Propchange: tags/1.8.21.0-rc2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 27 09:15:39 2013
@@ -1,1 +1,1 @@
-/branches/1.8:381281,383839
+/branches/1.8:381281,383839,383863

Modified: tags/1.8.21.0-rc2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.21.0-rc2/channels/chan_sip.c?view=diff&rev=383972&r1=383971&r2=383972
==============================================================================
--- tags/1.8.21.0-rc2/channels/chan_sip.c (original)
+++ tags/1.8.21.0-rc2/channels/chan_sip.c Wed Mar 27 09:15:39 2013
@@ -14667,7 +14667,9 @@
 		ast_verbose(VERBOSE_PREFIX_3 "Registered SIP '%s' at %s\n", peer->name,
 				ast_sockaddr_stringify(&peer->addr));
 	}
+	sip_pvt_unlock(pvt);
 	sip_poke_peer(peer, 0);
+	sip_pvt_lock(pvt);
 	register_peer_exten(peer, 1);
 	
 	/* Save User agent */
@@ -15455,7 +15457,9 @@
 	}
 	if (!res) {
 		if (send_mwi) {
+			sip_pvt_unlock(p);
 			sip_send_mwi_to_peer(peer, 0);
+			sip_pvt_lock(p);
 		} else {
 			update_peer_lastmsgssent(peer, -1, 0);
 		}
@@ -26932,6 +26936,9 @@
 \note	This is done with 60 seconds between each ping,
 	unless forced by cli or manager. If peer is unreachable,
 	we check every 10th second by default.
+\note Do *not* hold a pvt lock while calling this function.
+	This function calls sip_alloc, which can cause a deadlock
+	if another sip_pvt is held.
 */
 static int sip_poke_peer(struct sip_peer *peer, int force)
 {