diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-24 15:29:10 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-24 15:29:10 +0000 |
| commit | 2c50f793d3e2cdee8d5798f5016f7c3ea6f223a8 (patch) | |
| tree | 2ec46fcbea7e5b4be530a38b2713fbc1f3e9710f /channels/chan_gtalk.c | |
| parent | 943e4bad3dad518eedc05a544b9fb735a24c1a54 (diff) | |
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.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@65904 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 0cd2a5b46..c224c1e03 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -48,6 +48,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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" #include "asterisk/config.h" @@ -1816,6 +1820,8 @@ static int gtalk_load_config(void) /*! \brief Load module into PBX, register channel */ static int load_module(void) { + gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); + ASTOBJ_CONTAINER_INIT(>alk_list); if (!gtalk_load_config()) { ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", GOOGLE_CONFIG); |