Fix chan_local build, update SIP
authorMark Spencer <markster@digium.com>
Sun, 6 Apr 2003 04:23:18 +0000 (04:23 +0000)
committerMark Spencer <markster@digium.com>
Sun, 6 Apr 2003 04:23:18 +0000 (04:23 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@754 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_local.c
channels/chan_sip.c

index ddad32a..44af9fc 100755 (executable)
@@ -115,7 +115,6 @@ static int local_write(struct ast_channel *ast, struct ast_frame *f)
 {
        struct local_pvt *p = ast->pvt->pvt;
        int res = -1;
-       ast_pthread_mutex_lock(&p->lock);
        int isoutbound = IS_OUTBOUND(ast, p);
 
        /* Just queue for delivery to the other side */
index c8c25f0..e57460c 100755 (executable)
@@ -900,7 +900,7 @@ static int sip_hangup(struct ast_channel *ast)
                                p->needdestroy = 0;
                                sip_scheddestroy(p, 15000);
                        } else
-                               transmit_response_reliable(p, "480 Temporarily Unavailable", &p->initreq);
+                               transmit_response_reliable(p, "403 Forbidden", &p->initreq);
                } else {
                        /* Send a hangup */
                        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);
                        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);
                p->alreadygone = 1;
                if (p->rtp) {