kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 08:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix chan_local build, update SIP

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@754 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-04-06 04:23:18 +00:00
parent 9f8cab83a3
commit c35b05dd30
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
channels/chan_local.c
View File

@@ -115,7 +115,6 @@ static int local_write(struct ast_channel *ast, struct ast_frame *f)
{ {
struct local_pvt *p = ast->pvt->pvt; struct local_pvt *p = ast->pvt->pvt;
int res = -1; int res = -1;
ast_pthread_mutex_lock(&p->lock);
int isoutbound = IS_OUTBOUND(ast, p); int isoutbound = IS_OUTBOUND(ast, p);
/* Just queue for delivery to the other side */ /* Just queue for delivery to the other side */

14
channels/chan_sip.c
View File

@@ -900,7 +900,7 @@ static int sip_hangup(struct ast_channel *ast)
p->needdestroy = 0; p->needdestroy = 0;
sip_scheddestroy(p, 15000); sip_scheddestroy(p, 15000);
} else } else
transmit_response_reliable(p, "480 Temporarily Unavailable", &p->initreq); transmit_response_reliable(p, "403 Forbidden", &p->initreq);
} else { } else {
/* Send a hangup */ /* Send a hangup */
transmit_request(p, "BYE", 1, 1); transmit_request(p, "BYE", 1, 1);
@@ -3996,7 +3996,17 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
transmit_request(p, "BYE", 1, 1); transmit_request(p, "BYE", 1, 1);
p->alreadygone = 1; p->alreadygone = 1;
} }
} else if (!strcasecmp(cmd, "CANCEL") || !strcasecmp(cmd, "BYE")) { } else if (!strcasecmp(cmd, "CANCEL")) {
p->alreadygone = 1;
if (p->rtp) {
/* Immediately stop RTP */
ast_rtp_stop(p->rtp);
}
if (p->owner)
ast_queue_hangup(p->owner, 0);
transmit_response(p, "200 OK", req);
transmit_response_reliable(p, "487 Request Terminated", &p->initreq);
} else if (!strcasecmp(cmd, "BYE")) {
copy_request(&p->initreq, req); copy_request(&p->initreq, req);
p->alreadygone = 1; p->alreadygone = 1;
if (p->rtp) { if (p->rtp) {