[asterisk-commits] lmadsen: tag 1.6.2.18.1 r324703 - in /tags/1.6.2.18.1: ./ channels/ main/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Thu Jun 23 13:40:02 2011
New Revision: 324703

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324703
Log:
Commit changes per AST-2011-008, AST-2011-010

Removed:
    tags/1.6.2.18.1/asterisk-1.6.2.18-summary.html
    tags/1.6.2.18.1/asterisk-1.6.2.18-summary.txt
Modified:
    tags/1.6.2.18.1/.version
    tags/1.6.2.18.1/ChangeLog
    tags/1.6.2.18.1/channels/chan_iax2.c
    tags/1.6.2.18.1/channels/chan_sip.c
    tags/1.6.2.18.1/main/features.c

Modified: tags/1.6.2.18.1/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.18.1/.version?view=diff&rev=324703&r1=324702&r2=324703
==============================================================================
--- tags/1.6.2.18.1/.version (original)
+++ tags/1.6.2.18.1/.version Thu Jun 23 13:40:02 2011
@@ -1,1 +1,1 @@
-1.6.2.18
+1.6.2.18.1

Modified: tags/1.6.2.18.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.18.1/ChangeLog?view=diff&rev=324703&r1=324702&r2=324703
==============================================================================
--- tags/1.6.2.18.1/ChangeLog (original)
+++ tags/1.6.2.18.1/ChangeLog Thu Jun 23 13:40:02 2011
@@ -1,3 +1,9 @@
+2011-06-22  Leif Madsen <lmadsen at digium.com>
+
+	* Asterisk 1.6.2.18.1 Released.
+
+	* AST-2011-008, AST-2011-010
+
 2011-04-25  Leif Madsen <lmadsen at digium.com>
 
 	* Asterisk 1.6.2.18 Released.

Modified: tags/1.6.2.18.1/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.18.1/channels/chan_iax2.c?view=diff&rev=324703&r1=324702&r2=324703
==============================================================================
--- tags/1.6.2.18.1/channels/chan_iax2.c (original)
+++ tags/1.6.2.18.1/channels/chan_iax2.c Thu Jun 23 13:40:02 2011
@@ -5081,7 +5081,14 @@
 	case AST_OPTION_OPRMODE:
 		errno = EINVAL;
 		return -1;
-	default:
+ 	/* These options are sent to the other side across the network where
+ 	 * they will be passed to whatever channel is bridged there. Don't
+ 	 * do anything silly like pass an option that transmits pointers to
+ 	 * memory on this machine to a remote machine to use */
+ 	case AST_OPTION_TONE_VERIFY:
+ 	case AST_OPTION_TDD:
+ 	case AST_OPTION_RELAXDTMF:
+ 	case AST_OPTION_AUDIO_MODE:
 	{
 		unsigned short callno = PTR_TO_CALLNO(c->tech_pvt);
 		struct chan_iax2_pvt *pvt;
@@ -5109,7 +5116,12 @@
 		ast_free(h);
 		return res;
 	}
-	}
+	default:
+		return -1;
+	}
+
+	/* Just in case someone does a break instead of a return */
+	return -1;
 }
 
 static struct ast_frame *iax2_read(struct ast_channel *c) 

Modified: tags/1.6.2.18.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.18.1/channels/chan_sip.c?view=diff&rev=324703&r1=324702&r2=324703
==============================================================================
--- tags/1.6.2.18.1/channels/chan_sip.c (original)
+++ tags/1.6.2.18.1/channels/chan_sip.c Thu Jun 23 13:40:02 2011
@@ -22555,7 +22555,8 @@
 		return -1;
 	}
 
-	req.len = res;
+	/* req.data will have the correct length in case of nulls */
+	req.len = ast_str_strlen(req.data);
 	req.socket.fd = sipsock;
 	set_socket_transport(&req.socket, SIP_TRANSPORT_UDP);
 	req.socket.tcptls_session	= NULL;

Modified: tags/1.6.2.18.1/main/features.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.18.1/main/features.c?view=diff&rev=324703&r1=324702&r2=324703
==============================================================================
--- tags/1.6.2.18.1/main/features.c (original)
+++ tags/1.6.2.18.1/main/features.c Thu Jun 23 13:40:02 2011
@@ -3051,10 +3051,19 @@
 				break;
 			case AST_CONTROL_OPTION:
 				aoh = f->data.ptr;
-				/* Forward option Requests */
+				/* Forward option Requests, but only ones we know are safe
+				 * These are ONLY sent by chan_iax2 and I'm not convinced that
+				 * they are useful. I haven't deleted them entirely because I
+				 * just am not sure of the ramifications of removing them. */
 				if (aoh && aoh->flag == AST_OPTION_FLAG_REQUEST) {
-					ast_channel_setoption(other, ntohs(aoh->option), aoh->data, 
-						f->datalen - sizeof(struct ast_option_header), 0);
+				   	switch (ntohs(aoh->option)) {
+					case AST_OPTION_TONE_VERIFY:
+					case AST_OPTION_TDD:
+					case AST_OPTION_RELAXDTMF:
+					case AST_OPTION_AUDIO_MODE:
+						ast_channel_setoption(other, ntohs(aoh->option), aoh->data, 
+							f->datalen - sizeof(struct ast_option_header), 0);
+					}
 				}
 				break;
 			}