From 25fe750a8f0abffe1337dca4da9002bba95fe3db Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 30 Nov 2009 20:47:05 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@231604 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1ee0c50473..92f8041820 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7544,8 +7544,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)) { @@ -7999,6 +8002,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; @@ -8047,11 +8052,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; -- 2.47.2