[asterisk-commits] russell: branch 1.6.1 r163669 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Dec 12 12:37:08 2008
New Revision: 163669

URL: http://svn.digium.com/view/asterisk?view=rev&rev=163669
Log:
Merged revisions 163667 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r163667 | russell | 2008-12-12 12:33:27 -0600 (Fri, 12 Dec 2008) | 5 lines

Fix a small race condition in sip_tcp_locate().

We must increase the reference count on the tcptls_session _before_ unlocking
the thread list.

........

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

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=163669&r1=163668&r2=163669
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Dec 12 12:37:08 2008
@@ -19456,22 +19456,28 @@
 		return port == STANDARD_SIP_PORT;
 }
 
-/*! \todo document this function. */
+/*! 
+ * \brief Find thread for TCP/TLS session (based on IP/Port 
+ *
+ * \note This function returns an astobj2 reference
+ */
 static struct ast_tcptls_session_instance *sip_tcp_locate(struct sockaddr_in *s)
 {
 	struct sip_threadinfo *th;
+	struct ast_tcptls_session_instance *tcptls_instance = NULL;
 
 	AST_LIST_LOCK(&threadl);
 	AST_LIST_TRAVERSE(&threadl, th, list) {
 		if ((s->sin_family == th->ser->remote_address.sin_family) &&
 			(s->sin_addr.s_addr == th->ser->remote_address.sin_addr.s_addr) &&
 			(s->sin_port == th->ser->remote_address.sin_port))  {
-				AST_LIST_UNLOCK(&threadl);
-				return th->ser;
+				tcptls_instance = (ao2_ref(th->ser, +1), th->ser);
+				break;
 			}
 	}
 	AST_LIST_UNLOCK(&threadl);
-	return NULL;
+
+	return tcptls_instance;
 }
 
 /*! \todo document this function. */
@@ -19505,7 +19511,6 @@
 			ao2_ref(s->ser, -1);
 			s->ser = NULL;
 		}
-		ao2_ref(ser, +1);
 		s->ser = ser;
 		return s->fd;
 	}