kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 05:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #6820 - Possible fix (already implemented in trunk)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@35058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2006-06-20 10:27:44 +00:00
parent 43ad959914
commit e5505d1baf
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
channels/chan_sip.c
View File

@@ -9591,14 +9591,16 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru
switch (resp) { switch (resp) {
case 100: /* Trying */ case 100: /* Trying */
sip_cancel_destroy(p); if (!ignore)
sip_cancel_destroy(p);
/* must call check_pendings before setting CAN_BYE, so that /* must call check_pendings before setting CAN_BYE, so that
if PENDINGBYE is set it will know to send CANCEL instead */ if PENDINGBYE is set it will know to send CANCEL instead */
check_pendings(p); check_pendings(p);
ast_set_flag(p, SIP_CAN_BYE); ast_set_flag(p, SIP_CAN_BYE);
break; break;
case 180: /* 180 Ringing */ case 180: /* 180 Ringing */
sip_cancel_destroy(p); if (!ignore)
sip_cancel_destroy(p);
if (!ignore && p->owner) { if (!ignore && p->owner) {
ast_queue_control(p->owner, AST_CONTROL_RINGING); ast_queue_control(p->owner, AST_CONTROL_RINGING);
if (p->owner->_state != AST_STATE_UP) if (p->owner->_state != AST_STATE_UP)
@@ -9617,7 +9619,8 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru
ast_set_flag(p, SIP_CAN_BYE); ast_set_flag(p, SIP_CAN_BYE);
break; break;
case 183: /* Session progress */ case 183: /* Session progress */
sip_cancel_destroy(p); if (!ignore)
sip_cancel_destroy(p);
/* Ignore 183 Session progress without SDP */ /* Ignore 183 Session progress without SDP */
if (find_sdp(req)) { if (find_sdp(req)) {
process_sdp(p, req); process_sdp(p, req);
@@ -9632,7 +9635,8 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru
ast_set_flag(p, SIP_CAN_BYE); ast_set_flag(p, SIP_CAN_BYE);
break; break;
case 200: /* 200 OK on invite - someone's answering our call */ case 200: /* 200 OK on invite - someone's answering our call */
sip_cancel_destroy(p); if (!ignore)
sip_cancel_destroy(p);
p->authtries = 0; p->authtries = 0;
if (find_sdp(req)) { if (find_sdp(req)) {
process_sdp(p, req); process_sdp(p, req);
@@ -10090,7 +10094,8 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_
ast_set_flag(p, SIP_NEEDDESTROY); ast_set_flag(p, SIP_NEEDDESTROY);
} else if ((resp >= 100) && (resp < 200)) { } else if ((resp >= 100) && (resp < 200)) {
if (sipmethod == SIP_INVITE) { if (sipmethod == SIP_INVITE) {
sip_cancel_destroy(p); if (!ignore)
sip_cancel_destroy(p);
if (find_sdp(req)) if (find_sdp(req))
process_sdp(p, req); process_sdp(p, req);
if (p->owner) { if (p->owner) {
@@ -10150,9 +10155,9 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_
break; break;
default: /* Errors without handlers */ default: /* Errors without handlers */
if ((resp >= 100) && (resp < 200)) { if ((resp >= 100) && (resp < 200)) {
if (sipmethod == SIP_INVITE) { /* re-invite */ if (sipmethod == SIP_INVITE && !ignore) /* re-invite */
sip_cancel_destroy(p); sip_cancel_destroy(p);
}
} }
if ((resp >= 300) && (resp < 700)) { if ((resp >= 300) && (resp < 700)) {
if ((option_verbose > 2) && (resp != 487)) if ((option_verbose > 2) && (resp != 487))
@@ -10163,7 +10168,7 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_
case 500: /* Server error */ case 500: /* Server error */
case 503: /* Service Unavailable */ case 503: /* Service Unavailable */
if (sipmethod == SIP_INVITE) { /* re-invite failed */ if (sipmethod == SIP_INVITE && !ignore) { /* re-invite failed */
sip_cancel_destroy(p); sip_cancel_destroy(p);
} }
break; break;
@@ -11329,7 +11334,7 @@ retrylock:
if (recordhistory) { if (recordhistory) {
char tmp[80]; char tmp[80];
/* This is a response, note what it was for */ /* This is a response, note what it was for */
snprintf(tmp, sizeof(tmp), "%s / %s", req.data, get_header(&req, "CSeq")); snprintf(tmp, sizeof(tmp), "%s / %s /%s", req.data, get_header(&req, "CSeq"), req.rlPart2);
append_history(p, "Rx", tmp); append_history(p, "Rx", tmp);
} }
nounlock = 0; nounlock = 0;