[svn-commits] jpeeler: branch 1.4 r294688 - /branches/1.4/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Thu Nov 11 15:12:27 2010
New Revision: 294688

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294688
Log:
Fix problem with qualify option packets for realtime peers never stopping.

The option packets not only never stopped, but if a realtime peer was not in
the peer list multiple options dialogs could accumulate over time. This
scenario has the potential to progress to the point of saturating a link just
from options packets. The fix was to ensure that the poke scheduler checks to
see if a peer is in the peer list before continuing to poke. The reason a peer
must be in the peer list to be able to properly manage an options dialog is
because otherwise the call pointer is lost when the peer is regenerated from
the database, which is how existing qualify dialogs are detected.

(closes issue #16382)
Reported by: lftsy
Patches: 
      bug16382-3.patch uploaded by jpeeler (license 325)
Tested by: zerohalo


Modified:
    branches/1.4/channels/chan_sip.c

Modified: branches/1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=294688&r1=294687&r2=294688
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Thu Nov 11 15:12:27 2010
@@ -8617,11 +8617,22 @@
 static int sip_poke_peer_s(const void *data)
 {
 	struct sip_peer *peer = (struct sip_peer *) data;
+	struct sip_peer *foundpeer;
 
 	peer->pokeexpire = -1;
 
+	foundpeer = ASTOBJ_CONTAINER_FIND(&peerl, peer->name);
+	if (!foundpeer) {
+		ASTOBJ_UNREF(peer, sip_destroy_peer);
+		return 0;
+	} else if (foundpeer->name != peer->name) {
+		ASTOBJ_UNREF(foundpeer, sip_destroy_peer);
+		ASTOBJ_UNREF(peer, sip_destroy_peer);
+		return 0;
+	}
+
+	ASTOBJ_UNREF(foundpeer, sip_destroy_peer);
 	sip_poke_peer(peer);
-
 	ASTOBJ_UNREF(peer, sip_destroy_peer);
 
 	return 0;
@@ -19764,6 +19775,18 @@
 {
 	reload_config(reason);
 
+	/* before peers are removed from the peer container, cancel any scheduled pokes */
+	ASTOBJ_CONTAINER_TRAVERSE(&peerl, 1, do {
+		ASTOBJ_RDLOCK(iterator);
+		if (ast_test_flag(&iterator->flags[0], SIP_REALTIME)) {
+			if (!AST_SCHED_DEL(sched, iterator->pokeexpire)) {
+				struct sip_peer *peer_ptr = iterator;
+				ASTOBJ_UNREF(peer_ptr, sip_destroy_peer);
+			}
+		}
+		ASTOBJ_UNLOCK(iterator);
+	} while (0) );
+
 	/* Prune peers who still are supposed to be deleted */
 	ASTOBJ_CONTAINER_PRUNE_MARKED(&peerl, sip_destroy_peer);
 	if (option_debug > 3)