sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor mgcp debuggin changes, sip deadlock improvement 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer 2003-12-09 00:02:06 +00:00
parent 0f2bdc6d0a
commit 1451a407ac
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_mgcp.c
View File

@ -1060,13 +1060,16 @@ static struct mgcp_subchannel *find_subchannel(char *name, int msgid, struct soc
}
p = g->endpoints;
while(p) {
ast_log(LOG_DEBUG, "Searching on %s@%s for subchannel\n", p->name, g->name);
if (option_debug)
ast_log(LOG_DEBUG, "Searching on %s@%s for subchannel\n", p->name, g->name);
if (msgid) {
sub = p->sub;
do {
ast_log(LOG_DEBUG, "Searching on %s@%s-%d for subchannel with lastout: %d\n", p->name, g->name, sub->id, msgid);
if (option_debug)
ast_log(LOG_DEBUG, "Searching on %s@%s-%d for subchannel with lastout: %d\n", p->name, g->name, sub->id, msgid);
if (sub->lastout == msgid) {
ast_log(LOG_DEBUG, "Found subchannel sub%d to handle request %d sub->lastout: %d\n", sub->id, msgid, sub->lastout);
if (option_debug)
ast_log(LOG_DEBUG, "Found subchannel sub%d to handle request %d sub->lastout: %d\n", sub->id, msgid, sub->lastout);
found = 1;
break;
}

2
channels/chan_sip.c
View File

@ -463,7 +463,7 @@ static int retrans_pkt(void *data)
} else {
ast_log(LOG_WARNING, "Maximum retries exceeded on call %s for seqno %d (%s)\n", pkt->owner->callid, pkt->seqno, pkt->resp ? "Response" : "Request");
pkt->retransid = -1;
while(pkt->owner->owner && ast_mutex_lock(&pkt->owner->owner->lock)) {
while(pkt->owner->owner && ast_mutex_trylock(&pkt->owner->owner->lock)) {
ast_mutex_unlock(&pkt->owner->lock);
usleep(1);
ast_mutex_lock(&pkt->owner->lock);