[svn-commits] oej: branch 1.4 r65901 - /branches/1.4/channels/chan_gtalk.c

svn-commits at lists.digium.com svn-commits at lists.digium.com
Thu May 24 08:26:11 MST 2007


Author: oej
Date: Thu May 24 10:26:10 2007
New Revision: 65901

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65901
Log:
Issue 7672 - fix by zandbelt - Asterisk core dump since the GnuTLS interface did not support multithreading correctly.

Modified:
    branches/1.4/channels/chan_gtalk.c

Modified: branches/1.4/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_gtalk.c?view=diff&rev=65901&r1=65900&r2=65901
==============================================================================
--- branches/1.4/channels/chan_gtalk.c (original)
+++ branches/1.4/channels/chan_gtalk.c Thu May 24 10:26: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"
@@ -1805,6 +1809,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);



More information about the svn-commits mailing list