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

Fix 302 Redirects on SIP

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-03-30 20:46:30 +00:00
parent 0e170f8f81
commit a987ef1163
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
channels/chan_sip.c
View File

@@ -343,26 +343,31 @@ static int retrans_pkt(void *data)
struct sip_pkt *pkt=data; struct sip_pkt *pkt=data;
int res = 0; int res = 0;
ast_pthread_mutex_lock(&pkt->owner->lock); ast_pthread_mutex_lock(&pkt->owner->lock);
if (pkt->retrans < MAX_RETRANS) { if (!pkt->owner->needdestroy) {
pkt->retrans++; if (pkt->retrans < MAX_RETRANS) {
if (sipdebug) { pkt->retrans++;
if (pkt->owner->nat) if (sipdebug) {
ast_verbose("Retransmitting #%d (NAT):\n%s\n to %s:%d\n", pkt->retrans, pkt->data, inet_ntoa(pkt->owner->recv.sin_addr), ntohs(pkt->owner->recv.sin_port)); if (pkt->owner->nat)
else ast_verbose("Retransmitting #%d (NAT):\n%s\n to %s:%d\n", pkt->retrans, pkt->data, inet_ntoa(pkt->owner->recv.sin_addr), ntohs(pkt->owner->recv.sin_port));
ast_verbose("Retransmitting #%d (no NAT):\n%s\n to %s:%d\n", pkt->retrans, pkt->data, inet_ntoa(pkt->owner->sa.sin_addr), ntohs(pkt->owner->sa.sin_port)); else
} ast_verbose("Retransmitting #%d (no NAT):\n%s\n to %s:%d\n", pkt->retrans, pkt->data, inet_ntoa(pkt->owner->sa.sin_addr), ntohs(pkt->owner->sa.sin_port));
__sip_xmit(pkt->owner, pkt->data, pkt->packetlen); }
res = 1; __sip_xmit(pkt->owner, pkt->data, pkt->packetlen);
} else { res = 1;
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;
if (pkt->owner->owner) {
/* XXX Potential deadlocK?? XXX */
ast_queue_hangup(pkt->owner->owner, 1);
} else { } else {
/* If no owner, destroy now */ ast_log(LOG_WARNING, "Maximum retries exceeded on call %s for seqno %d (%s)\n", pkt->owner->callid, pkt->seqno, pkt->resp ? "Response" : "Request");
sip_destroy(pkt->owner); pkt->retransid = -1;
if (pkt->owner->owner) {
/* XXX Potential deadlocK?? XXX */
ast_queue_hangup(pkt->owner->owner, 1);
} else {
/* If no owner, destroy now */
sip_destroy(pkt->owner);
}
} }
} else {
/* Don't bother retransmitting. It's about to be killed anyway */
pkt->retransid = -1;
} }
ast_pthread_mutex_unlock(&pkt->owner->lock); ast_pthread_mutex_unlock(&pkt->owner->lock);
return res; return res;
@@ -3204,7 +3209,7 @@ static void parse_moved_contact(struct sip_pvt *p, struct sip_request *req)
char tmp[256] = ""; char tmp[256] = "";
char *s, *e; char *s, *e;
strncpy(tmp, get_header(req, "Contact"), sizeof(tmp) - 1); strncpy(tmp, get_header(req, "Contact"), sizeof(tmp) - 1);
s = tmp; s = ditch_braces(tmp);
e = strchr(tmp, '@'); e = strchr(tmp, '@');
if (e) if (e)
*e = '\0'; *e = '\0';
@@ -3377,7 +3382,7 @@ retrylock:
*/ */
break; break;
default: default:
if ((resp >= 400) && (resp < 700)) { if ((resp >= 300) && (resp < 700)) {
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Got SIP response %d \"%s\" back from %s\n", resp, rest, inet_ntoa(p->sa.sin_addr)); ast_verbose(VERBOSE_PREFIX_3 "Got SIP response %d \"%s\" back from %s\n", resp, rest, inet_ntoa(p->sa.sin_addr));
p->alreadygone = 1; p->alreadygone = 1;