[asterisk-commits] file: branch 1.6.2 r231605 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Nov 30 14:47:53 2009
New Revision: 231605

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=231605
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_sip.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=231605&r1=231604&r2=231605
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Mon Nov 30 14:47:53 2009
@@ -8150,8 +8150,11 @@
 		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 @@
 	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 @@
 	    (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;