aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_sip.c
diff options
context:
space:
mode:
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r--channels/chan_sip.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fce524ec1..239fc89be 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -20560,6 +20560,8 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct so
int debug = sip_debug_test_pvt(p);
char *e;
int error = 0;
+ int oldmethod = p->method;
+ int acked = 0;
/* Get Method and Cseq */
cseq = get_header(req, "Cseq");
@@ -20731,7 +20733,7 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct so
if (seqno == p->pendinginvite) {
p->invitestate = INV_TERMINATED;
p->pendinginvite = 0;
- __sip_ack(p, seqno, 1 /* response */, 0);
+ acked = __sip_ack(p, seqno, 1 /* response */, 0);
if (find_sdp(req)) {
if (process_sdp(p, req, SDP_T38_NONE))
return -1;
@@ -20740,9 +20742,13 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct so
} else if (p->glareinvite == seqno) {
/* handle ack for the 491 pending sent for glareinvite */
p->glareinvite = 0;
- __sip_ack(p, seqno, 1, 0);
+ acked = __sip_ack(p, seqno, 1, 0);
+ }
+ if (!acked) {
+ /* Got an ACK that did not match anything. Ignore
+ * silently and restore previous method */
+ p->method = oldmethod;
}
- /* Got an ACK that we did not match. Ignore silently */
if (!p->lastinvite && ast_strlen_zero(p->randdata))
p->needdestroy = 1;
break;