From d91ceb38f534a71372bb447848d3f41d953f076c Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Thu, 12 Sep 2013 20:19:39 +0000 Subject: [PATCH] chan_sip: Revert r398835 due to failing tests involving originate (issue ASTERISK-22424) Reported by: Jonathan Rose ........ Merged revisions 398977 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@398986 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 13 ------------- channels/sip/include/sip.h | 1 - 2 files changed, 14 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ee8c9c38ff..db48ca1d83 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -22788,15 +22788,6 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest ast_set_flag(&p->flags[0], SIP_PENDINGBYE); } ast_rtp_instance_activate(p->rtp); - } else if (!reinvite) { - struct ast_sockaddr remote_address = {{0,}}; - - ast_rtp_instance_get_remote_address(p->rtp, &remote_address); - if (ast_sockaddr_isnull(&remote_address) || (!ast_strlen_zero(p->theirprovtag) && strcmp(p->theirtag, p->theirprovtag))) { - ast_log(LOG_WARNING, "Received response: \"200 OK\" from '%s' without SDP\n", p->relatedpeer->name); - ast_set_flag(&p->flags[0], SIP_PENDINGBYE); - ast_rtp_instance_activate(p->rtp); - } } if (!req->ignore && p->owner) { @@ -23719,11 +23710,7 @@ static void handle_response(struct sip_pvt *p, int resp, const char *rest, struc gettag(req, "To", tag, sizeof(tag)); ast_string_field_set(p, theirtag, tag); - } else { - /* Store theirtag to track for changes when 200 responses to invites are received without SDP */ - ast_string_field_set(p, theirprovtag, p->theirtag); } - /* This needs to be configurable on a channel/peer level, not mandatory for all communication. Sadly enough, NAT implementations are not so stable so we can always rely on these headers. diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h index d8bee122ed..073f5f4d6a 100644 --- a/channels/sip/include/sip.h +++ b/channels/sip/include/sip.h @@ -1038,7 +1038,6 @@ struct sip_pvt { AST_STRING_FIELD(rdnis); /*!< Referring DNIS */ AST_STRING_FIELD(redircause); /*!< Referring cause */ AST_STRING_FIELD(theirtag); /*!< Their tag */ - AST_STRING_FIELD(theirprovtag); /*!< Provisional their tag, used when evaluating responses to invites */ AST_STRING_FIELD(tag); /*!< Our tag for this session */ AST_STRING_FIELD(username); /*!< [user] name */ AST_STRING_FIELD(peername); /*!< [peer] name, not set if [user] */ -- 2.47.2