diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-30 20:47:53 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-30 20:47:53 +0000 |
commit | bdc1b839df4f5800fb609fabaa2f6c3a70d4fbb7 (patch) | |
tree | c2aa39d214b59f47e59f4a7f60749be62ae5c52b /channels | |
parent | 90f6a20df6e0b681190944020777f94717ff57ea (diff) |
Merged revisions 231602 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r231602 | file | 2009-11-30 16:44:30 -0400 (Mon, 30 Nov 2009) | 5 lines
When receiving SDP that matches the version of the last one do not treat it as a fatal error.
(closes issue #16238)
Reported by: seandarcy
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@231605 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1624d5369..5d4cfbe5e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8150,8 +8150,11 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action int processed = FALSE; switch (type) { case 'o': + /* If we end up receiving SDP that doesn't actually modify the session we don't want to treat this as a fatal + * error. We just want to ignore the SDP and let the rest of the packet be handled as normal. + */ if (!process_sdp_o(value, p)) - return -1; + return (p->session_modify == FALSE) ? 0 : -1; break; case 'c': if (process_sdp_c(value, &sessionhp)) { @@ -8605,6 +8608,8 @@ static int process_sdp_o(const char *o, struct sip_pvt *p) change media session and increment its own version number in answer SDP in this case. */ + p->session_modify = TRUE; + if (ast_strlen_zero(o)) { ast_log(LOG_WARNING, "SDP syntax error. SDP without an o= line\n"); return FALSE; @@ -8653,11 +8658,9 @@ static int process_sdp_o(const char *o, struct sip_pvt *p) (p->sessionversion_remote < 0) || (p->sessionversion_remote < rua_version)) { p->sessionversion_remote = rua_version; - p->session_modify = TRUE; } else { if (p->t38.state == T38_LOCAL_REINVITE) { p->sessionversion_remote = rua_version; - p->session_modify = TRUE; ast_log(LOG_WARNING, "Call %s responded to our T.38 reinvite without changing SDP version; 'ignoresdpversion' should be set for this peer.\n", p->callid); } else { p->session_modify = FALSE; |