- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12576 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: brian Date: Wed Mar 11 17:13:26 2009 New Revision: 12576 Log: revert Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Wed Mar 11 17:13:26 2009 @@ -27,7 +27,7 @@   - <load module="mod_dingaling"/> +

1 0

[commit] r12575 - in freeswitch/trunk: conf/autoload_configs libs/iksemel/src libs/libdingaling/src
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: anthm Date: Wed Mar 11 16:22:14 2009 New Revision: 12575 Log: hijack gcrypt init call to fix threadsafe race in dingaling and fix buffer overrun in iksemel Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml freeswitch/trunk/libs/iksemel/src/io-posix.c freeswitch/trunk/libs/iksemel/src/stream.c freeswitch/trunk/libs/libdingaling/src/libdingaling.c Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Wed Mar 11 16:22:14 2009 @@ -27,7 +27,7 @@   -  + <load module="mod_dingaling"/>    Modified: freeswitch/trunk/libs/iksemel/src/io-posix.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/io-posix.c (original) +++ freeswitch/trunk/libs/iksemel/src/io-posix.c Wed Mar 11 16:22:14 2009 @@ -108,6 +108,7 @@ fd_set fds; struct timeval tv, *tvptr; int len; + char *bound; tv.tv_sec = 0; tv.tv_usec = 0; @@ -115,20 +116,22 @@ FD_ZERO (&fds); FD_SET (sock, &fds); tv.tv_sec = timeout; + if (timeout != -1) tvptr = &tv; else tvptr = NULL; if (select (sock + 1, &fds, NULL, NULL, tvptr) > 0) { len = recv (sock, buffer, buf_len, 0); if (len > 0) { char *p, *e = NULL, *t = NULL; - *(buffer+buf_len+1) = '\0'; - for (p = buffer; p && *p; p++) { + bound = buffer + (len -1); + + for (p = buffer; p < bound; p++) { if (*p == '>') { e = p; t = p+1; if (*t == '<') { continue; } - while(t && *t) { + while(p < bound && t < bound) { if (*t != ' ' && *t != '<') { t = e = NULL; break; Modified: freeswitch/trunk/libs/iksemel/src/stream.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/stream.c (original) +++ freeswitch/trunk/libs/iksemel/src/stream.c Wed Mar 11 16:22:14 2009 @@ -45,17 +45,15 @@ }; #ifdef HAVE_GNUTLS -static pthread_mutex_t tls_send_mutex; -static pthread_mutex_t tls_recv_mutex; +#include <gcrypt.h> +GCRY_THREAD_OPTION_PTHREAD_IMPL; static size_t tls_push (iksparser *prs, const char *buffer, size_t len) { struct stream_data *data = iks_user_data (prs); int ret; - pthread_mutex_lock(&tls_send_mutex); ret = data->trans->send (data->sock, buffer, len); - pthread_mutex_unlock(&tls_send_mutex); if (ret) return (size_t) -1; return len; } @@ -65,9 +63,7 @@ { struct stream_data *data = iks_user_data (prs); int ret; - pthread_mutex_lock(&tls_recv_mutex); ret = data->trans->recv (data->sock, buffer, len, -1); - pthread_mutex_unlock(&tls_recv_mutex); if (ret == -1) return (size_t) -1; return ret; } @@ -82,6 +78,8 @@ const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 }; int ret; + gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); + if (gnutls_global_init () != 0) return IKS_NOMEM; @@ -99,8 +97,10 @@ gnutls_mac_set_priority(data->sess, mac_priority); gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred); + gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push); gnutls_transport_set_pull_function (data->sess, (gnutls_pull_func) tls_pull); + gnutls_transport_set_ptr (data->sess, data->prs); ret = gnutls_handshake (data->sess); @@ -487,9 +487,15 @@ int iks_fd (iksparser *prs) { - struct stream_data *data = iks_user_data (prs); + struct stream_data *data; - return (int) data->sock; + if (prs) { + data = iks_user_data (prs); + if (data) { + return (int) data->sock; + } + } + return -1; } int @@ -603,24 +609,11 @@ iks_init(void) { int ok = 0; - pthread_mutexattr_t attr; - - if (pthread_mutexattr_init(&attr)) - return -1; - - if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE)) - ok = -1; - if (ok == 0 && pthread_mutex_init(&tls_send_mutex, &attr)) - ok = -1; + gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); - if (ok == 0 && pthread_mutex_init(&tls_recv_mutex, &attr)) { - pthread_mutex_destroy(&tls_send_mutex); - ok = -1; - } - - - pthread_mutexattr_destroy(&attr); + if (gnutls_global_init () != 0) + return IKS_NOMEM; return ok; Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Wed Mar 11 16:22:14 2009 @@ -1566,8 +1566,7 @@ } fail: - iks_disconnect(handle->parser); - iks_parser_delete(handle->parser); + ldl_clear_flag_locked(handle, LDL_FLAG_CONNECTED); ldl_clear_flag_locked(handle, LDL_FLAG_AUTHORIZED); handle->state = CS_NEW; @@ -1575,6 +1574,9 @@ while(ldl_test_flag(handle, LDL_FLAG_QUEUE_RUNNING)) { microsleep(100); } + + iks_disconnect(handle->parser); + iks_parser_delete(handle->parser); } ldl_clear_flag_locked(handle, LDL_FLAG_RUNNING); if (!ldl_test_flag(handle, LDL_FLAG_TLS)) {

1 0

[commit] r12574 - freeswitch/trunk/libs/esl/lua
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: mikej Date: Wed Mar 11 16:12:29 2009 New Revision: 12574 Log: fix build Modified: freeswitch/trunk/libs/esl/lua/Makefile Modified: freeswitch/trunk/libs/esl/lua/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/lua/Makefile (original) +++ freeswitch/trunk/libs/esl/lua/Makefile Wed Mar 11 16:12:29 2009 @@ -1,5 +1,6 @@ LOCAL_CFLAGS= LOCAL_LDFLAGS=-llua +WRAP_GCC_WARNING_SILENCE=-Wno-unused-function all: ESL.so @@ -7,7 +8,7 @@ swig -module ESL -lua -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i esl_wrap.o: esl_wrap.cpp - $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o + $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o ESL.so: esl_wrap.o $(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(LOCAL_LDFLAGS) -o ESL.so -L. $(LIBS)

1 0

[commit] r12573 - in freeswitch/trunk/libs/esl: . perl php src/include
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: mikej Date: Wed Mar 11 15:51:44 2009 New Revision: 12573 Log: fix build failures Modified: freeswitch/trunk/libs/esl/Makefile freeswitch/trunk/libs/esl/perl/Makefile freeswitch/trunk/libs/esl/php/Makefile freeswitch/trunk/libs/esl/src/include/esl_oop.h Modified: freeswitch/trunk/libs/esl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/Makefile (original) +++ freeswitch/trunk/libs/esl/Makefile Wed Mar 11 15:51:44 2009 @@ -5,7 +5,7 @@ BASE_FLAGS=$(INCS) -DHAVE_EDITLINE $(DEBUG) -I$(LIBEDIT_DIR)/src/ -fPIC PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes CFLAGS=$(BASE_FLAGS) $(PICKY) -CXXFLAGS=$(BASE_FLAGS) -Wall -Werror +CXXFLAGS=$(BASE_FLAGS) -Wall -Werror -Wno-unused-variable MYLIB=libesl.a LIBS=-lncurses -lpthread -lesl LDFLAGS=-L. Modified: freeswitch/trunk/libs/esl/perl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/perl/Makefile (original) +++ freeswitch/trunk/libs/esl/perl/Makefile Wed Mar 11 15:51:44 2009 @@ -3,7 +3,7 @@ PERL_LIBS =$(shell perl -MConfig -e 'print $$Config{libs}') LOCAL_CFLAGS= -w -DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL LOCAL_LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts) $(shell $(PERL) -MConfig -e 'print $$Config{libs}') - +PERL_INC=$(shell $(PERL) -MExtUtils::Embed -e perl_inc) all: ESL.so esl_wrap.cpp: @@ -16,7 +16,7 @@ $(CC) $(CC_CFLAGS) $(CFLAGS) $(LOCAL_CFLAGS) -c perlxsi.c -o perlxsi.o esl_wrap.o: esl_wrap.cpp - $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o + $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(PERL_INC) -c esl_wrap.cpp -o esl_wrap.o ESL.so: esl_wrap.o perlxsi.o $(CXX) $(SOLINK) esl_wrap.o perlxsi.o $(MYLIB) $(LOCAL_LDFLAGS) -o ESL.so -L. $(LIBS) Modified: freeswitch/trunk/libs/esl/php/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/php/Makefile (original) +++ freeswitch/trunk/libs/esl/php/Makefile Wed Mar 11 15:51:44 2009 @@ -1,5 +1,6 @@ LOCAL_CFLAGS=$(shell php-config --includes) LOCAL_LDFLAGS=$(shell php-config --ldflags --libs) +WRAP_GCC_WARNING_SILENCE=-Wno-unused-label -Wno-unused-function all: ESL.so @@ -7,7 +8,7 @@ swig -module ESL -php5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i esl_wrap.o: esl_wrap.cpp - $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o + $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o ESL.so: esl_wrap.o $(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(LOCAL_LDFLAGS) -o ESL.so -L. $(LIBS) Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_oop.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_oop.h Wed Mar 11 15:51:44 2009 @@ -33,12 +33,9 @@ #ifndef _ESL_OOP_H_ #define _ESL_OOP_H_ -#ifndef EXTERN_C -#define EXTERN_C extern "C" { -#endif #include <esl.h> #ifdef __cplusplus -EXTERN_C +extern "C" { #endif #define this_check(x) do { if (!this) { esl_log(ESL_LOG_ERROR, "object is not initalized\n"); return x;}} while(0)

1 0

[commit] r12572 - freeswitch/trunk/libs/esl/src/include
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: mikej Date: Wed Mar 11 15:25:21 2009 New Revision: 12572 Log: fix build Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_oop.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_oop.h Wed Mar 11 15:25:21 2009 @@ -31,9 +31,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define EXTERN_C extern "C" { #ifndef _ESL_OOP_H_ #define _ESL_OOP_H_ +#ifndef EXTERN_C +#define EXTERN_C extern "C" { +#endif #include <esl.h> #ifdef __cplusplus EXTERN_C

1 0

[commit] r12571 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: anthm Date: Wed Mar 11 12:26:37 2009 New Revision: 12571 Log: sigh Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Wed Mar 11 12:26:37 2009 @@ -111,7 +111,7 @@ config_data->bytes += realsize; if (config_data->bytes > config_data->max_bytes) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Oversized file detected [%ld bytes]\n", config_data->bytes); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Oversized file detected [%d bytes]\n", (int)config_data->bytes); config_data->err = 1; return 0; }

1 0

[commit] r12570 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: anthm Date: Wed Mar 11 11:54:38 2009 New Revision: 12570 Log: limit bytes read by xml_curl to 1 meg Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Wed Mar 11 11:54:38 2009 @@ -54,9 +54,14 @@ typedef struct xml_binding xml_binding_t; +#define XML_CURL_MAX_BYTES 1024 * 1024 + struct config_data { char *name; int fd; + switch_size_t bytes; + switch_size_t max_bytes; + int err; }; typedef struct hash_node { @@ -102,6 +107,15 @@ register unsigned int realsize = (unsigned int) (size * nmemb); struct config_data *config_data = data; int x; + + config_data->bytes += realsize; + + if (config_data->bytes > config_data->max_bytes) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Oversized file detected [%ld bytes]\n", config_data->bytes); + config_data->err = 1; + return 0; + } + x = write(config_data->fd, ptr, realsize); if (x != (int) realsize) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write! %d out of %d\n", x, realsize); @@ -185,6 +199,7 @@ } config_data.name = filename; + config_data.max_bytes = XML_CURL_MAX_BYTES; if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { if (!switch_strlen_zero(binding->cred)) { curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY); @@ -222,13 +237,18 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening temp file!\n"); } - if (httpRes == 200) { - if (!(xml = switch_xml_parse_file(filename))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received HTTP error %ld trying to fetch %s\ndata: [%s]\n", httpRes, binding->url, data); + if (config_data.err) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error encountered!\n"); xml = NULL; + } else { + if (httpRes == 200) { + if (!(xml = switch_xml_parse_file(filename))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received HTTP error %ld trying to fetch %s\ndata: [%s]\n", httpRes, binding->url, data); + xml = NULL; + } } /* Debug by leaving the file behind for review */

1 0

[commit] r12569 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: anthm Date: Wed Mar 11 10:58:11 2009 New Revision: 12569 Log: FSCORE-328 Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Mar 11 10:58:11 2009 @@ -42,6 +42,7 @@ #include <sys/resource.h> #endif #endif +#include <errno.h> SWITCH_DECLARE_DATA switch_directories SWITCH_GLOBAL_dirs = { 0 }; @@ -1589,9 +1590,27 @@ static void *SWITCH_THREAD_FUNC system_thread(switch_thread_t *thread, void *obj) { struct system_thread_handle *sth = (struct system_thread_handle *)obj; +#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) + struct rlimit rlim; + + rlim.rlim_cur = SWITCH_SYSTEM_THREAD_STACKSIZE; + rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; + if (setrlimit(RLIMIT_STACK, &rlim) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed! (%s)\n", strerror(errno)); + } +#endif sth->ret = system(sth->cmd); +#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) + rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; + rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; + if (setrlimit(RLIMIT_STACK, &rlim) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed! (%s)\n", strerror(errno)); + } + +#endif + switch_mutex_lock(sth->mutex); switch_thread_cond_signal(sth->cond); switch_mutex_unlock(sth->mutex); @@ -1608,15 +1627,6 @@ int ret = 0; struct system_thread_handle *sth; switch_memory_pool_t *pool; -#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) - struct rlimit rlim; - - rlim.rlim_cur = SWITCH_SYSTEM_THREAD_STACKSIZE; - rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; - if (setrlimit(RLIMIT_STACK, &rlim) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed!\n"); - } -#endif if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); @@ -1640,15 +1650,6 @@ switch_threadattr_detach_set(thd_attr, 1); switch_thread_create(&thread, thd_attr, system_thread, sth, sth->pool); - -#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) - rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; - rlim.rlim_max = SWITCH_THREAD_STACKSIZE; - if (setrlimit(RLIMIT_STACK, &rlim) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed!\n"); - } -#endif - if (wait) { switch_thread_cond_wait(sth->cond, sth->mutex); ret = sth->ret;

1 0

[commit] r12568 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: anthm Date: Wed Mar 11 10:57:42 2009 New Revision: 12568 Log: revert Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Mar 11 10:57:42 2009 @@ -42,7 +42,6 @@ #include <sys/resource.h> #endif #endif -#include <errno.h> SWITCH_DECLARE_DATA switch_directories SWITCH_GLOBAL_dirs = { 0 }; @@ -793,7 +792,7 @@ #ifndef __FreeBSD__ memset(&rlp, 0, sizeof(rlp)); rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; - rlp.rlim_max = SWITCH_THREAD_STACKSIZE; + rlp.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; setrlimit(RLIMIT_STACK, &rlp); #endif @@ -1590,27 +1589,9 @@ static void *SWITCH_THREAD_FUNC system_thread(switch_thread_t *thread, void *obj) { struct system_thread_handle *sth = (struct system_thread_handle *)obj; -#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) - struct rlimit rlim; - - rlim.rlim_cur = SWITCH_SYSTEM_THREAD_STACKSIZE; - rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; - if (setrlimit(RLIMIT_STACK, &rlim) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed! (%s)\n", strerror(errno)); - } -#endif sth->ret = system(sth->cmd); -#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) - rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; - rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; - if (setrlimit(RLIMIT_STACK, &rlim) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed! (%s)\n", strerror(errno)); - } - -#endif - switch_mutex_lock(sth->mutex); switch_thread_cond_signal(sth->cond); switch_mutex_unlock(sth->mutex); @@ -1627,6 +1608,15 @@ int ret = 0; struct system_thread_handle *sth; switch_memory_pool_t *pool; +#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) + struct rlimit rlim; + + rlim.rlim_cur = SWITCH_SYSTEM_THREAD_STACKSIZE; + rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; + if (setrlimit(RLIMIT_STACK, &rlim) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed!\n"); + } +#endif if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); @@ -1650,6 +1640,15 @@ switch_threadattr_detach_set(thd_attr, 1); switch_thread_create(&thread, thd_attr, system_thread, sth, sth->pool); + +#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) + rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; + rlim.rlim_max = SWITCH_THREAD_STACKSIZE; + if (setrlimit(RLIMIT_STACK, &rlim) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed!\n"); + } +#endif + if (wait) { switch_thread_cond_wait(sth->cond, sth->mutex); ret = sth->ret;

1 0

[commit] r12567 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: anthm Date: Wed Mar 11 10:29:50 2009 New Revision: 12567 Log: FSCORE-328 Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Mar 11 10:29:50 2009 @@ -42,6 +42,7 @@ #include <sys/resource.h> #endif #endif +#include <errno.h> SWITCH_DECLARE_DATA switch_directories SWITCH_GLOBAL_dirs = { 0 }; @@ -792,7 +793,7 @@ #ifndef __FreeBSD__ memset(&rlp, 0, sizeof(rlp)); rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; - rlp.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; + rlp.rlim_max = SWITCH_THREAD_STACKSIZE; setrlimit(RLIMIT_STACK, &rlp); #endif @@ -1589,9 +1590,27 @@ static void *SWITCH_THREAD_FUNC system_thread(switch_thread_t *thread, void *obj) { struct system_thread_handle *sth = (struct system_thread_handle *)obj; +#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) + struct rlimit rlim; + + rlim.rlim_cur = SWITCH_SYSTEM_THREAD_STACKSIZE; + rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; + if (setrlimit(RLIMIT_STACK, &rlim) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed! (%s)\n", strerror(errno)); + } +#endif sth->ret = system(sth->cmd); +#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) + rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; + rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; + if (setrlimit(RLIMIT_STACK, &rlim) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed! (%s)\n", strerror(errno)); + } + +#endif + switch_mutex_lock(sth->mutex); switch_thread_cond_signal(sth->cond); switch_mutex_unlock(sth->mutex); @@ -1608,18 +1627,6 @@ int ret = 0; struct system_thread_handle *sth; switch_memory_pool_t *pool; -#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) - struct rlimit rlim; - - rlim.rlim_cur = SWITCH_SYSTEM_THREAD_STACKSIZE; - rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; - - /** - if (setrlimit(RLIMIT_STACK, &rlim) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed!\n"); - } - **/ -#endif if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); @@ -1643,17 +1650,6 @@ switch_threadattr_detach_set(thd_attr, 1); switch_thread_create(&thread, thd_attr, system_thread, sth, sth->pool); - -#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) - rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; - rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; - /** - if (setrlimit(RLIMIT_STACK, &rlim) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed!\n"); - } - **/ -#endif - if (wait) { switch_thread_cond_wait(sth->cond, sth->mutex); ret = sth->ret;

1 0