- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4811 - freeswitch/trunk
by Freeswitch SVN 30 Mar '07

30 Mar '07

Author: anthm Date: Fri Mar 30 13:31:21 2007 New Revision: 4811 Modified: freeswitch/trunk/Makefile.am Log: no more .noversion because it breaks things Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 30 13:31:21 2007 @@ -147,15 +147,13 @@ touch .version src/include/switch_version.h: $(top_srcdir)/src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS) - @if test ! -f .noversion ; then \ - force=0 ; \ - version=`svnversion . -n || echo hacked` ; \ - oldversion=`cat .version 2>/dev/null || echo "0"` ; \ - test ! -f src/include/switch_version.h || grep "@SVN_VERSION@" src/include/switch_version.h && force=1 ; \ - if test "$$oldversion" != "$$version" || test $$force = 1 ; then \ - cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$$version/g" > src/include/switch_version.h ; \ - echo $$version > .version ; \ - fi ; \ + @force=0 ; \ + version=`svnversion . -n || echo hacked` ; \ + oldversion=`cat .version 2>/dev/null || echo "0"` ; \ + test ! -f src/include/switch_version.h || grep "@SVN_VERSION@" src/include/switch_version.h && force=1 ; \ + if test "$$oldversion" != "$$version" || test $$force = 1 ; then \ + cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$$version/g" > src/include/switch_version.h ; \ + echo $$version > .version ; \ fi ; update:

1 0

[commit] r4810 - freeswitch/trunk/src
by Freeswitch SVN 30 Mar '07

30 Mar '07

Author: anthm Date: Fri Mar 30 13:25:48 2007 New Revision: 4810 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_sqldb.c freeswitch/trunk/src/switch_event.c Log: fix race Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Mar 30 13:25:48 2007 @@ -482,6 +482,7 @@ assert(runtime.memory_pool != NULL); switch_log_init(runtime.memory_pool); switch_event_init(runtime.memory_pool); + switch_core_sqldb_start(runtime.memory_pool); switch_rtp_init(runtime.memory_pool); runtime.running = 1; Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Fri Mar 30 13:25:48 2007 @@ -39,6 +39,7 @@ switch_core_db_t *event_db; switch_queue_t *sql_queue; switch_memory_pool_t *memory_pool; + int thread_running; } runtime; static switch_status_t switch_core_db_persistant_execute_trans(switch_core_db_t *db, char *sql, uint32_t retries) @@ -159,9 +160,8 @@ if (!runtime.event_db) { runtime.event_db = switch_core_db_handle(); } - switch_queue_create(&runtime.sql_queue, SWITCH_SQL_QUEUE_LEN, runtime.memory_pool); - + runtime.thread_running = 1; for (;;) { if (switch_queue_trypop(runtime.sql_queue, &pop) == SWITCH_STATUS_SUCCESS) { @@ -398,11 +398,15 @@ } } + switch_queue_create(&runtime.sql_queue, SWITCH_SQL_QUEUE_LEN, runtime.memory_pool); + switch_threadattr_create(&thd_attr, runtime.memory_pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, switch_core_sql_thread, NULL, runtime.memory_pool); - + while (!runtime.thread_running) { + switch_yield(10000); + } } void switch_core_sqldb_stop(void) Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Mar 30 13:25:48 2007 @@ -398,13 +398,14 @@ switch_threadattr_detach_set(thd_attr, 1); assert(pool != NULL); - RUNTIME_POOL = pool; - + THRUNTIME_POOL = RUNTIME_POOL = pool; + /* if (switch_core_new_memory_pool(&THRUNTIME_POOL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate memory pool\n"); return SWITCH_STATUS_MEMERR; } + */ /* if (switch_core_new_memory_pool(&BPOOL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not allocate memory pool\n");

1 0

[commit] r4809 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 30 Mar '07

30 Mar '07

Author: mikej Date: Fri Mar 30 13:14:28 2007 New Revision: 4809 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: I was told that the rules for spanish are the same as for english. So for now, I will add an interface using the same module and functions for "es". If there are changes to be made in the future, we can split this up into multiple modules. Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Fri Mar 30 13:14:28 2007 @@ -510,9 +510,15 @@ return SWITCH_STATUS_FALSE; } +static const switch_say_interface_t es_say_interface = { + /*.name */ "es", + /*.say_function */ en_say, +}; + static const switch_say_interface_t en_say_interface = { /*.name */ "en", /*.say_function */ en_say, + /*.next */ &es_say_interface }; static switch_loadable_module_interface_t say_en_module_interface = {

1 0

[commit] r4808 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 30 Mar '07

30 Mar '07

Author: anthm Date: Fri Mar 30 13:07:49 2007 New Revision: 4808 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile Fri Mar 30 13:07:49 2007 @@ -7,7 +7,7 @@ IKS_LA=$(IKS_DIR)/src/libiksemel.la DING_DIR=$(BASE)/libs/libdingaling LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include -LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(IKS_LA) +LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA) include $(BASE)/build/modmake.rules

