dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Fix trailing slash problem (Zap) and making sure refers get ignored the second tiem around. 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2712 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2004-04-19 22:55:35 +00:00
parent fd1adbae30
commit 9fd3419500
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
channels/chan_sip.c
View File

@ -5528,29 +5528,31 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
transmit_response_with_allow(p, "484 Address Incomplete", req);
else {
transmit_response(p, "202 Accepted", req);
if (p->refer_call) {
ast_log(LOG_DEBUG,"202 Accepted (supervised)\n");
attempt_transfer(p, p->refer_call);
ast_mutex_unlock(&p->refer_call->lock);
p->refer_call = NULL;
p->gotrefer = 1;
} else {
ast_log(LOG_DEBUG,"202 Accepted (blind)\n");
c = p->owner;
if (c) {
transfer_to = c->bridge;
if (transfer_to) {
ast_moh_stop(transfer_to);
ast_async_goto(transfer_to,p->context, p->refer_to,1);
} else {
ast_queue_hangup(p->owner);
if (!ignore) {
if (p->refer_call) {
ast_log(LOG_DEBUG,"202 Accepted (supervised)\n");
attempt_transfer(p, p->refer_call);
ast_mutex_unlock(&p->refer_call->lock);
p->refer_call = NULL;
p->gotrefer = 1;
} else {
ast_log(LOG_DEBUG,"202 Accepted (blind)\n");
c = p->owner;
if (c) {
transfer_to = c->bridge;
if (transfer_to) {
ast_moh_stop(transfer_to);
ast_async_goto(transfer_to,p->context, p->refer_to,1);
} else {
ast_queue_hangup(p->owner);
}
}
p->gotrefer = 1;
}
p->gotrefer = 1;
/* Always increment on a BYE */
transmit_request_with_auth(p, "BYE", 0, 1, 1);
p->alreadygone = 1;
}
/* Always increment on a BYE */
transmit_request_with_auth(p, "BYE", 0, 1, 1);
p->alreadygone = 1;
}
} else if (!strcasecmp(cmd, "CANCEL")) {
check_via(p, req);

2
channels/chan_zap.c
View File

@ -1509,7 +1509,7 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
if (c)
c++;
else
c = dest;
c = "";
if (strlen(c) < p->stripmsd) {
ast_log(LOG_WARNING, "Number '%s' is shorter than stripmsd (%d)\n", c, p->stripmsd);
return -1;