- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3908 - in freeswitch/trunk: libs/sofia-sip src/mod/endpoints/mod_woomera
by Freeswitch SVN 04 Jan '07

04 Jan '07

Author: anthm Date: Thu Jan 4 13:02:05 2007 New Revision: 3908 Added: freeswitch/trunk/libs/sofia-sip/.update Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: trigger sofia rebuild Added: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Jan 4 13:02:05 2007 @@ -0,0 +1 @@ +Thu Jan 4 13:01:49 EST 2007 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Thu Jan 4 13:02:05 2007 @@ -667,12 +667,16 @@ } status = switch_socket_recv(fd, ptr, &len); - if (SWITCH_STATUS_IS_BREAK(status)) { + + if (status == 70007) { + char bbuf = '\n'; + switch_size_t blen = sizeof(bbuf); + switch_socket_send(fd, &bbuf, &blen); continue; } if (status != SWITCH_STATUS_SUCCESS) { - return -1; + return -1; } ptr++; @@ -804,6 +808,7 @@ if (switch_socket_create(new_sock, AF_INET, SOCK_STREAM, 0, module_pool) != SWITCH_STATUS_SUCCESS) { return -1; } + /* status = switch_socket_bind((*new_sock), sa); if (0 && status != SWITCH_STATUS_SUCCESS) { @@ -815,6 +820,9 @@ return -1; } + switch_socket_timeout_set((*new_sock), 10000000); + switch_socket_opt_set((*new_sock), SWITCH_SO_KEEPALIVE, 1); + return 1; }

1 0

[commit] r3907 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 04 Jan '07

04 Jan '07

Author: anthm Date: Thu Jan 4 13:00:13 2007 New Revision: 3907 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add dtmf function to conference Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Jan 4 13:00:13 2007 @@ -2338,8 +2338,8 @@ switch_mutex_lock(member->flag_mutex); switch_clear_flag(member, MFLAG_RUNNING); switch_set_flag(member, MFLAG_KICKED); - switch_mutex_unlock(member->flag_mutex); switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); + switch_mutex_unlock(member->flag_mutex); if (stream != NULL) { stream->write_function(stream, "OK kicked %u\n", member->id); @@ -2361,6 +2361,47 @@ return ret_status; } + +static switch_status_t conf_api_sub_dtmf(conference_member_t *member, switch_stream_handle_t *stream, void *data) +{ + switch_event_t *event; + char *dtmf = (char *) data; + + if (member == NULL) { + stream->write_function(stream, "Invalid member!\n"); + return SWITCH_STATUS_GENERR; + } + + if (switch_strlen_zero(dtmf)) { + stream->write_function(stream, "Invalid input!\n"); + return SWITCH_STATUS_GENERR; + } + + + switch_mutex_lock(member->flag_mutex); + switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); + switch_core_session_send_dtmf(member->session, dtmf); + switch_mutex_unlock(member->flag_mutex); + + + if (stream != NULL) { + stream->write_function(stream, "OK sent %s to %u\n", (char *) data, member->id); + } + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", member->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "dtmf-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Digits", dtmf); + switch_event_fire(&event); + } + + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t conf_api_sub_energy(conference_member_t *member, switch_stream_handle_t *stream, void *data) { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; @@ -2990,6 +3031,7 @@ {"say", &conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"}, {"saymember", &conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE, "<confname> saymember <member_id> <text>"}, {"stop", &conf_api_sub_stop, CONF_API_SUB_ARGS_SPLIT, "<confname> stop <[current|all|last]> [<member_id>]"}, + {"dtmf", &conf_api_sub_dtmf, CONF_API_SUB_MEMBER_TARGET, "<confname> dtmf <[member_id|all|last]> <digits>"}, {"kick", &conf_api_sub_kick, CONF_API_SUB_MEMBER_TARGET, "<confname> kick <[member_id|all|last]>"}, {"mute", &conf_api_sub_mute, CONF_API_SUB_MEMBER_TARGET, "<confname> mute <[member_id|all]|last>"}, {"unmute", &conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET, "<confname> unmute <[member_id|all]|last>"},

1 0

[commit] r3906 - freeswitch/trunk/src
by Freeswitch SVN 04 Jan '07

04 Jan '07

Author: anthm Date: Thu Jan 4 12:40:47 2007 New Revision: 3906 Modified: freeswitch/trunk/src/switch_ivr.c Log: tidy up on top of last commit Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Jan 4 12:40:47 2007 @@ -2341,6 +2341,11 @@ odata = strdup(bridgeto); data = odata; + /* strip leading spaces */ + while (data && *data && *data == ' ') { + data++; + } + if (*data == '{') { vars = data + 1; if (!(data = strchr(data, '}'))) { @@ -2351,7 +2356,17 @@ *data++ = '\0'; } - + /* strip leading spaces (again)*/ + while (data && *data && *data == ' ') { + data++; + } + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + status = SWITCH_STATUS_GENERR; + goto done; + } + /* Some channel are created from an originating channel and some aren't so not all outgoing calls have a way to get params so we will normalize dialstring params and channel variables (when there is an originator) into an event that we will use as a pseudo hash to consult for params as needed.

1 0

[commit] r3905 - freeswitch/trunk/src
by Freeswitch SVN 04 Jan '07

04 Jan '07

Author: anthm Date: Thu Jan 4 12:27:37 2007 New Revision: 3905 Modified: freeswitch/trunk/src/switch_ivr.c Log: add parameter parsing to dial string (leading name=val pairs sep by , inside {} such as {foo=bar} ) Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Jan 4 12:27:37 2007 @@ -2221,7 +2221,7 @@ int32_t *idx, char *file, char *key, - char *ringback_data) + uint8_t early_ok) { uint32_t i; @@ -2235,7 +2235,7 @@ if (switch_channel_get_state(peer_channels[i]) >= CS_HANGUP) { hups++; } else if ((switch_channel_test_flag(peer_channels[i], CF_ANSWERED) || - (!ringback_data && len == 1 && switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA))) && + (early_ok && len == 1 && switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA))) && !switch_channel_test_flag(peer_channels[i], CF_TAGGED)) { if (key) { @@ -2325,14 +2325,15 @@ int32_t idx = IDX_NADA; switch_codec_t write_codec = {0}; switch_frame_t write_frame = {0}; - uint8_t err = 0, fdata[1024], pass = 0; + uint8_t fdata[1024], pass = 0; char *file = NULL, *key = NULL, *odata, *var; switch_call_cause_t reason = SWITCH_CAUSE_UNALLOCATED; uint8_t to = 0; - char *ringback_data = NULL; + char *var_val, *vars = NULL, *ringback_data = NULL; switch_codec_t *read_codec = NULL; - uint8_t sent_ring = 0; + uint8_t sent_ring = 0, early_ok = 1; switch_core_session_message_t *message = NULL; + switch_event_t *var_event = NULL; write_frame.data = fdata; @@ -2340,47 +2341,86 @@ odata = strdup(bridgeto); data = odata; - if (!strncasecmp(data, "confirm=", 8)) { - data += 8; - file = data; - if ((data = strchr(file, ';'))) { - *data++ = '\0'; - if ((key = strchr(file, ':'))) { - *key++ = '\0'; - } else { - err++; - } - } else { - err++; - } - } + if (*data == '{') { + vars = data + 1; + if (!(data = strchr(data, '}'))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + status = SWITCH_STATUS_GENERR; + goto done; + } + *data++ = '\0'; + } - if (err) { - status = SWITCH_STATUS_GENERR; - goto done; - } + /* Some channel are created from an originating channel and some aren't so not all outgoing calls have a way to get params + so we will normalize dialstring params and channel variables (when there is an originator) into an event that we + will use as a pseudo hash to consult for params as needed. + */ + if (switch_event_create(&var_event, SWITCH_EVENT_MESSAGE) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + status = SWITCH_STATUS_MEMERR; + goto done; + } + if (session) { - caller_channel = switch_core_session_get_channel(session); + switch_hash_index_t *hi; + void *vval; + const void *vvar; + + caller_channel = switch_core_session_get_channel(session); assert(caller_channel != NULL); + /* Copy all the channel variables into the event */ + for (hi = switch_channel_variable_first(caller_channel, switch_core_session_get_pool(session)); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &vvar, NULL, &vval); + if (vvar && vval) { + switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, vvar, vval); + } + } + + } + + if (vars) { /* Parse parameters specified from the dialstring */ + char *var_array[1024] = {0}; + int var_count = 0; + if ((var_count = switch_separate_string(vars, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { + int x = 0; + for (x = 0; x < var_count; x++) { + char *inner_var_array[2]; + int inner_var_count; + if ((inner_var_count = + switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) { + + switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, inner_var_array[0], inner_var_array[1]); + if (caller_channel) { + switch_channel_set_variable(caller_channel, inner_var_array[0], inner_var_array[1]); + } + } + } + } + } + + + if (caller_channel) { /* ringback is only useful when there is an originator */ ringback_data = switch_channel_get_variable(caller_channel, "ringback"); switch_channel_set_variable(caller_channel, "originate_disposition", "failure"); - - if ((var = switch_channel_get_variable(caller_channel, "group_confirm_key"))) { - key = switch_core_session_strdup(session, var); - if ((var = switch_channel_get_variable(caller_channel, "group_confirm_file"))) { - file = switch_core_session_strdup(session, var); - } - } } - + if ((var = switch_event_get_header(var_event, "group_confirm_key"))) { + key = switch_core_session_strdup(session, var); + if ((var = switch_event_get_header(var_event, "group_confirm_file"))) { + file = switch_core_session_strdup(session, var); + } + } if (file && !strcmp(file, "undef")) { file = NULL; } + if ((var_val = switch_event_get_header(var_event, "noanswer_early_media")) && switch_true(var_val)) { + early_ok = 0; + } + or_argc = switch_separate_string(data, '|', pipe_names, (sizeof(pipe_names) / sizeof(pipe_names[0]))); if (caller_channel && or_argc > 1 && !ringback_data) { @@ -2652,9 +2692,13 @@ } } } + + if (ringback_data) { + early_ok = 0; + } - while ((!caller_channel || switch_channel_ready(caller_channel)) && - check_channel_status(peer_channels, peer_sessions, and_argc, &idx, file, key, ringback_data)) { + while ((!caller_channel || switch_channel_ready(caller_channel)) && + check_channel_status(peer_channels, peer_sessions, and_argc, &idx, file, key, early_ok)) { if ((to = (uint8_t)((time(NULL) - start) >= (time_t)timelimit_sec))) { idx = IDX_CANCEL; @@ -2804,6 +2848,10 @@ done: *cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + if (var_event) { + switch_event_destroy(&var_event); + } + if (status == SWITCH_STATUS_SUCCESS) { if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted");

1 0

[commit] r3904 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 04 Jan '07

04 Jan '07

Author: anthm Date: Wed Jan 3 20:18:06 2007 New Revision: 3904 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix uninit ints Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Jan 3 20:18:06 2007 @@ -3034,8 +3034,8 @@ case CONF_API_SUB_MEMBER_TARGET: { uint32_t id = 0; - int all; - int last; + uint8_t all = 0; + uint8_t last = 0; if (argv[argn+1]) { if (!(id = atoi(argv[argn+1]))) { @@ -3160,6 +3160,7 @@ if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]))) { if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); + goto done; } if (argc >= 2) { @@ -3185,7 +3186,8 @@ } else { stream->write_function(stream, "No parameters specified.\nTry 'help conference'\n"); } - + + done: switch_safe_free(lbuf); return status;

1 0

[commit] r3901 - in freeswitch/trunk: conf src
by Freeswitch SVN 03 Jan '07

03 Jan '07

Author: anthm Date: Wed Jan 3 11:43:59 2007 New Revision: 3901 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/switch_ivr.c Log: update phrase interface Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Jan 3 11:43:59 2007 @@ -678,57 +678,89 @@ <language name="en" sound_path="/snds" tts_engine="cepstral" tts_voice="david"> <macro name="msgcount"> <input pattern="(.*)"> - <action function="execute" data="sleep(1000)"/> - <action function="play-file" data="vm-youhave.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> - <action function="play-file" data="vm-messages.wav"/> -  -  + <match> + <action function="execute" data="sleep(1000)"/> + <action function="play-file" data="vm-youhave.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + <action function="play-file" data="vm-messages.wav"/> +  +  + </match> </input> </macro> <macro name="saydate"> <input pattern="(.*)"> - <action function="say" data="$1" method="pronounced" type="current_date_time"/> + <match> + <action function="say" data="$1" method="pronounced" type="current_date_time"/> + </match> </input> </macro> <macro name="timespec"> <input pattern="(.*)"> - <action function="say" data="$1" method="pronounced" type="time_measurement"/> + <match> + <action function="say" data="$1" method="pronounced" type="time_measurement"/> + </match> </input> </macro> <macro name="ip-addr"> <input pattern="(.*)"> - <action function="say" data="$1" method="iterated" type="ip_address"/> - <action function="say" data="$1" method="pronounced" type="ip_address"/> + <match> + <action function="say" data="$1" method="iterated" type="ip_address"/> + <action function="say" data="$1" method="pronounced" type="ip_address"/> + </match> </input> </macro> <macro name="spell"> <input pattern="(.*)"> - <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <match> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + </match> </input> </macro> <macro name="spell-phonetic"> <input pattern="(.*)"> - <action function="say" data="$1" method="pronounced" type="name_phonetic"/> + <match> + <action function="say" data="$1" method="pronounced" type="name_phonetic"/> + </match> </input> </macro> <macro name="tts-timeleft"> +  +  <input pattern="(\d+):(\d+)"> - <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/> + <match> + <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/> + <action function="break"/> + </match> + <nomatch> + <action function="speak-text" data="That input was invalid."/> + </nomatch> + </input> + <input pattern="(\d+) min (\d+) sec"> + <match> + <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/> + </match> + <nomatch> + <action function="speak-text" data="That input was invalid."/> + </nomatch> </input> </macro> </language> <language name="fr" sound_path="/var/sounds/lang/fr/jean" tts_engine="cepstral" tts_voice="jean-pierre"> <macro name="msgcount"> <input pattern="(.*)"> - <action function="play-file" data="tuas.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> - <action function="play-file" data="messages.wav"/> + <match> + <action function="play-file" data="tuas.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + <action function="play-file" data="messages.wav"/> + </match> </input> </macro> <macro name="timeleft"> <input pattern="(\d+):(\d+)"> - <action function="speak-text" data="il y a $1 minutes et de $2 secondes de restant"/> + <match> + <action function="speak-text" data="il y a $1 minutes et de $2 secondes de restant"/> + </match> </input> </macro> </language> Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Jan 3 11:43:59 2007 @@ -4414,6 +4414,7 @@ switch_status_t status = SWITCH_STATUS_GENERR; char *old_sound_prefix, *sound_path = NULL, *tts_engine = NULL, *tts_voice = NULL; switch_channel_t *channel; + uint8_t done = 0; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -4479,7 +4480,7 @@ switch_channel_pre_answer(channel); - while(input) { + while(input && !done) { char *pattern = (char *) switch_xml_attr(input, "pattern"); if (pattern) { @@ -4489,9 +4490,16 @@ uint32_t len = 0; char *odata = NULL; char *expanded = NULL; + switch_xml_t match = NULL; if ((proceed = switch_perform_regex(data, pattern, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { - for (action = switch_xml_child(input, "action"); action; action = action->next) { + match = switch_xml_child(input, "match"); + } else { + match = switch_xml_child(input, "nomatch"); + } + + if (match) { + for (action = switch_xml_child(match, "action"); action; action = action->next) { char *adata = (char *) switch_xml_attr_soft(action, "data"); char *func = (char *) switch_xml_attr_soft(action, "function"); @@ -4522,6 +4530,9 @@ if (!strcasecmp(func, "play-file")) { switch_ivr_play_file(session, NULL, odata, args); + } else if (!strcasecmp(func, "break")) { + done = 1; + break; } else if (!strcasecmp(func, "execute")) { const switch_application_interface_t *application_interface; char *app_name = NULL; @@ -4568,7 +4579,7 @@ } } } - + switch_clean_re(re); switch_safe_free(expanded); switch_safe_free(substituted);

1 0

[commit] r3900 - in freeswitch/trunk: conf src
by Freeswitch SVN 03 Jan '07

03 Jan '07

Author: anthm Date: Tue Jan 2 19:50:11 2007 New Revision: 3900 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/switch_utils.c Log: add strepoch api call and more say stuff Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Tue Jan 2 19:50:11 2007 @@ -518,6 +518,8 @@ <action application="phrase" data="timespec,12:45:15"/> <action application="phrase" data="saydate,0"/> <action application="phrase" data="msgcount,130"/> + <action application="phrase" data="ip-addr,66.250.68.194"/> + <action application="phrase" data="saydate,$strepoch(2006-03-23 7:23)"/>  </condition> </extension> @@ -694,6 +696,12 @@ <action function="say" data="$1" method="pronounced" type="time_measurement"/> </input> </macro> + <macro name="ip-addr"> + <input pattern="(.*)"> + <action function="say" data="$1" method="iterated" type="ip_address"/> + <action function="say" data="$1" method="pronounced" type="ip_address"/> + </input> + </macro> <macro name="spell"> <input pattern="(.*)"> <action function="say" data="$1" method="pronounced" type="name_spelled"/> Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Jan 2 19:50:11 2007 @@ -131,37 +131,42 @@ switch_time_t ret = 0; char *pattern = "^(\\d+)-(\\d+)-(\\d+)\\s*(\\d*):{0,1}(\\d*):{0,1}(\\d*)"; + switch_time_exp_lt(&tm, switch_time_now()); + tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = 0; + if ((proceed = switch_perform_regex(in, pattern, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { - printf("ASS %d\n", proceed); - pcre_copy_substring(in, ovector, proceed, 0, replace, sizeof(replace)); - tm.tm_year = atoi(replace) - 1900; - + if (proceed > 1) { pcre_copy_substring(in, ovector, proceed, 1, replace, sizeof(replace)); - tm.tm_mon = atoi(replace); + tm.tm_year = atoi(replace) - 1900; } if (proceed > 2) { pcre_copy_substring(in, ovector, proceed, 2, replace, sizeof(replace)); - tm.tm_mday = atoi(replace); + tm.tm_mon = atoi(replace) - 1; } - + if (proceed > 3) { pcre_copy_substring(in, ovector, proceed, 3, replace, sizeof(replace)); - tm.tm_hour = atoi(replace); + tm.tm_mday = atoi(replace)-1; } - + if (proceed > 4) { pcre_copy_substring(in, ovector, proceed, 4, replace, sizeof(replace)); - tm.tm_min = atoi(replace); + tm.tm_hour = atoi(replace); } if (proceed > 5) { pcre_copy_substring(in, ovector, proceed, 5, replace, sizeof(replace)); + tm.tm_min = atoi(replace); + } + + if (proceed > 6) { + pcre_copy_substring(in, ovector, proceed, 6, replace, sizeof(replace)); tm.tm_sec = atoi(replace); } - apr_time_exp_get(&ret, &tm); + apr_time_exp_gmt_get(&ret, &tm); return ret; } /* possible else with more patterns later */

1 0

[commit] r3899 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/say/mod_say_en
by Freeswitch SVN 03 Jan '07

03 Jan '07

Author: anthm Date: Tue Jan 2 19:21:17 2007 New Revision: 3899 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/switch_utils.c Log: some changes from mmurdock Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Jan 2 19:21:17 2007 @@ -181,6 +181,13 @@ #endif /*! + \brief Converts a string representation of a date into a switch_time_t + \param in the string + \return the epoch time in usec +*/ +SWITCH_DECLARE(switch_time_t) switch_str_time(char *in); + +/*! \brief Declares a function designed to set a dymaic global string \param fname the function name to declare \param vname the name of the global pointer to modify with the new function Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Jan 2 19:21:17 2007 @@ -279,6 +279,20 @@ } } + +static switch_status_t strepoch_api_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + switch_time_t out; + + if (switch_strlen_zero(data)) { + out = switch_time_now(); + } else { + out = switch_str_time(data); + } + + stream->write_function(stream, "%d", (uint32_t)apr_time_sec(out)); +} + static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) { @@ -288,7 +302,7 @@ switch_time_exp_lt(&tm, switch_time_now()); switch_strftime(date, &retsize, sizeof(date), fmt ? fmt : "%Y-%m-%d %T", &tm); - stream->write_function(stream, date); + stream->write_function(stream, "%s", date); return SWITCH_STATUS_SUCCESS; } @@ -407,12 +421,20 @@ } } +static switch_api_interface_t strepoch_api_interface = { + /*.interface_name */ "strepoch", + /*.desc */ "Convert a date string into epoch time", + /*.function */ strepoch_api_function, + /*.syntax */ "<string>", + /*.next */ NULL +}; + static switch_api_interface_t chat_api_interface = { /*.interface_name */ "chat", /*.desc */ "chat", /*.function */ chat_api_function, /*.syntax */ "<proto>|<from>|<to>|<message>", - /*.next */ NULL + /*.next */ &strepoch_api_interface }; static switch_api_interface_t dptools_api_interface = { 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 Tue Jan 2 19:21:17 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Michael B. Murdock <mike(a)mmurdock.org> * * mod_say_en.c -- Say for English * @@ -133,6 +134,26 @@ return ret; } +static char *strip_nonnumerics(char *in, char *out, switch_size_t len) +{ + char *p = in, *q = out; + char *ret = out; + switch_size_t x = 0; + // valid are 0 - 9, period (.), minus (-), and plus (+) - remove all others + for(;p && *p; p++) { + if ((*p > 47 && *p < 58) || *p == '.' || *p == '-' || *p == '+') { + *q++ = *p; + } + + if (++x > len) { + ret = NULL; + break; + } + } + + return ret; +} + static switch_status_t en_say_general_count(switch_core_session_t *session, char *tosay, switch_say_type_t type, @@ -155,40 +176,46 @@ } in = atoi(tosay); - - for(x = 8; x >= 0; x--) { - int num = (int)pow(10, x); - if ((places[x] = in / num)) { - in -= places[x] * num; - } - } - switch (method) { - case SSM_COUNTED: - case SSM_PRONOUNCED: - if ((status = play_group(SSM_PRONOUNCED, places[8], places[7], places[6], "digits/million.wav", session, args)) != SWITCH_STATUS_SUCCESS) { - return status; - } - if ((status = play_group(SSM_PRONOUNCED, places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) { - return status; - } - if ((status = play_group(method, places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) { - return status; + if (in != 0) { + for(x = 8; x >= 0; x--) { + int num = (int)pow(10, x); + if ((places[x] = in / num)) { + in -= places[x] * num; + } } - break; - case SSM_ITERATED: - { - char *p; - for (p = tosay; p && *p; p++) { - if (places[x] > -1) { - say_file("digits/%c.wav", *p); + + switch (method) { + case SSM_COUNTED: + case SSM_PRONOUNCED: + if ((status = play_group(SSM_PRONOUNCED, places[8], places[7], places[6], "digits/million.wav", session, args)) != SWITCH_STATUS_SUCCESS) { + return status; + } + if ((status = play_group(SSM_PRONOUNCED, places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) { + return status; + } + if ((status = play_group(method, places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) { + return status; + } + break; + case SSM_ITERATED: + { + char *p; + for (p = tosay; p && *p; p++) { + if (places[x] > -1) { + say_file("digits/%c.wav", *p); + } } } + break; + default: + break; } - break; - default: - break; } + else { + say_file("digits/0.wav"); + } + return SWITCH_STATUS_SUCCESS; } @@ -367,6 +394,67 @@ } +static switch_status_t en_say_money(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_args_t *args) +{ + switch_channel_t *channel; + + int x = 0; + char sbuf[16] = ""; // enuf for 999,999,999,999.99 (w/o the commas) + + double amt, dollars, cents; + + switch_status_t status; + + assert(session != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (!(tosay = strip_nonnumerics(tosay, sbuf, sizeof(sbuf))) || strlen(tosay) > 15) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + return SWITCH_STATUS_GENERR; + } + + amt = atof(tosay); //convert to double + dollars = trunc(amt); // get whole dollars + cents = trunc(fabs((amt - dollars))*100.0); // get cents as whole integer (dropping sign) + dollars = fabs(dollars); // lose the sign + + // If negative say "negative" (or "minus") + if (amt < 0.0) { + say_file("negative.wav"); + // say_file("minus.wav"); + } + + // Say dollar amount + snprintf(sbuf, sizeof(sbuf), "%.0f", dollars); + en_say_general_count(session, sbuf, type, method, args); + if (dollars == 1.0) { + say_file("dollar.wav"); + } + else { + say_file("dollars.wav"); + } + + // Say "and" + say_file("and.wav"); + + // Say cents + snprintf(sbuf, sizeof(sbuf), "%.0f", cents); + en_say_general_count(session, sbuf, type, method, args); + if (cents == 1.0) { + say_file("cent.wav"); + } + else { + say_file("cents.wav"); + } + + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t en_say(switch_core_session_t *session, @@ -398,8 +486,11 @@ case SST_NAME_PHONETIC: say_cb = en_spell; break; + case SST_CURRENCY: + say_cb = en_say_money; + break; default: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Finish ME!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", type); break; } @@ -439,4 +530,3 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } - Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Jan 2 19:21:17 2007 @@ -121,6 +121,54 @@ } + +SWITCH_DECLARE(switch_time_t) switch_str_time(char *in) +{ + switch_time_exp_t tm = {0}; + int proceed = 0, ovector[30]; + pcre *re = NULL; + char replace[1024] = ""; + switch_time_t ret = 0; + char *pattern = "^(\\d+)-(\\d+)-(\\d+)\\s*(\\d*):{0,1}(\\d*):{0,1}(\\d*)"; + + if ((proceed = switch_perform_regex(in, pattern, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { + printf("ASS %d\n", proceed); + pcre_copy_substring(in, ovector, proceed, 0, replace, sizeof(replace)); + tm.tm_year = atoi(replace) - 1900; + + if (proceed > 1) { + pcre_copy_substring(in, ovector, proceed, 1, replace, sizeof(replace)); + tm.tm_mon = atoi(replace); + } + + if (proceed > 2) { + pcre_copy_substring(in, ovector, proceed, 2, replace, sizeof(replace)); + tm.tm_mday = atoi(replace); + } + + if (proceed > 3) { + pcre_copy_substring(in, ovector, proceed, 3, replace, sizeof(replace)); + tm.tm_hour = atoi(replace); + } + + if (proceed > 4) { + pcre_copy_substring(in, ovector, proceed, 4, replace, sizeof(replace)); + tm.tm_min = atoi(replace); + } + + if (proceed > 5) { + pcre_copy_substring(in, ovector, proceed, 5, replace, sizeof(replace)); + tm.tm_sec = atoi(replace); + } + + apr_time_exp_get(&ret, &tm); + return ret; + } /* possible else with more patterns later */ + + return ret; + +} + SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) { switch(priority) { /*lol*/

1 0

[commit] r3898 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url
by Freeswitch SVN 02 Jan '07

02 Jan '07

Author: mikej Date: Tue Jan 2 18:44:44 2007 New Revision: 3898 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c Log: allow unescaped # in username portion of uri even though it is agains rfc 2396, to be more compatible with broken ua's as there are many who do not properly escape a # in the uri Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c Tue Jan 2 18:44:44 2007 @@ -592,9 +592,14 @@ if (url->url_type == url_sip || url->url_type == url_sips) { /* SIP URL may have /; in user part */ - n = strcspn(s, "@#"); /* Opaque part */ - if (s[n] != '@') - n = 0; + n = strcspn(s, "@"); /* Opaque part */ + if (n == strlen(s)) { + if ((strchr(s, '#'))) + n = 0; + } else { + if (strchr(s + n, '#')) + n = 0; + } n += strcspn(s + n, "/;?#"); } else if (url->url_type == url_wv) {

1 0

[commit] r3897 - in freeswitch/trunk/src: . include mod/say/mod_say_en
by Freeswitch SVN 02 Jan '07

02 Jan '07

Author: anthm Date: Tue Jan 2 18:08:26 2007 New Revision: 3897 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/switch_ivr.c Log: say update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Jan 2 18:08:26 2007 @@ -96,7 +96,8 @@ typedef enum { SSM_NA, SSM_PRONOUNCED, - SSM_ITERATED + SSM_ITERATED, + SSM_COUNTED } switch_say_method_t; typedef enum { @@ -112,6 +113,7 @@ SST_TELEPHONE_NUMBER, SST_TELEPHONE_EXTENSION, SST_URL, + SST_IP_ADDRESS, SST_EMAIL_ADDRESS, SST_POSTAL_ADDRESS, SST_ACCOUNT_NUMBER, 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 Tue Jan 2 18:08:26 2007 @@ -35,11 +35,11 @@ static const char modname[] = "mod_say_en"; -#define say_num(num) {\ +#define say_num(num, t) { \ char tmp[80];\ switch_status_t status;\ snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ - if ((status = en_say_general_count(session, tmp, SST_ITEMS, SSM_PRONOUNCED, args)) != SWITCH_STATUS_SUCCESS) {\ + if ((status = en_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ return status;\ }}\ @@ -52,7 +52,6 @@ }}\ - static switch_status_t en_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, @@ -73,7 +72,8 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t play_group(int a, +static switch_status_t play_group(switch_say_method_t method, + int a, int b, int c, char *what, @@ -96,7 +96,11 @@ } if (c) { - say_file("digits/%d.wav", c); + if (method == SSM_COUNTED) { + say_file("digits/h-%d.wav", c); + } else { + say_file("digits/%d.wav", c); + } } if (what && (a || b || c)) { @@ -144,7 +148,7 @@ assert(session != NULL); channel = switch_core_session_get_channel(session); assert(channel != NULL); - + if (!(tosay = strip_commas(tosay, sbuf, sizeof(sbuf))) || strlen(tosay) > 9) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); return SWITCH_STATUS_GENERR; @@ -160,21 +164,25 @@ } switch (method) { + case SSM_COUNTED: case SSM_PRONOUNCED: - if ((status = play_group(places[8], places[7], places[6], "digits/million.wav", session, args)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(SSM_PRONOUNCED, places[8], places[7], places[6], "digits/million.wav", session, args)) != SWITCH_STATUS_SUCCESS) { return status; } - if ((status = play_group(places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(SSM_PRONOUNCED, places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) { return status; } - if ((status = play_group(places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(method, places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) { return status; } break; case SSM_ITERATED: - for(x = 8; x >= 0; x--) { - if (places[x]) { - say_file("digits/%d.wav", places[x]); + { + char *p; + for (p = tosay; p && *p; p++) { + if (places[x] > -1) { + say_file("digits/%c.wav", *p); + } } } break; @@ -185,6 +193,53 @@ } +static switch_status_t en_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; + switch_status_t status = SWITCH_STATUS_SUCCESS; + if (!(a = strdup(tosay))) { + return SWITCH_STATUS_FALSE; + } + + if (!(b = strchr(a, '.'))) { + status = SWITCH_STATUS_FALSE; + goto done; + } + + *b++ = '\0'; + + if (!(c = strchr(b, '.'))) { + status = SWITCH_STATUS_FALSE; + goto done; + } + + *c++ = '\0'; + + if (!(d = strchr(c, '.'))) { + status = SWITCH_STATUS_FALSE; + goto done; + } + + *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); + + done: + switch_safe_free(a); + return status; +} + + static switch_status_t en_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, @@ -236,17 +291,17 @@ } if (hours) { - say_num(hours); + say_num(hours, SSM_PRONOUNCED); say_file("digits/hours.wav"); } if (minutes) { - say_num(minutes); + say_num(minutes, SSM_PRONOUNCED); say_file("digits/minutes.wav"); } if (seconds) { - say_num(seconds); + say_num(seconds, SSM_PRONOUNCED); say_file("digits/seconds.wav"); } @@ -277,8 +332,8 @@ if (say_date) { say_file("digits/day-%d.wav", tm.tm_wday); say_file("digits/mon-%d.wav", tm.tm_mon); - say_num(tm.tm_mday); - say_num(tm.tm_year + 1900); + say_num(tm.tm_mday, SSM_COUNTED); + say_num(tm.tm_year + 1900, SSM_PRONOUNCED); } if (say_time) { @@ -294,13 +349,13 @@ pm = 0; } - say_num(hour); + say_num(hour, SSM_PRONOUNCED); if (tm.tm_min > 9) { - say_num(tm.tm_min); + say_num(tm.tm_min, SSM_PRONOUNCED); } else if (tm.tm_min) { say_file("digits/oh.wav"); - say_num(tm.tm_min); + say_num(tm.tm_min, SSM_PRONOUNCED); } else { say_file("digits/oclock.wav"); } @@ -336,6 +391,9 @@ case SST_CURRENT_DATE_TIME: say_cb = en_say_time; break; + case SST_IP_ADDRESS: + say_cb = en_ip; + break; case SST_NAME_SPELLED: case SST_NAME_PHONETIC: say_cb = en_spell; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Jan 2 18:08:26 2007 @@ -960,7 +960,7 @@ char dtmf[128]; uint32_t interval = 0, samples = 0, framelen, sample_start = 0; uint32_t ilen = 0; - switch_size_t olen = 0; + switch_size_t olen = 0, llen = 0; switch_frame_t write_frame = {0}; switch_timer_t timer; switch_core_thread_session_t thread_session; @@ -1264,11 +1264,16 @@ last_speed = fh->speed; continue; } - + if (olen < llen) { + uint8_t *dp = (uint8_t *) write_frame.data; + memset(dp + (int)olen, 0, (int)(llen - olen)); + olen = llen; + } + write_frame.datalen = (uint32_t)(olen * (asis ? 1 : 2)); write_frame.samples = (uint32_t)olen; - + llen = olen; #ifndef WIN32 @@ -4345,6 +4350,7 @@ "N/A", "PRONOUNCED", "ITERATED", + "COUNTED", NULL }; @@ -4361,6 +4367,7 @@ "TELEPHONE_NUMBER", "TELEPHONE_EXTENSION", "URL", + "IP_ADDRESS", "EMAIL_ADDRESS", "POSTAL_ADDRESS", "ACCOUNT_NUMBER",

1 0