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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@398991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2013-09-12 20:20:46 +00:00
parent be81695a85
commit c1ffcb84b0
2 changed files with 0 additions and 14 deletions

View File

@@ -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.