[svn-commits] oej: trunk r65904 - in /trunk: ./ channels/chan_gtalk.c

[svn-commits at lists.digium.com]

Author: oej
Date: Thu May 24 10:29:10 2007
New Revision: 65904

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65904
Log:
Merged revisions 65901 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65901 | oej | 2007-05-24 17:26:10 +0200 (Thu, 24 May 2007) | 2 lines

Issue 7672 - fix by zandbelt - Asterisk core dump since the GnuTLS interface did not support multithreading correctly.

........

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

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

Modified: trunk/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=65904&r1=65903&r2=65904
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Thu May 24 10:29:10 2007
@@ -47,6 +47,10 @@
 #include <arpa/inet.h>
 #include <sys/signal.h>
 #include <iksemel.h>
+
+#include <gcrypt.h>
+#include <pthread.h>
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
@@ -1816,6 +1820,8 @@
 /*! \brief Load module into PBX, register channel */
 static int load_module(void)
 {
+        gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+
 	ASTOBJ_CONTAINER_INIT(&gtalk_list);
 	if (!gtalk_load_config()) {
 		ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", GOOGLE_CONFIG);