kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

When poking a peer after registration, release lock temporarily

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1916 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-01-10 19:53:14 +00:00
parent 2d8a1765eb
commit 5a0ef67644
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
channels/chan_iax2.c
View File

@@ -3509,7 +3509,7 @@ static int expire_registry(void *data)
} }
static int iax2_poke_peer(struct iax2_peer *peer); static int iax2_poke_peer(struct iax2_peer *peer, int heldcall);
static void reg_source_db(struct iax2_peer *p) static void reg_source_db(struct iax2_peer *p)
{ {
@@ -3529,7 +3529,7 @@ static void reg_source_db(struct iax2_peer *p)
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Seeding '%s' at %s:%d for %d\n", p->name, ast_verbose(VERBOSE_PREFIX_3 "Seeding '%s' at %s:%d for %d\n", p->name,
inet_ntoa(in), atoi(c), atoi(d)); inet_ntoa(in), atoi(c), atoi(d));
iax2_poke_peer(p); iax2_poke_peer(p, 0);
p->expirey = atoi(d); p->expirey = atoi(d);
memset(&p->addr, 0, sizeof(p->addr)); memset(&p->addr, 0, sizeof(p->addr));
p->addr.sin_family = AF_INET; p->addr.sin_family = AF_INET;
@@ -3580,7 +3580,7 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno)
/* Update the host */ /* Update the host */
memcpy(&p->addr, sin, sizeof(p->addr)); memcpy(&p->addr, sin, sizeof(p->addr));
/* Verify that the host is really there */ /* Verify that the host is really there */
iax2_poke_peer(p); iax2_poke_peer(p, callno);
} }
/* Setup the expirey */ /* Setup the expirey */
if (p->expire > -1) if (p->expire > -1)
@@ -3754,7 +3754,7 @@ static int iax2_poke_peer_s(void *data)
{ {
struct iax2_peer *peer = data; struct iax2_peer *peer = data;
peer->pokeexpire = -1; peer->pokeexpire = -1;
iax2_poke_peer(peer); iax2_poke_peer(peer, 0);
return 0; return 0;
} }
@@ -4896,7 +4896,7 @@ static int iax2_poke_noanswer(void *data)
return 0; return 0;
} }
static int iax2_poke_peer(struct iax2_peer *peer) static int iax2_poke_peer(struct iax2_peer *peer, int heldcall)
{ {
if (!peer->maxms || !peer->addr.sin_addr.s_addr) { if (!peer->maxms || !peer->addr.sin_addr.s_addr) {
/* IF we have no IP, or this isn't to be monitored, return /* IF we have no IP, or this isn't to be monitored, return
@@ -4910,7 +4910,11 @@ static int iax2_poke_peer(struct iax2_peer *peer)
ast_log(LOG_NOTICE, "Still have a callno...\n"); ast_log(LOG_NOTICE, "Still have a callno...\n");
iax2_destroy(peer->callno); iax2_destroy(peer->callno);
} }
if (heldcall)
ast_mutex_unlock(&iaxsl[heldcall]);
peer->callno = find_callno(0, 0, &peer->addr, NEW_FORCE, 0); peer->callno = find_callno(0, 0, &peer->addr, NEW_FORCE, 0);
if (heldcall)
ast_mutex_lock(&iaxsl[heldcall]);
if (peer->callno < 1) { if (peer->callno < 1) {
ast_log(LOG_WARNING, "Unable to allocate call for poking peer '%s'\n", peer->name); ast_log(LOG_WARNING, "Unable to allocate call for poking peer '%s'\n", peer->name);
return -1; return -1;
@@ -5627,7 +5631,7 @@ static int reload_config(void)
/* Qualify hosts, too */ /* Qualify hosts, too */
ast_mutex_lock(&peerl.lock); ast_mutex_lock(&peerl.lock);
for (peer = peerl.peers; peer; peer = peer->next) for (peer = peerl.peers; peer; peer = peer->next)
iax2_poke_peer(peer); iax2_poke_peer(peer, 0);
ast_mutex_unlock(&peerl.lock); ast_mutex_unlock(&peerl.lock);
return 0; return 0;
} }
@@ -6113,7 +6117,7 @@ int load_module(void)
iax2_do_register(reg); iax2_do_register(reg);
ast_mutex_lock(&peerl.lock); ast_mutex_lock(&peerl.lock);
for (peer = peerl.peers; peer; peer = peer->next) for (peer = peerl.peers; peer; peer = peer->next)
iax2_poke_peer(peer); iax2_poke_peer(peer, 0);
ast_mutex_unlock(&peerl.lock); ast_mutex_unlock(&peerl.lock);
return res; return res;
} }