1 0

[commit] r4807 - in freeswitch/trunk/src: . include mod/codecs/mod_g729 mod/endpoints/mod_dingaling
by Freeswitch SVN 30 Mar '07

30 Mar '07

Author: anthm Date: Fri Mar 30 12:41:12 2007 New Revision: 4807 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/switch_core_io.c Log: cleanup Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Mar 30 12:41:12 2007 @@ -180,6 +180,60 @@ */ #define switch_safe_free(it) if (it) {free(it);it=NULL;} + +/*! + \brief Test if one string is inside another with extra case checking + \param s the inner string + \param q the big string + \return SWITCH_TRUE or SWITCH_FALSE +*/ +static inline switch_bool_t switch_strstr(char *s, char *q) +{ + char *p, *S = NULL, *Q = NULL; + switch_bool_t tf = SWITCH_FALSE; + + if (strstr(s, q)) { + return SWITCH_TRUE; + } + + S = strdup(s); + + assert(S != NULL); + + for (p = S; p && *p; p++) { + *p = (char)toupper(*p); + } + + if (strstr(S, q)) { + tf = SWITCH_TRUE; + goto done; + } + + Q = strdup(q); + assert(Q != NULL); + + for (p = Q; p && *p; p++) { + *p = (char)toupper(*p); + } + + if (strstr(s, Q)) { + tf = SWITCH_TRUE; + goto done; + } + + if (strstr(S, Q)) { + tf = SWITCH_TRUE; + goto done; + } + + done: + switch_safe_free(S); + switch_safe_free(Q); + + return tf; +} + + /*! \brief Test for NULL or zero length string \param s the string to test Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Fri Mar 30 12:41:12 2007 @@ -154,10 +154,9 @@ } - if (encoded_data_len % 2 == 0) { - - if (encoded_data_len % 12 == 0) { + + if (encoded_data_len == 2 || encoded_data_len % 12 == 0) { return SWITCH_STATUS_BREAK; //divisor = 12; //plen = 10; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile Fri Mar 30 12:41:12 2007 @@ -1,13 +1,20 @@ BASE=../../../.. -DING_DIR=$(BASE)/libs/libdingaling -DINGLA=$(DING_DIR)/libdingaling.la +LOCAL_CFLAGS = `$(BASE)/libs/apr/apr-1-config --cflags --cppflags --includes` +LOCAL_CFLAGS += `$(BASE)/libs/apr-util/apu-1-config --includes` -LOCAL_CFLAGS=-I$(DING_DIR)/src -LOCAL_LIBADD=$(DINGLA) +IKS_DIR=$(BASE)/libs/iksemel +IKS_LA=$(IKS_DIR)/src/libiksemel.la +DING_DIR=$(BASE)/libs/libdingaling +LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include +LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(IKS_LA) include $(BASE)/build/modmake.rules -$(DINGLA): $(DING_DIR) $(DING_DIR)/.update - cd $(DING_DIR) && $(MAKE) - $(TOUCH_TARGET) +$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update + @cd $(IKS_DIR) && $(MAKE) + @$(TOUCH_TARGET) + + + + Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Mar 30 12:41:12 2007 @@ -2167,28 +2167,31 @@ break; case LDL_SIGNAL_SUBSCRIBE: + if (profile->user_flags & LDL_FLAG_COMPONENT && ldl_jid_domcmp(from, to)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Attempt to add presence from/to our own domain [%s][%s]\n", from, to); + } else { + if ((sql = switch_mprintf("delete from subscriptions where sub_from='%q' and sub_to='%q';\n" + "insert into subscriptions values('%q','%q','%q','%q');\n", from, to, from, to, msg, subject))) { + execute_sql(profile->dbname, sql, profile->mutex); + switch_core_db_free(sql); + } - if ((sql = switch_mprintf("delete from subscriptions where sub_from='%q' and sub_to='%q';\n" - "insert into subscriptions values('%q','%q','%q','%q');\n", from, to, from, to, msg, subject))) { - execute_sql(profile->dbname, sql, profile->mutex); - switch_core_db_free(sql); - } - - if (is_special(to)) { - ldl_handle_send_presence(profile->handle, to, from, NULL, NULL, "Click To Call"); - } + if (is_special(to)) { + ldl_handle_send_presence(profile->handle, to, from, NULL, NULL, "Click To Call"); + } #if 0 - if (is_special(to)) { - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", to); - //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "unknown"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Click To Call"); - switch_event_fire(&event); + if (is_special(to)) { + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", to); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "unknown"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Click To Call"); + switch_event_fire(&event); + } } - } #endif + } break; case LDL_SIGNAL_ROSTER: if (switch_event_create(&event, SWITCH_EVENT_ROSTER) == SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Mar 30 12:41:12 2007 @@ -133,6 +133,15 @@ case SWITCH_STATUS_NOOP: status = SWITCH_STATUS_SUCCESS; break; + case SWITCH_STATUS_BREAK: + memset(session->raw_read_frame.data, 255, read_frame->codec->implementation->bytes_per_frame); + session->raw_read_frame.datalen = read_frame->codec->implementation->bytes_per_frame; + session->raw_read_frame.samples = session->raw_read_frame.datalen / sizeof(int16_t); + session->raw_read_frame.timestamp = read_frame->timestamp; + session->raw_read_frame.rate = read_frame->rate; + read_frame = &session->raw_read_frame; + status = SWITCH_STATUS_SUCCESS; + break; default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s decoder error!\n", session->read_codec->codec_interface->interface_name); goto done;

