[asterisk-commits] oej: branch 1.6.0 r217405 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Sep  9 06:33:13 2009
New Revision: 217405

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=217405
Log:
Merged revisions 217368 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r217368 | oej | 2009-09-09 12:39:43 +0200 (Ons, 09 Sep 2009) | 2 lines

Not having any TLS session to write to is a serious XMIT_ERROR. 

........

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

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

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=217405&r1=217404&r2=217405
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Sep  9 06:33:13 2009
@@ -2717,6 +2717,7 @@
 			res = ast_tcptls_server_write(p->socket.tcptls_session, data, len);
 		} else {
 			ast_debug(2, "No p->socket.tcptls_session->f len=%d\n", len);
+			return XMIT_ERROR;
 		}
 	} else {
 		ast_debug(2, "Socket type is TCP but no tcptls_session is present to write to\n");