Merged revisions 202341-202342 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r202341 | mmichelson | 2009-06-22 09:42:55 -0500 (Mon, 22 Jun 2009) | 26 lines Fix a situation in which Asterisk would not stop retransmitting 487s. If a CANCEL were received by Asterisk, we would send a 487 in response to the original INVITE and a 200 OK for the CANCEL. If there were a network hiccup which caused the 200 OK and the 487 to be lost, then the UA communicating with Asterisk may try to retransmit its CANCEL. Asterisk's response to this used to be to try sending another 487 to the canceled INVITE and another 200 OK to the CANCEL. The problem here is that the originally-sent 487 was sent "reliably" meaning that it will be retransmitted until it is received properly. So when we receive the second CANCEL it is likely that the first batch of 487s we sent is still going strong and reaches the UA. The result was that the second set of 487s would be retransmitted constantly until the maximum number of retries had been reached. The fix for this is that if we receive a second CANCEL for an INVITE, then we cancel the retransmission of the first set of 487s and start a second set. This causes the dialog to be terminated reasonably. (closes issue #14584) Reported by: klaus3000 Patches: 14584_v2.patch uploaded by mmichelson (license 60) Tested by: klaus3000 ........ r202342 | mmichelson | 2009-06-22 09:44:58 -0500 (Mon, 22 Jun 2009) | 3 lines Remove an extra debug line left from previous commit. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202343 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
e68e6f9d75
commit
f142cbe10c
1 changed files with 32 additions and 0 deletions
|
@ -1930,6 +1930,7 @@ struct sip_pkt {
|
||||||
int seqno; /*!< Sequence number */
|
int seqno; /*!< Sequence number */
|
||||||
char is_resp; /*!< 1 if this is a response packet (e.g. 200 OK), 0 if it is a request */
|
char is_resp; /*!< 1 if this is a response packet (e.g. 200 OK), 0 if it is a request */
|
||||||
char is_fatal; /*!< non-zero if there is a fatal error */
|
char is_fatal; /*!< non-zero if there is a fatal error */
|
||||||
|
int response_code; /*!< If this is a response, the response code */
|
||||||
struct sip_pvt *owner; /*!< Owner AST call */
|
struct sip_pvt *owner; /*!< Owner AST call */
|
||||||
int retransid; /*!< Retransmission ID */
|
int retransid; /*!< Retransmission ID */
|
||||||
int timer_a; /*!< SIP timer A, retransmission timer */
|
int timer_a; /*!< SIP timer A, retransmission timer */
|
||||||
|
@ -3727,6 +3728,7 @@ static enum sip_result __sip_reliable_xmit(struct sip_pvt *p, int seqno, int res
|
||||||
struct sip_pkt *pkt = NULL;
|
struct sip_pkt *pkt = NULL;
|
||||||
int siptimer_a = DEFAULT_RETRANS;
|
int siptimer_a = DEFAULT_RETRANS;
|
||||||
int xmitres = 0;
|
int xmitres = 0;
|
||||||
|
int respid;
|
||||||
|
|
||||||
if (sipmethod == SIP_INVITE) {
|
if (sipmethod == SIP_INVITE) {
|
||||||
/* Note this is a pending invite */
|
/* Note this is a pending invite */
|
||||||
|
@ -3763,6 +3765,12 @@ static enum sip_result __sip_reliable_xmit(struct sip_pvt *p, int seqno, int res
|
||||||
pkt->owner = dialog_ref(p, "__sip_reliable_xmit: setting pkt->owner");
|
pkt->owner = dialog_ref(p, "__sip_reliable_xmit: setting pkt->owner");
|
||||||
pkt->next = p->packets;
|
pkt->next = p->packets;
|
||||||
p->packets = pkt; /* Add it to the queue */
|
p->packets = pkt; /* Add it to the queue */
|
||||||
|
if (resp) {
|
||||||
|
/* Parse out the response code */
|
||||||
|
if (sscanf(ast_str_buffer(pkt->data), "SIP/2.0 %d", &respid) == 1) {
|
||||||
|
pkt->response_code = respid;
|
||||||
|
}
|
||||||
|
}
|
||||||
pkt->timer_t1 = p->timer_t1; /* Set SIP timer T1 */
|
pkt->timer_t1 = p->timer_t1; /* Set SIP timer T1 */
|
||||||
pkt->retransid = -1;
|
pkt->retransid = -1;
|
||||||
if (pkt->timer_t1)
|
if (pkt->timer_t1)
|
||||||
|
@ -21103,6 +21111,30 @@ static int handle_request_cancel(struct sip_pvt *p, struct sip_request *req)
|
||||||
else
|
else
|
||||||
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
|
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
|
||||||
if (p->initreq.len > 0) {
|
if (p->initreq.len > 0) {
|
||||||
|
struct sip_pkt *pkt, *prev_pkt;
|
||||||
|
/* If the CANCEL we are receiving is a retransmission, and we already have scheduled
|
||||||
|
* a reliable 487, then we don't want to schedule another one on top of the previous
|
||||||
|
* one.
|
||||||
|
*
|
||||||
|
* As odd as this may sound, we can't rely on the previously-transmitted "reliable"
|
||||||
|
* response in this situation. What if we've sent all of our reliable responses
|
||||||
|
* already and now all of a sudden, we get this second CANCEL?
|
||||||
|
*
|
||||||
|
* The only way to do this correctly is to cancel our previously-scheduled reliably-
|
||||||
|
* transmitted response and send a new one in its place.
|
||||||
|
*/
|
||||||
|
for (pkt = p->packets, prev_pkt = NULL; pkt; prev_pkt = pkt, pkt = pkt->next) {
|
||||||
|
if (pkt->seqno == p->lastinvite && pkt->response_code == 487) {
|
||||||
|
AST_SCHED_DEL(sched, pkt->retransid);
|
||||||
|
if (prev_pkt) {
|
||||||
|
prev_pkt->next = pkt->next;
|
||||||
|
} else {
|
||||||
|
p->packets = pkt->next;
|
||||||
|
}
|
||||||
|
ast_free(pkt);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
transmit_response_reliable(p, "487 Request Terminated", &p->initreq);
|
transmit_response_reliable(p, "487 Request Terminated", &p->initreq);
|
||||||
transmit_response(p, "200 OK", req);
|
transmit_response(p, "200 OK", req);
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in a new issue