- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[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

[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

[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

[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

[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

[commit] r10146 - freeswitch/trunk
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: mikej Date: Fri Oct 24 18:07:15 2008 New Revision: 10146 Modified: freeswitch/trunk/Freeswitch.2008.sln Log: add some missing dependencies causing first build failure (FSBUILD-86) Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri Oct 24 18:07:15 2008 @@ -916,6 +916,9 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flite", "libs\win32\flite\flite.2008.vcproj", "{0AD1177E-1FD8-4643-9391-431467A11084}" + ProjectSection(ProjectDependencies) = postProject + {D5D2BF72-29FE-4982-A9FA-82FDD086DB1B} = {D5D2BF72-29FE-4982-A9FA-82FDD086DB1B} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_flite", "src\mod\asr_tts\mod_flite\mod_flite.2008.vcproj", "{66444AEE-554C-11DD-A9F0-8C5D56D89593}" ProjectSection(ProjectDependencies) = postProject @@ -954,6 +957,9 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libs\win32\libogg\libogg.2008.vcproj", "{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}" + ProjectSection(ProjectDependencies) = postProject + {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} = {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_snom", "src\mod\applications\mod_snom\mod_snom.2008.vcproj", "{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}" ProjectSection(ProjectDependencies) = postProject

1 0

[commit] r10145 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: anthm Date: Fri Oct 24 16:30:33 2008 New Revision: 10145 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: add data to params Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Oct 24 16:30:33 2008 @@ -205,6 +205,7 @@ switch_assert(params); switch_channel_event_set_data(channel, params); + switch_caller_profile_event_set_data(caller_profile, "Hunt", params); status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, params); switch_event_destroy(&params);

1 0

[commit] r10144 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: anthm Date: Fri Oct 24 16:12:08 2008 New Revision: 10144 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: revert patch Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Oct 24 16:12:08 2008 @@ -204,10 +204,6 @@ switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); - if (!switch_strlen_zero(caller_profile->context)) { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Hunt-Context", caller_profile->context); - } - switch_channel_event_set_data(channel, params); status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, params);

1 0

[commit] r10143 - freeswitch/trunk/src
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: anthm Date: Fri Oct 24 15:31:41 2008 New Revision: 10143 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: oops Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Oct 24 15:31:41 2008 @@ -954,7 +954,6 @@ } else { vdata = NULL; } - printf("WTF [%s][%s]\n", vdata, chan_type); if ((chan_data = strchr(chan_type, '/')) != 0) { *chan_data = '\0';

1 0