[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase1_step3 r301774 - /team/dvossel/fixt...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Jan 13 11:44:08 2011
New Revision: 301774

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301774
Log:
Fixes a few logic errors during conversion of chan_sip.c

Modified:
    team/dvossel/fixtheworld_phase1_step3/channels/chan_sip.c

Modified: team/dvossel/fixtheworld_phase1_step3/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/channels/chan_sip.c?view=diff&rev=301774&r1=301773&r2=301774
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/channels/chan_sip.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/channels/chan_sip.c Thu Jan 13 11:44:08 2011
@@ -8368,9 +8368,10 @@
 			/* 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))
+			if (!process_sdp_o(value, p)) {
 				res = (p->session_modify == FALSE) ? 0 : -1;
 				goto process_sdp_cleanup;
+			}
 			break;
 		case 'c':
 			if (process_sdp_c(value, &sessionsa)) {
@@ -8653,9 +8654,9 @@
 	ast_rtp_codecs_payload_formats(&newvideortp, vpeercapability, &vpeernoncodeccapability);
 	ast_rtp_codecs_payload_formats(&newtextrtp, tpeercapability, &tpeernoncodeccapability);
 
-	ast_cap_append(newpeercapability, peercapability);
-	ast_cap_append(newpeercapability, vpeercapability);
-	ast_cap_append(newpeercapability, tpeercapability);
+	ast_cap_append(peercapability, newpeercapability);
+	ast_cap_append(vpeercapability, newpeercapability);
+	ast_cap_append(tpeercapability, newpeercapability);
 
 	ast_cap_joint_copy(p->caps, newpeercapability, newjointcapability);
 	if (ast_cap_is_empty(newjointcapability) && (portno != -1)) {