kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 08:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 65901 via svnmerge from

Browse Source 
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.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2007-05-24 15:29:10 +00:00
parent 4aaa1d1ec1
commit b4f7d35240
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_gtalk.c
View File

@@ -48,6 +48,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/signal.h> #include <sys/signal.h>
#include <iksemel.h> #include <iksemel.h>
#include <gcrypt.h>
#include <pthread.h>
GCRY_THREAD_OPTION_PTHREAD_IMPL;
#include "asterisk/lock.h" #include "asterisk/lock.h"
#include "asterisk/channel.h" #include "asterisk/channel.h"
#include "asterisk/config.h" #include "asterisk/config.h"
@@ -1816,6 +1820,8 @@ static int gtalk_load_config(void)
/*! \brief Load module into PBX, register channel */ /*! \brief Load module into PBX, register channel */
static int load_module(void) static int load_module(void)
{ {
gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
ASTOBJ_CONTAINER_INIT(&gtalk_list); ASTOBJ_CONTAINER_INIT(&gtalk_list);
if (!gtalk_load_config()) { if (!gtalk_load_config()) {
ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", GOOGLE_CONFIG); ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", GOOGLE_CONFIG);