1 0

[commit] r4805 - in freeswitch/trunk/src: . include mod/applications/mod_commands
by Freeswitch SVN 30 Mar '07

30 Mar '07

Author: anthm Date: Fri Mar 30 10:57:06 2007 New Revision: 4805 Modified: freeswitch/trunk/src/include/switch_scheduler.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_scheduler.c Log: tweaks Modified: freeswitch/trunk/src/include/switch_scheduler.h ============================================================================== --- freeswitch/trunk/src/include/switch_scheduler.h (original) +++ freeswitch/trunk/src/include/switch_scheduler.h Fri Mar 30 10:57:06 2007 @@ -67,16 +67,16 @@ /*! \brief Delete a scheduled task \param task_id the id of the task - \return SWITCH_STATUS_SUCCESS if the task was deleted. + \return the number of jobs deleted */ -SWITCH_DECLARE(switch_status_t) switch_scheduler_del_task_id(uint32_t task_id); +SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_id(uint32_t task_id); /*! \brief Delete a scheduled task based on the group name \param group the group name - \return SWITCH_STATUS_SUCCESS if any tasks were deleted + \return the number of jobs deleted */ -SWITCH_DECLARE(switch_status_t) switch_scheduler_del_task_group(char *group); +SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(char *group); /*! Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Mar 30 10:57:06 2007 @@ -158,7 +158,8 @@ typedef enum { SSHF_NONE = 0, SSHF_OWN_THREAD = (1 << 0), - SSHF_FREE_ARG = (1 << 1) + SSHF_FREE_ARG = (1 << 1), + SSHF_NO_DEL = (1 << 2) } switch_scheduler_flag_t; typedef enum { Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Mar 30 10:57:06 2007 @@ -54,6 +54,19 @@ #else #define switch_is_file_path(file) ((*file == '/') || strstr(file, SWITCH_URL_SEPARATOR)) #endif + +static inline switch_bool_t switch_is_digit_string(char *s) { + + while(s && *s) { + if (*s < 48 || *s > 57) { + return SWITCH_FALSE; + } + s++; + } + + return SWITCH_TRUE; +} + /*! \brief Evaluate the truthfullness of a string expression \param expr a string expression Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Mar 30 10:57:06 2007 @@ -705,6 +705,25 @@ switch_safe_free(stream.data); } +static switch_status_t sched_del_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +{ + uint32_t cnt = 0; + + if (switch_is_digit_string(cmd)) { + int64_t tmp; + tmp = (uint32_t) atoi(cmd); + if (tmp > 0) { + cnt = switch_scheduler_del_task_id((uint32_t)tmp); + } + } else { + cnt = switch_scheduler_del_task_group(cmd); + } + + stream->write_function(stream, "DELETED: %u\n", cnt); + + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t sched_api_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { char *tm = NULL, *dcmd, *group; @@ -729,7 +748,7 @@ } id = switch_scheduler_add_task(when, sch_api_callback, (char *) __SWITCH_FUNC__, group, 0, strdup(dcmd), SSHF_FREE_ARG); - stream->write_function(stream, "Added task %u for command [%s] group [%s]\n", id, dcmd, group); + stream->write_function(stream, "ADDED: %u\n", id); goto good; } } @@ -895,12 +914,20 @@ return SWITCH_STATUS_SUCCESS; } +static switch_api_interface_t sched_del_api_interface = { + /*.interface_name */ "sched_del", + /*.desc */ "Delete a Scheduled task", + /*.function */ sched_del_function, + /*.syntax */ "<task_id>|<group_id>", + /*.next */ NULL +}; + static switch_api_interface_t sched_api_api_interface = { /*.interface_name */ "sched_api", /*.desc */ "Schedule an api command", /*.function */ sched_api_function, /*.syntax */ "[+]<time> <group_name> <command_string>", - /*.next */ NULL + /*.next */ &sched_del_api_interface }; static switch_api_interface_t sched_transfer_api_interface = { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Mar 30 10:57:06 2007 @@ -489,7 +489,7 @@ switch_scheduler_task_thread_start(); runtime.initiated = switch_time_now(); - switch_scheduler_add_task(time(NULL), heartbeat_callback, "heartbeat", "core", 0, NULL, SSHF_NONE); + switch_scheduler_add_task(time(NULL), heartbeat_callback, "heartbeat", "core", 0, NULL, SSHF_NONE | SSHF_NO_DEL); switch_uuid_get(&uuid); Modified: freeswitch/trunk/src/switch_scheduler.c ============================================================================== --- freeswitch/trunk/src/switch_scheduler.c (original) +++ freeswitch/trunk/src/switch_scheduler.c Fri Mar 30 10:57:06 2007 @@ -187,15 +187,20 @@ return container->task.task_id; } -SWITCH_DECLARE(switch_status_t) switch_scheduler_del_task_id(uint32_t task_id) +SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_id(uint32_t task_id) { switch_scheduler_task_container_t *tp; - switch_status_t status = SWITCH_STATUS_FALSE; switch_event_t *event; + uint32_t delcnt = 0; switch_mutex_lock(globals.task_mutex); for (tp = globals.task_list; tp; tp = tp->next) { if (tp->task.task_id == task_id) { + if (switch_test_flag(tp, SSHF_NO_DEL)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Attempt made to delete undeleteable task #%u (group %s)\n", + tp->task.task_id, tp->task.group); + break; + } tp->destroyed++; if (switch_event_create(&event, SWITCH_EVENT_DEL_SCHEDULE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tp->task.task_id); @@ -204,24 +209,29 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime); switch_event_fire(&event); } - status = SWITCH_STATUS_SUCCESS; + delcnt++; break; } } switch_mutex_unlock(globals.task_mutex); - return status; + return delcnt; } -SWITCH_DECLARE(switch_status_t) switch_scheduler_del_task_group(char *group) +SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(char *group) { switch_scheduler_task_container_t *tp; - switch_status_t status = SWITCH_STATUS_FALSE; switch_event_t *event; + uint32_t delcnt = 0; switch_mutex_lock(globals.task_mutex); for (tp = globals.task_list; tp; tp = tp->next) { - if (!strcmp(tp->task.group, group)) { + if (!switch_strlen_zero(group) && !strcmp(tp->task.group, group)) { + if (switch_test_flag(tp, SSHF_NO_DEL)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Attempt made to delete undeleteable task #%u (group %s)\n", + tp->task.task_id, group); + continue; + } if (switch_event_create(&event, SWITCH_EVENT_DEL_SCHEDULE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tp->task.task_id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Desc", "%s", tp->desc); @@ -230,12 +240,12 @@ switch_event_fire(&event); } tp->destroyed++; - status = SWITCH_STATUS_SUCCESS; + delcnt++; } } switch_mutex_unlock(globals.task_mutex); - return status; + return delcnt; } SWITCH_DECLARE(void) switch_scheduler_task_thread_start(void)

1 0

[commit] r4804 - freeswitch/trunk/src
by Freeswitch SVN 30 Mar '07

30 Mar '07

Author: anthm Date: Fri Mar 30 09:47:56 2007 New Revision: 4804 Modified: freeswitch/trunk/src/switch_scheduler.c Log: picky, picky Modified: freeswitch/trunk/src/switch_scheduler.c ============================================================================== --- freeswitch/trunk/src/switch_scheduler.c (original) +++ freeswitch/trunk/src/switch_scheduler.c Fri Mar 30 09:47:56 2007 @@ -153,7 +153,7 @@ switch_zmalloc(container, sizeof(*container)); assert(func); container->func = func; - time(&container->task.created); + container->task.created = time(NULL); container->task.runtime = task_runtime; container->task.group = strdup(group ? group : "none"); container->task.cmd_id = cmd_id;

1 0

[commit] r4803 - in freeswitch/trunk/src: . include/private
by Freeswitch SVN 30 Mar '07

30 Mar '07

Author: mikej Date: Thu Mar 29 22:20:13 2007 New Revision: 4803 Modified: freeswitch/trunk/src/include/private/switch_core.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_memory.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_sqldb.c freeswitch/trunk/src/switch_core_state_machine.c Log: don't export our private functions. fix crash protection build. Modified: freeswitch/trunk/src/include/private/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core.h (original) +++ freeswitch/trunk/src/include/private/switch_core.h Thu Mar 29 22:20:13 2007 @@ -143,7 +143,8 @@ struct switch_media_bug *next; }; -SWITCH_DECLARE(void) switch_core_sqldb_start(switch_memory_pool_t *pool); -SWITCH_DECLARE(void) switch_core_sqldb_stop(void); -SWITCH_DECLARE(void) switch_core_session_init(switch_memory_pool_t *pool); -SWITCH_DECLARE(switch_memory_pool_t *) switch_core_memory_init(void); +void switch_core_sqldb_start(switch_memory_pool_t *pool); +void switch_core_sqldb_stop(void); +void switch_core_session_init(switch_memory_pool_t *pool); +void switch_core_state_machine_init(switch_memory_pool_t *pool); +switch_memory_pool_t *switch_core_memory_init(void); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Mar 29 22:20:13 2007 @@ -43,9 +43,6 @@ switch_time_t initiated; switch_hash_t *global_vars; switch_memory_pool_t *memory_pool; -#ifdef CRASH_PROT - switch_hash_t *stack_table; -#endif const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; int state_handler_index; FILE *console; @@ -426,8 +423,11 @@ switch_core_set_globals(); switch_core_session_init(runtime.memory_pool); + switch_core_state_machine_init(runtime.memory_pool); switch_core_hash_init(&runtime.global_vars, runtime.memory_pool); + + if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) { apr_terminate(); return SWITCH_STATUS_MEMERR; @@ -486,12 +486,6 @@ switch_rtp_init(runtime.memory_pool); runtime.running = 1; - -#ifdef CRASH_PROT - switch_core_hash_init(&runtime.stack_table, runtime.memory_pool); -#endif - - switch_scheduler_task_thread_start(); runtime.initiated = switch_time_now(); @@ -673,8 +667,6 @@ runtime.console = NULL; } - switch_yield(1000000); - switch_safe_free(SWITCH_GLOBAL_dirs.base_dir); switch_safe_free(SWITCH_GLOBAL_dirs.mod_dir); switch_safe_free(SWITCH_GLOBAL_dirs.conf_dir); Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Thu Mar 29 22:20:13 2007 @@ -212,7 +212,7 @@ return ptr; } -SWITCH_DECLARE(switch_memory_pool_t *) switch_core_memory_init(void) +switch_memory_pool_t *switch_core_memory_init(void) { memset(&runtime, 0, sizeof(runtime)); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Mar 29 22:20:13 2007 @@ -638,56 +638,6 @@ return session->thread_running; } -#ifdef CRASH_PROT -#if defined (__GNUC__) && defined (LINUX) -#include <execinfo.h> -#include <stdio.h> -#include <stdlib.h> -#define STACK_LEN 10 - -/* Obtain a backtrace and print it to stdout. */ -static void print_trace(void) -{ - void *array[STACK_LEN]; - size_t size; - char **strings; - size_t i; - - size = backtrace(array, STACK_LEN); - strings = backtrace_symbols(array, size); - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Obtained %zd stack frames.\n", size); - - for (i = 0; i < size; i++) { - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CRIT, "%s\n", strings[i]); - } - - free(strings); -} -#else -static void print_trace(void) -{ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Trace not avaliable =(\n"); -} -#endif - - -static void handle_fatality(int sig) -{ - switch_thread_id_t thread_id; - jmp_buf *env; - - if (sig && (thread_id = switch_thread_self()) - && (env = (jmp_buf *) apr_hash_get(runtime.stack_table, &thread_id, sizeof(thread_id)))) { - print_trace(); - longjmp(*env, sig); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Caught signal %d for unmapped thread!", sig); - abort(); - } -} -#endif - SWITCH_DECLARE(void) switch_core_session_destroy(switch_core_session_t **session) { @@ -900,7 +850,7 @@ } -SWITCH_DECLARE(void) switch_core_session_init(switch_memory_pool_t *pool) +void switch_core_session_init(switch_memory_pool_t *pool) { memset(&runtime, 0, sizeof(runtime)); runtime.session_limit = 1000; Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Thu Mar 29 22:20:13 2007 @@ -340,7 +340,7 @@ } -SWITCH_DECLARE(void) switch_core_sqldb_start(switch_memory_pool_t *pool) +void switch_core_sqldb_start(switch_memory_pool_t *pool) { switch_thread_t *thread; switch_threadattr_t *thd_attr;; @@ -405,7 +405,7 @@ } -SWITCH_DECLARE(void) switch_core_sqldb_stop(void) +void switch_core_sqldb_stop(void) { switch_queue_push(runtime.sql_queue, NULL); Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Thu Mar 29 22:20:13 2007 @@ -213,6 +213,66 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HIBERNATE\n"); } + +#ifdef CRASH_PROT +static switch_hash_t *stack_table; +#if defined (__GNUC__) && defined (LINUX) +#include <execinfo.h> +#include <stdio.h> +#include <stdlib.h> +#define STACK_LEN 10 + +/* Obtain a backtrace and print it to stdout. */ +static void print_trace(void) +{ + void *array[STACK_LEN]; + size_t size; + char **strings; + size_t i; + + size = backtrace(array, STACK_LEN); + strings = backtrace_symbols(array, size); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Obtained %zd stack frames.\n", size); + + for (i = 0; i < size; i++) { + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CRIT, "%s\n", strings[i]); + } + + free(strings); +} +#else +static void print_trace(void) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Trace not avaliable =(\n"); +} +#endif + + +static void handle_fatality(int sig) +{ + switch_thread_id_t thread_id; + jmp_buf *env; + + if (sig && (thread_id = switch_thread_self()) + && (env = (jmp_buf *) apr_hash_get(stack_table, &thread_id, sizeof(thread_id)))) { + print_trace(); + longjmp(*env, sig); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Caught signal %d for unmapped thread!", sig); + abort(); + } +} +#endif + +void switch_core_state_machine_init(switch_memory_pool_t *pool) +{ + (void)0; +#ifdef CRASH_PROT + switch_core_hash_init(&stack_table, pool); +#endif +} + SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session) { switch_channel_state_t state = CS_NEW, laststate = CS_HANGUP, midstate = CS_DONE, endstate; @@ -241,7 +301,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Thread has crashed for channel %s\n", switch_channel_get_name(session->channel)); switch_channel_hangup(session->channel, SWITCH_CAUSE_CRASH); } else { - apr_hash_set(runtime.stack_table, &thread_id, sizeof(thread_id), &env); + apr_hash_set(stack_table, &thread_id, sizeof(thread_id), &env); } #endif /* @@ -596,7 +656,7 @@ switch_mutex_unlock(session->mutex); #ifdef CRASH_PROT - apr_hash_set(runtime.stack_table, &thread_id, sizeof(thread_id), NULL); + apr_hash_set(stack_table, &thread_id, sizeof(thread_id), NULL); #endif session->thread_running = 0;

1 0

[commit] r4802 - in freeswitch/trunk: . src src/include
by Freeswitch SVN 30 Mar '07

30 Mar '07

Author: mikej Date: Thu Mar 29 21:40:50 2007 New Revision: 4802 Modified: freeswitch/trunk/configure.in freeswitch/trunk/src/include/switch_am_config.h.in freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/include/switch_scheduler.h freeswitch/trunk/src/switch_scheduler.c Log: use int64_t internally for storage of time_t values in the scheduler because at least then we know what format string to use to print them, and they are often that type anyways. Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Mar 29 21:40:50 2007 @@ -171,7 +171,6 @@ AC_CHECK_SIZEOF(long, 4) AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(long long, 8) -AC_CHECK_SIZEOF(time_t, 4) AC_TYPE_SIZE_T AC_CHECK_TYPE(ssize_t, int) @@ -247,16 +246,6 @@ size_t_fmt='#error Can not determine the proper size for size_t' fi -if test "$ac_cv_sizeof_time_t" = "$ac_cv_sizeof_long"; then - time_t_fmt='#define TIME_T_FMT "ld"' -elif test "$ac_cv_sizeof_time_t" = "$ac_cv_sizeof_int"; then - time_t_fmt='#define TIME_T_FMT "d"' -elif test "$ac_cv_sizeof_time_t" = "$ac_cv_sizeof_long_long"; then - time_t_fmt='#define TIME_T_FMT "lld"' -else - time_t_fmt='#error Can not determine the proper format specifier for time_t of size $ac_cv_sizeof_time_t' -fi - # Basically, we have tried to figure out the correct format strings # for SWITCH types which vary between platforms, but we don't always get # it right. If you find that we don't get it right for your platform, @@ -305,7 +294,6 @@ AC_SUBST(uint64_t_fmt) AC_SUBST(ssize_t_fmt) AC_SUBST(size_t_fmt) -AC_SUBST(time_t_fmt) AC_PATH_PROGS(ZCAT, gunzip gzcat gzip zcat) AC_PATH_PROGS(TAR, gtar tar) Modified: freeswitch/trunk/src/include/switch_am_config.h.in ============================================================================== --- freeswitch/trunk/src/include/switch_am_config.h.in (original) +++ freeswitch/trunk/src/include/switch_am_config.h.in Thu Mar 29 21:40:50 2007 @@ -15,6 +15,5 @@ @size_t_fmt@ @int64_t_fmt@ @uint64_t_fmt@ -@time_t_fmt@ #endif Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Thu Mar 29 21:40:50 2007 @@ -201,12 +201,6 @@ #define SWITCH_INT64_T_FMT "I64d" #define SWITCH_UINT64_T_FMT "I64u" -#ifdef _USE_32BIT_TIME_T -#define TIME_T_FMT "d" -#else -#define TIME_T_FMT SWITCH_INT64_T_FMT -#endif - #else #ifndef SWITCH_SSIZE_T_FMT #define SWITCH_SSIZE_T_FMT (sizeof (switch_ssize_t) == sizeof (long) ? "ld" : sizeof (switch_ssize_t) == sizeof (int) ? "d" : "lld") Modified: freeswitch/trunk/src/include/switch_scheduler.h ============================================================================== --- freeswitch/trunk/src/include/switch_scheduler.h (original) +++ freeswitch/trunk/src/include/switch_scheduler.h Thu Mar 29 21:40:50 2007 @@ -40,8 +40,8 @@ ///\ingroup core1 ///\{ struct switch_scheduler_task { - time_t created; - time_t runtime; + int64_t created; + int64_t runtime; uint32_t cmd_id; char *group; void *cmd_arg; Modified: freeswitch/trunk/src/switch_scheduler.c ============================================================================== --- freeswitch/trunk/src/switch_scheduler.c (original) +++ freeswitch/trunk/src/switch_scheduler.c Thu Mar 29 21:40:50 2007 @@ -2,7 +2,7 @@ struct switch_scheduler_task_container { switch_scheduler_task_t task; - time_t executed; + int64_t executed; int in_thread; int destroyed; switch_scheduler_func_t func; @@ -35,7 +35,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tp->task.task_id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Desc", "%s", tp->desc); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Group", "%s", switch_str_nil(tp->task.group)); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" TIME_T_FMT, tp->task.runtime); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime); switch_event_fire(&event); } } else { @@ -43,7 +43,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tp->task.task_id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Desc", "%s", tp->desc); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Group", "%s", switch_str_nil(tp->task.group)); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" TIME_T_FMT, tp->task.runtime); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime); switch_event_fire(&event); } tp->destroyed = 1; @@ -75,7 +75,7 @@ if (done) { tp->destroyed = 1; } else { - time_t now = time(NULL); + int64_t now = time(NULL); if (now >= tp->task.runtime && !tp->in_thread) { tp->executed = now; if (switch_test_flag(tp, SSHF_OWN_THREAD)) { @@ -174,14 +174,14 @@ switch_mutex_unlock(globals.task_mutex); tp = container; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Added task %u %s (%s) to run at %" TIME_T_FMT "\n", - tp->task.task_id, tp->desc, switch_str_nil(tp->task.group), task_runtime); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Added task %u %s (%s) to run at %" SWITCH_INT64_T_FMT "\n", + tp->task.task_id, tp->desc, switch_str_nil(tp->task.group), tp->task.runtime); if (switch_event_create(&event, SWITCH_EVENT_ADD_SCHEDULE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tp->task.task_id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Desc", "%s", tp->desc); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Group", "%s", switch_str_nil(tp->task.group)); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" TIME_T_FMT, tp->task.runtime); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime); switch_event_fire(&event); } return container->task.task_id; @@ -201,7 +201,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tp->task.task_id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Desc", "%s", tp->desc); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Group", "%s", switch_str_nil(tp->task.group)); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" TIME_T_FMT, tp->task.runtime); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime); switch_event_fire(&event); } status = SWITCH_STATUS_SUCCESS; @@ -226,7 +226,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tp->task.task_id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Desc", "%s", tp->desc); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Group", "%s", switch_str_nil(tp->task.group)); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" TIME_T_FMT, tp->task.runtime); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime); switch_event_fire(&event); } tp->destroyed++;

1 0

[commit] r4801 - in freeswitch/trunk: libs/libteletone/src src/include w32/Library
by Freeswitch SVN 30 Mar '07

30 Mar '07

Author: mikej Date: Thu Mar 29 21:22:45 2007 New Revision: 4801 Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: spring cleaning on msvc build. Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone.h Thu Mar 29 21:22:45 2007 @@ -59,7 +59,7 @@ #endif #ifdef _MSC_VER -#define int16_t __int16 +typedef __int16 int16_t; #endif #include <libteletone_generate.h> Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Thu Mar 29 21:22:45 2007 @@ -58,6 +58,11 @@ * C4610: struct can never be instantiated - user defined constructor required */ #pragma warning(disable:4100 4200 4204 4706 4819 4132 4510 4512 4610 4996) + +#pragma include_alias(<libteletone.h>, <../../libs/libteletone/src/libteletone.h>) +#pragma include_alias(<libteletone_generate.h>, <../../libs/libteletone/src/libteletone_generate.h>) +#pragma include_alias(<libteletone_detect.h>, <../../libs/libteletone/src/libteletone_detect.h>) + #if (_MSC_VER >= 1400) // VC8+ #ifndef _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Thu Mar 29 21:22:45 2007 @@ -248,10 +248,74 @@ > </File> <File + RelativePath="..\..\src\switch_core_asr.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_codec.c" + > + </File> + <File RelativePath="..\..\src\switch_core_db.c" > </File> <File + RelativePath="..\..\src\switch_core_directory.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_event_hook.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_file.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_hash.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_io.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_media_bug.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_memory.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_port_allocator.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_rwlock.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_session.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_speech.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_sqldb.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_state_machine.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_timer.c" + > + </File> + <File RelativePath="..\..\src\switch_event.c" > </File> @@ -260,6 +324,26 @@ > </File> <File + RelativePath="..\..\src\switch_ivr_async.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr_bridge.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr_menu.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr_originate.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr_play_say.c" + > + </File> + <File RelativePath="..\..\src\switch_loadable_module.c" > </File> @@ -280,6 +364,10 @@ > </File> <File + RelativePath="..\..\src\switch_scheduler.c" + > + </File> + <File RelativePath="..\..\src\switch_stun.c" > </File> @@ -306,6 +394,10 @@ > </File> <File + RelativePath="..\..\src\include\switch_bitpack.h" + > + </File> + <File RelativePath="..\..\src\include\switch_buffer.h" > </File> @@ -318,6 +410,10 @@ > </File> <File + RelativePath="..\..\src\include\switch_config.h" + > + </File> + <File RelativePath="..\..\src\include\switch_console.h" > </File> @@ -326,10 +422,18 @@ > </File> <File + RelativePath="..\..\src\include\private\switch_core.h" + > + </File> + <File RelativePath="..\..\src\include\switch_core_db.h" > </File> <File + RelativePath="..\..\src\include\switch_core_event_hook.h" + > + </File> + <File RelativePath="..\..\src\include\switch_event.h" > </File> @@ -370,6 +474,14 @@ > </File> <File + RelativePath="..\..\src\include\switch_scheduler.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_sqlite.h" + > + </File> + <File RelativePath="..\..\src\include\switch_stun.h" > </File> @@ -382,6 +494,10 @@ > </File> <File + RelativePath="..\..\src\include\switch_version.h" + > + </File> + <File RelativePath="..\..\src\include\switch_xml.h" > </File>

1 0