diff options
| author | Jonathan Rose <jrose@digium.com> | 2013-09-12 20:27:56 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2013-09-12 20:27:56 +0000 |
| commit | 039030f245ec7218f56126fe186d8a1e5b339a83 (patch) | |
| tree | 4697ff0cbce08a2a3c27683a0ace23b08dd706e2 /channels/chan_sip.c | |
| parent | 5be186d7c5003a7a90a0db83df6f0ecc59d6c77e (diff) | |
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
........
Merged revisions 398986 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 398991 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 4210322c6..bec53b776 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -23250,15 +23250,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) { @@ -24209,11 +24200,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. |