October 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r10179 - freeswitch/trunk/src
by Freeswitch SVN 28 Oct '08

28 Oct '08

Author: anthm Date: Tue Oct 28 12:01:15 2008 New Revision: 10179 Modified: freeswitch/trunk/src/switch_core_state_machine.c Log: tweak 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 Tue Oct 28 12:01:15 2008 @@ -78,7 +78,7 @@ for (x = 0; x < argc; x++) { char *dpname = dp[x]; char *dparg = NULL; - + if (dpname) { if ((dparg = strchr(dpname, ':'))) { *dparg++ = '\0'; @@ -89,7 +89,7 @@ if (!(dialplan_interface = switch_loadable_module_get_dialplan_interface(dpname))) { continue; } - + count++; if ((extension = dialplan_interface->hunt_function(session, dparg, NULL)) != 0) { @@ -103,8 +103,13 @@ if (!count) { if (switch_channel_test_flag(session->channel, CF_OUTBOUND)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Dialplan, changing state to HOLD\n"); - switch_channel_set_state(session->channel, CS_CONSUME_MEDIA); + if (switch_channel_test_flag(session->channel, CF_ANSWERED)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No Dialplan on answered channel, changing state to HANGUP\n"); + switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No Dialplan, changing state to CONSUME_MEDIA\n"); + switch_channel_set_state(session->channel, CS_CONSUME_MEDIA); + } goto end; } }

1 0

[Freeswitch-svn] [commit] r10178 - freeswitch/trunk/src
by Freeswitch SVN 28 Oct '08

28 Oct '08

Author: anthm Date: Tue Oct 28 09:19:37 2008 New Revision: 10178 Modified: freeswitch/trunk/src/switch_core_memory.c Log: update Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Tue Oct 28 09:19:37 2008 @@ -35,6 +35,7 @@ //#define DEBUG_ALLOC2 //#define DESTROY_POOLS //#define PER_POOL_LOCK +//#define INSTANTLY_DESTROY_POOLS #include <switch.h> #include "private/switch_core_pvt.h" @@ -260,6 +261,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_perform_new_memory_pool(switch_memory_pool_t **pool, const char *file, const char *func, int line) { char *tmp; +#ifdef INSTANTLY_DESTROY_POOLS + apr_pool_create(pool, NULL); + switch_assert(*pool != NULL); +#else + #ifdef PER_POOL_LOCK apr_allocator_t *my_allocator = NULL; apr_thread_mutex_t *my_mutex; @@ -298,6 +304,7 @@ switch_assert(*pool != NULL); } #endif +#endif #ifdef DEBUG_ALLOC2 switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "New Pool\n"); @@ -317,9 +324,14 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "Free Pool\n"); #endif +#ifdef INSTANTLY_DESTROY_POOLS + apr_pool_destroy(*pool); +#else if ((memory_manager.pool_thread_running != 1) || (switch_queue_push(memory_manager.pool_queue, *pool) != SWITCH_STATUS_SUCCESS)) { apr_pool_destroy(*pool); } +#endif + *pool = NULL; return SWITCH_STATUS_SUCCESS; @@ -354,6 +366,9 @@ SWITCH_DECLARE(void) switch_core_memory_reclaim(void) { +#ifdef INSTANTLY_DESTROY_POOLS + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Recycled memory pool(s) disabled.\n"); +#else switch_memory_pool_t *pool; void *pop = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Returning %d recycled memory pool(s)\n", @@ -366,6 +381,7 @@ } apr_pool_destroy(pool); } +#endif } static void *SWITCH_THREAD_FUNC pool_thread(switch_thread_t *thread, void *obj) @@ -425,16 +441,20 @@ void switch_core_memory_stop(void) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping memory pool queue.\n"); +#ifndef INSTANTLY_DESTROY_POOLS memory_manager.pool_thread_running = -1; while (memory_manager.pool_thread_running) { switch_yield(1000); } +#endif } switch_memory_pool_t *switch_core_memory_init(void) { +#ifndef INSTANTLY_DESTROY_POOLS switch_thread_t *thread; switch_threadattr_t *thd_attr; +#endif #ifdef PER_POOL_LOCK apr_allocator_t *my_allocator = NULL; apr_thread_mutex_t *my_mutex; @@ -465,6 +485,14 @@ #endif switch_mutex_init(&memory_manager.mem_lock, SWITCH_MUTEX_NESTED, memory_manager.memory_pool); + +#ifdef INSTANTLY_DESTROY_POOLS + { + void *foo; + foo = (void*)(intptr_t)pool_thread; + } +#else + switch_queue_create(&memory_manager.pool_queue, 50000, memory_manager.memory_pool); switch_queue_create(&memory_manager.pool_recycle_queue, 50000, memory_manager.memory_pool); @@ -477,6 +505,7 @@ while (!memory_manager.pool_thread_running) { switch_yield(1000); } +#endif return memory_manager.memory_pool; }

1 0

[Freeswitch-svn] [commit] r10177 - freeswitch/trunk/scripts/trace
by Freeswitch SVN 28 Oct '08

28 Oct '08

Author: brian Date: Tue Oct 28 06:22:31 2008 New Revision: 10177 Modified: freeswitch/trunk/scripts/trace/sipgrep Log: FSSCRIPTS-7 Modified: freeswitch/trunk/scripts/trace/sipgrep ============================================================================== --- freeswitch/trunk/scripts/trace/sipgrep (original) +++ freeswitch/trunk/scripts/trace/sipgrep Tue Oct 28 06:22:31 2008 @@ -23,7 +23,7 @@ $colorsmethods="INVITE|REGISTER|BYE|ACK|CANCEL|OPTIONS|REFER|NOTIFY|MESSAGE|INFO|PRACK|UPDATE"; %options=(); -getopts("f:t:l:ahVp:TcCnArm:",\%options); +getopts("f:t:l:ahVp:d:TcCnArm:",\%options); $version=<<END; Sipgrep version 0.2 @@ -32,7 +32,7 @@ END $usage=<<END; -Usage: sipgrep <-h> <-f number> <-t number> <-a> <-l file> <-V> <-p> <-T> <-n|-c> +Usage: sipgrep <-h> <-f number> <-t number> <-a> <-l file> <-V> <-p> <-d device> <-T> <-n|-c> -h Displays this help message. -A Match anything. @@ -42,6 +42,7 @@ -a Search the ARG from '-f' and '-t' parameters in To and From fields. -l ARG Debug file name. -V Displays the current version. + -d Device for ngrep. -p Port for ngrep. -T Parameter for ngrep. Indicating the delta between packet matches. -C Allow colors in debug file. @@ -68,6 +69,9 @@ #TimeStamp $ngrep_flags .= sprintf(" %s", (defined $options{T}) ? "-T" : "-t" ); +#Device +$ngrep_flags .= sprintf(" -d %s", (defined $options{d}) ? $options{d} : "eth0" ); + #Port $ngrep_flags .= sprintf(" port %d", (defined $options{p}) ? $options{p} : "5060" );

1 0

[Freeswitch-svn] [commit] r10176 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 28 Oct '08

28 Oct '08

Author: brian Date: Tue Oct 28 05:53:46 2008 New Revision: 10176 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: timestampes eh Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Tue Oct 28 05:53:46 2008 @@ -94,7 +94,7 @@  <param name="tls-version" value="$${sip_tls_version}"/> -  +

1 0

[Freeswitch-svn] [commit] r10175 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 28 Oct '08

28 Oct '08

Author: brian Date: Mon Oct 27 22:50:18 2008 New Revision: 10175 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: tweak to mod_limit for the db_function used in the dialplan Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Mon Oct 27 22:50:18 2008 @@ -375,7 +375,7 @@ argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); } - if (argc < 4 || !argv[0]) { + if (argc < 3 || !argv[0]) { goto error; }

1 0

[Freeswitch-svn] [commit] r10174 - freeswitch/trunk/src
by Freeswitch SVN 27 Oct '08

27 Oct '08

Author: anthm Date: Mon Oct 27 13:14:55 2008 New Revision: 10174 Modified: freeswitch/trunk/src/switch_ivr.c Log: fix park flag Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Oct 27 13:14:55 2008 @@ -1711,8 +1711,9 @@ SWITCH_DECLARE(void) switch_ivr_park_session(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); - switch_channel_set_state_flag(channel, CF_TRANSFER); switch_channel_set_state(channel, CS_PARK); + switch_channel_set_flag(channel, CF_TRANSFER); + } SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint32_t delay_ms)

1 0

[Freeswitch-svn] [commit] r10173 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 27 Oct '08

27 Oct '08

Author: anthm Date: Mon Oct 27 11:10:22 2008 New Revision: 10173 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: update Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Oct 27 11:10:22 2008 @@ -1126,24 +1126,27 @@ } + listener->event_list[SWITCH_EVENT_CHANNEL_ANSWER] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_APPLICATION] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_BRIDGE] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_CREATE] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_DATA] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_DESTROY] = 1; - listener->event_list[SWITCH_EVENT_CHANNEL_STATE] = 1; - listener->event_list[SWITCH_EVENT_CHANNEL_ANSWER] = 1; - listener->event_list[SWITCH_EVENT_CHANNEL_HANGUP] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_EXECUTE] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE] = 1; - listener->event_list[SWITCH_EVENT_CHANNEL_BRIDGE] = 1; - listener->event_list[SWITCH_EVENT_CHANNEL_UNBRIDGE] = 1; - listener->event_list[SWITCH_EVENT_CHANNEL_PROGRESS] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_HANGUP] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_ORIGINATE] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_OUTGOING] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_PARK] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_PROGRESS] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_STATE] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_UNBRIDGE] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_UNPARK] = 1; - listener->event_list[SWITCH_EVENT_CHANNEL_APPLICATION] = 1; - listener->event_list[SWITCH_EVENT_TALK] = 1; + listener->event_list[SWITCH_EVENT_DETECTED_SPEECH] = 1; listener->event_list[SWITCH_EVENT_DTMF] = 1; listener->event_list[SWITCH_EVENT_NOTALK] = 1; - listener->event_list[SWITCH_EVENT_DETECTED_SPEECH] = 1; + listener->event_list[SWITCH_EVENT_TALK] = 1; switch_set_flag_locked(listener, LFLAG_MYEVENTS); switch_set_flag_locked(listener, LFLAG_EVENTS); if (strstr(cmd, "xml") || strstr(cmd, "XML")) {

1 0

[Freeswitch-svn] [commit] r10158 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 26 Oct '08

26 Oct '08

Author: anthm Date: Sun Oct 26 17:08:22 2008 New Revision: 10158 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: update Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sun Oct 26 17:08:22 2008 @@ -1048,15 +1048,43 @@ switch_snprintf(reply, reply_len, "+OK"); goto done; } else if (listener->session && !strncasecmp(cmd, "sendmsg", 7)) { - if (switch_test_flag(listener, LFLAG_ASYNC)) { - if ((status = switch_core_session_queue_private_event(listener->session, event)) == SWITCH_STATUS_SUCCESS) { + char *uuid = cmd + 8; + switch_core_session_t *session = NULL; + + if (uuid) { + while (*uuid == ' ') { + uuid++; + } + + if (*uuid == '\r' || *uuid == '\n') { + uuid = NULL; + } else { + strip_cr(uuid); + } + } + + if (!uuid) { + uuid = switch_event_get_header(*event, "session-id"); + } + + if (uuid && (session = switch_core_session_locate(uuid))) { + if ((status = switch_core_session_queue_private_event(session, event)) == SWITCH_STATUS_SUCCESS) { switch_snprintf(reply, reply_len, "+OK"); } else { switch_snprintf(reply, reply_len, "-ERR memory error"); } + switch_core_session_rwunlock(session); } else { - switch_ivr_parse_event(listener->session, *event); - switch_snprintf(reply, reply_len, "+OK"); + if (switch_test_flag(listener, LFLAG_ASYNC)) { + if ((status = switch_core_session_queue_private_event(listener->session, event)) == SWITCH_STATUS_SUCCESS) { + switch_snprintf(reply, reply_len, "+OK"); + } else { + switch_snprintf(reply, reply_len, "-ERR memory error"); + } + } else { + switch_ivr_parse_event(listener->session, *event); + switch_snprintf(reply, reply_len, "+OK"); + } } goto done; } else if (!strncasecmp(cmd, "getvar", 6)) { @@ -1173,8 +1201,8 @@ if (!uuid) { uuid = switch_event_get_header(*event, "session-id"); } - - if ((session = switch_core_session_locate(uuid))) { + + if (uuid && (session = switch_core_session_locate(uuid))) { if ((status = switch_core_session_queue_private_event(session, event)) == SWITCH_STATUS_SUCCESS) { switch_snprintf(reply, reply_len, "+OK"); } else { @@ -1182,7 +1210,7 @@ } switch_core_session_rwunlock(session); } else { - switch_snprintf(reply, reply_len, "-ERR invalid session id [%s]", uuid); + switch_snprintf(reply, reply_len, "-ERR invalid session id [%s]", switch_str_nil(uuid)); } goto done;

1 0

[Freeswitch-svn] [commit] r10155 - freeswitch/trunk/src/mod/say/mod_say_zh
by Freeswitch SVN 26 Oct '08

26 Oct '08

Author: coppice Date: Sun Oct 26 00:20:33 2008 New Revision: 10155 Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c Log: Added smarter date reading, but its currently disabled. A freeswitch style equivalent of mktime() is needed to make this a proper piece of Freeswitch code. Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c Sun Oct 26 00:20:33 2008 @@ -290,41 +290,41 @@ } -static switch_status_t zh_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) -{ - char *a, *b, *c, *d; - if (!(a = switch_core_session_strdup(session, tosay))) { - return SWITCH_STATUS_FALSE; - } - - if (!(b = strchr(a, '.'))) { - return SWITCH_STATUS_FALSE; - } - - *b++ = '\0'; - - if (!(c = strchr(b, '.'))) { - return SWITCH_STATUS_FALSE; - } - - *c++ = '\0'; - - if (!(d = strchr(c, '.'))) { - return SWITCH_STATUS_FALSE; - } - - *d++ = '\0'; - - say_num(atoi(a), method); - say_file("digits/dot.wav"); - say_num(atoi(b), method); - say_file("digits/dot.wav"); - say_num(atoi(c), method); - say_file("digits/dot.wav"); - say_num(atoi(d), method); - - return SWITCH_STATUS_SUCCESS; -} +static switch_status_t zh_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) +{ + char *a, *b, *c, *d; + if (!(a = switch_core_session_strdup(session, tosay))) { + return SWITCH_STATUS_FALSE; + } + + if (!(b = strchr(a, '.'))) { + return SWITCH_STATUS_FALSE; + } + + *b++ = '\0'; + + if (!(c = strchr(b, '.'))) { + return SWITCH_STATUS_FALSE; + } + + *c++ = '\0'; + + if (!(d = strchr(c, '.'))) { + return SWITCH_STATUS_FALSE; + } + + *d++ = '\0'; + + say_num(atoi(a), method); + say_file("digits/dot.wav"); + say_num(atoi(b), method); + say_file("digits/dot.wav"); + say_num(atoi(c), method); + say_file("digits/dot.wav"); + say_num(atoi(d), method); + + return SWITCH_STATUS_SUCCESS; +} static switch_status_t zh_say_time(switch_core_session_t *session, char *tosay, @@ -335,6 +335,10 @@ int32_t t; switch_time_t target = 0; switch_time_exp_t tm; +#if 0 + switch_time_t this_morning; + switch_time_exp_t tm2; +#endif uint8_t say_date = 0; uint8_t say_time = 0; @@ -447,6 +451,55 @@ say_num(tm.tm_mday, SSM_PRONOUNCED); say_file("time/day.wav"); say_file("time/day-%d.wav", tm.tm_wday); + +#if 0 + tm = *localtime(&then); + + this_morning = switch_timestamp_now(); + switch_time_exp_lt(&tm2, this_morning); + tm2->tm_hour = 0; + tm2->tm_min = 0; + tm2->tm_sec = 0; + this_morning = mktime(tm2); + + if (this_morning <= then && then < (this_morning + 86400L)) + { + say_file("time/today.wav"); + } + else if ((this_morning - 86400L) <= then && then < this_morning) + { + say_file("time/yesterday.wav"); + } + else if ((this_morning + 86400L) <= then && then < (this_morning + 2*86400L)) + { + say_file("time/tomorrow.wav"); + } + else if ((this_morning - 7*86400L) <= then && then < this_morning) + { + say_file("time/day-%d.wav", tm.tm_wday); + } + else + { + if (tm2->tm_year != tm.tm_year) + { + say_num(tm.tm_year + 1900, SSM_ITERATED); + say_file("time/year.wav"); + } + /*endif*/ + if (tm2->tm_year != tm.tm_year + || + tm2->tm_mon != tm.tm_mon) + { + say_num(tm.tm_mon + 1, SSM_PRONOUNCED); + say_file("time/month.wav"); + } + /*endif*/ + /* Always say the day and the day of the week */ + say_num(tm.tm_mday, SSM_PRONOUNCED); + say_file("time/day.wav"); + say_file("time/day-%d.wav", tm.tm_wday); + } +#endif } if (say_time) {

1 0

[Freeswitch-svn] [commit] r10149 - freeswitch/trunk/libs/iksemel/src
by Freeswitch SVN 26 Oct '08

26 Oct '08

Author: anthm Date: Sat Oct 25 20:44:53 2008 New Revision: 10149 Modified: freeswitch/trunk/libs/iksemel/src/iks.c Log: shrug Modified: freeswitch/trunk/libs/iksemel/src/iks.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/iks.c (original) +++ freeswitch/trunk/libs/iksemel/src/iks.c Sat Oct 25 20:44:53 2008 @@ -507,6 +507,9 @@ size++; size += strlen (IKS_TAG_NAME (y)); for (z = IKS_TAG_ATTRIBS (y); z; z = z->next) { + if (z->type == IKS_NONE) { + continue; + } size += 4 + strlen (IKS_ATTRIB_NAME (z)) + escape_size (IKS_ATTRIB_VALUE (z), strlen (IKS_ATTRIB_VALUE (z))); }

1 0