[svn-commits] russell: branch 1.6.1 r152921 - in /branches/1.6.1: ./ channels/chan_sip.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Oct 30 14:41:29 CDT 2008
Author: russell
Date: Thu Oct 30 14:41:29 2008
New Revision: 152921
URL: http://svn.digium.com/view/asterisk?view=rev&rev=152921
Log:
Merged revisions 152920 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r152920 | russell | 2008-10-30 14:40:15 -0500 (Thu, 30 Oct 2008) | 3 lines
Fix the sip_peer reference count with respect to scheduler entries for
scheduling peer pokes, and scheduling peer poke expirations.
........
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/channels/chan_sip.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=152921&r1=152920&r2=152921
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Thu Oct 30 14:41:29 2008
@@ -3829,14 +3829,6 @@
peer->chanvars = NULL;
}
- /* If the schedule delete fails, that means the schedule is currently
- * running, which means we should wait for that thread to complete.
- * Otherwise, there's a crashable race condition.
- *
- * NOTE: once peer is refcounted, this probably is no longer necessary.
- */
- AST_SCHED_DEL(sched, peer->pokeexpire);
-
register_peer_exten(peer, FALSE);
ast_free_ha(peer->ha);
if (peer->selfdestruct)
@@ -10225,7 +10217,11 @@
struct sip_peer *peer = (struct sip_peer *)data;
peer->pokeexpire = -1;
+
sip_poke_peer(peer, 0);
+
+ unref_peer(peer, "removing poke peer ref");
+
return 0;
}
@@ -10277,7 +10273,10 @@
peer->addr.sin_port = htons(port);
if (sipsock < 0) {
/* SIP isn't up yet, so schedule a poke only, pretty soon */
- AST_SCHED_REPLACE(peer->pokeexpire, sched, ast_random() % 5000 + 1, sip_poke_peer_s, peer);
+ AST_SCHED_REPLACE_UNREF(peer->pokeexpire, sched, ast_random() % 5000 + 1, sip_poke_peer_s, peer,
+ unref_peer(_data, "removing poke peer ref"),
+ unref_peer(peer, "removing poke peer ref"),
+ ref_peer(peer, "adding poke peer ref"));
} else {
sip_poke_peer(peer, 0);
}
@@ -15940,10 +15939,12 @@
p->needdestroy = 1;
/* Try again eventually */
- AST_SCHED_REPLACE(peer->pokeexpire, sched,
- is_reachable ? peer->qualifyfreq : DEFAULT_FREQ_NOTOK,
- sip_poke_peer_s, peer);
- /* unref_peer(peer, "unref relatedpeer ptr var at end of handle_response_peerpoke"); */
+ AST_SCHED_REPLACE_UNREF(peer->pokeexpire, sched,
+ is_reachable ? peer->qualifyfreq : DEFAULT_FREQ_NOTOK,
+ sip_poke_peer_s, peer,
+ unref_peer(_data, "removing poke peer ref"),
+ unref_peer(peer, "removing poke peer ref"),
+ ref_peer(peer, "adding poke peer ref"));
}
/*! \brief Immediately stop RTP, VRTP and UDPTL as applicable */
@@ -20099,12 +20100,14 @@
struct sip_peer *peer = (struct sip_peer *)data;
peer->pokeexpire = -1;
+
if (peer->lastms > -1) {
ast_log(LOG_NOTICE, "Peer '%s' is now UNREACHABLE! Last qualify: %d\n", peer->name, peer->lastms);
manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: Unreachable\r\nTime: %d\r\n", peer->name, -1);
if (global_regextenonqualify)
register_peer_exten(peer, FALSE);
}
+
if (peer->call) {
dialog_unlink_all(peer->call, TRUE, TRUE);
peer->call = dialog_unref(peer->call, "unref dialog peer->call");
@@ -20113,9 +20116,17 @@
peer->lastms = -1;
ast_devstate_changed(AST_DEVICE_UNAVAILABLE, "SIP/%s", peer->name);
+
/* Try again quickly */
- AST_SCHED_REPLACE(peer->pokeexpire, sched,
- DEFAULT_FREQ_NOTOK, sip_poke_peer_s, peer);
+ AST_SCHED_REPLACE_UNREF(peer->pokeexpire, sched,
+ DEFAULT_FREQ_NOTOK, sip_poke_peer_s, peer,
+ unref_peer(_data, "removing poke peer ref"),
+ unref_peer(peer, "removing poke peer ref"),
+ ref_peer(peer, "adding poke peer ref"));
+
+ /* Release the ref held by the running scheduler entry */
+ unref_peer(peer, "release peer poke noanswer ref");
+
return 0;
}
@@ -20132,7 +20143,8 @@
if ((!peer->maxms && !force) || !peer->addr.sin_addr.s_addr) {
/* IF we have no IP, or this isn't to be monitored, return
immediately after clearing things out */
- AST_SCHED_DEL(sched, peer->pokeexpire);
+ AST_SCHED_DEL_UNREF(sched, peer->pokeexpire,
+ unref_peer(peer, "removing poke peer ref"));
peer->lastms = 0;
if (peer->call) {
@@ -20175,7 +20187,8 @@
build_callid_pvt(p);
ao2_t_link(dialogs, p, "Linking in under new name");
- AST_SCHED_DEL(sched, peer->pokeexpire);
+ AST_SCHED_DEL_UNREF(sched, peer->pokeexpire,
+ unref_peer(peer, "removing poke peer ref"));
if (p->relatedpeer)
p->relatedpeer = unref_peer(p->relatedpeer,"unsetting the relatedpeer field in the dialog, before it is set to something else.");
@@ -20191,7 +20204,10 @@
if (xmitres == XMIT_ERROR) {
sip_poke_noanswer(peer); /* Immediately unreachable, network problems */
} else if (!force) {
- AST_SCHED_REPLACE(peer->pokeexpire, sched, peer->maxms * 2, sip_poke_noanswer, peer);
+ AST_SCHED_REPLACE_UNREF(peer->pokeexpire, sched, peer->maxms * 2, sip_poke_noanswer, peer,
+ unref_peer(_data, "removing poke peer ref"),
+ unref_peer(peer, "removing poke peer ref"),
+ ref_peer(peer, "adding poke peer ref"));
}
dialog_unref(p, "unref dialog at end of sip_poke_peer, obtained from sip_alloc, just before it goes out of scope");
return 0;
@@ -22629,7 +22645,10 @@
while ((peer = ao2_t_iterator_next(&i, "iterate thru peers table"))) {
ao2_lock(peer);
ms += 100;
- AST_SCHED_REPLACE(peer->pokeexpire, sched, ms, sip_poke_peer_s, peer);
+ AST_SCHED_REPLACE_UNREF(peer->pokeexpire, sched, ms, sip_poke_peer_s, peer,
+ unref_peer(_data, "removing poke peer ref"),
+ unref_peer(peer, "removing poke peer ref"),
+ ref_peer(peer, "adding poke peer ref"));
ao2_unlock(peer);
unref_peer(peer, "toss iterator peer ptr");
}
More information about the svn-commits
mailing list