From f70fb96b96a96ba61d90ac4e4e2a5c2d8b079beb Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 16 Sep 2009 18:44:25 +0000 Subject: [PATCH] Merged revisions 218918 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r218918 | file | 2009-09-16 13:31:47 -0500 (Wed, 16 Sep 2009) | 5 lines On TCP and TLS connections do not attempt to stop retransmission of the packet internally. This was preventing responses from being properly processed because the packet was not being found causing handle_response to return prematurely. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218931 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index aa07de2e0c..fdafed65a0 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16062,7 +16062,6 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ struct ast_channel *owner; int sipmethod; int res = 1; - int ack_res; const char *c = get_header(req, "Cseq"); /* GCC 4.2 complains if I try to cast c as a char * when passing it to ast_skip_nonblanks, so make a copy of it */ char *c_copy = ast_strdupa(c); @@ -16078,16 +16077,20 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ if (owner) owner->hangupcause = hangup_sip2cause(resp); - /* Acknowledge whatever it is destined for */ - if ((resp >= 100) && (resp <= 199)) { - ack_res = __sip_semi_ack(p, seqno, 0, sipmethod); - } else { - ack_res = __sip_ack(p, seqno, 0, sipmethod); - } + if (p->socket.type == SIP_TRANSPORT_UDP) { + int ack_res; - if (ack_res == FALSE) { - append_history(p, "Ignore", "Ignoring this retransmit\n"); - return; + /* Acknowledge whatever it is destined for */ + if ((resp >= 100) && (resp <= 199)) { + ack_res = __sip_semi_ack(p, seqno, 0, sipmethod); + } else { + ack_res = __sip_ack(p, seqno, 0, sipmethod); + } + + if (ack_res == FALSE) { + append_history(p, "Ignore", "Ignoring this retransmit\n"); + return; + } } /* If this is a NOTIFY for a subscription clear the flag that indicates that we have a NOTIFY pending */ -- 2.47.2