[svn-commits] dvossel: trunk r309090 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Mar  1 10:22:27 2011
New Revision: 309090

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309090
Log:
Merged revisions 309084 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r309084 | dvossel | 2011-03-01 10:09:11 -0600 (Tue, 01 Mar 2011) | 15 lines
  
  Merged revisions 309083 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r309083 | dvossel | 2011-03-01 10:05:25 -0600 (Tue, 01 Mar 2011) | 9 lines
    
    Fixes thread blocking issue in the sip TCP/TLS implementation.
    
    (closes issue #18497)
    Reported by: vois
    Patches:
          issues_18497.diff uploaded by dvossel (license 671)
    Tested by: vois, rossbeer, kowalma, Freddi_Fonet
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=309090&r1=309089&r2=309090
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Mar  1 10:22:27 2011
@@ -2607,14 +2607,15 @@
 				ao2_lock(me);
 				if (!(packet = AST_LIST_REMOVE_HEAD(&me->packet_q, entry))) {
 					ast_log(LOG_WARNING, "TCPTLS thread alert_pipe indicated packet should be sent, but frame_q is empty");
-				} else if (ast_tcptls_server_write(tcptls_session, ast_str_buffer(packet->data), packet->len) == -1) {
-					ast_log(LOG_WARNING, "Failure to write to tcp/tls socket\n");
 				}
+				ao2_unlock(me);
 
 				if (packet) {
+					if (ast_tcptls_server_write(tcptls_session, ast_str_buffer(packet->data), packet->len) == -1) {
+						ast_log(LOG_WARNING, "Failure to write to tcp/tls socket\n");
+					}
 					ao2_t_ref(packet, -1, "tcptls packet sent, this is no longer needed");
 				}
-				ao2_unlock(me);
 				break;
 			default:
 				ast_log(LOG_ERROR, "Unknown tcptls thread alert '%d'\n", alert);