- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5888 - in freeswitch/trunk/src: include mod/applications/mod_dptools
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 10:36:39 2007 New Revision: 5888 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add playback_terminators variable This is valid for playback, gentones, record and speak value may be a string of valid terminator characters, or the word 'none' the default of * will always work unless overridden by 'none'. This is for backward compat. <extension name="8000"> <condition field="destination_number" expression="^8000$"> <action application="answer"/>  <action application="set" data="playback_terminators=#*"/> <action application="playback" data="/ram/swimp.raw"/> </condition> </extension> Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Oct 16 10:36:39 2007 @@ -97,6 +97,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_PLAYBACK_TERMINATORS_VARIABLE "playback_terminators" #define SWITCH_CACHE_SPEECH_HANDLES_VARIABLE "cache_speech_handles" #define SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME "__cache_speech_handles_obj__" #define SWITCH_BYPASS_MEDIA_VARIABLE "bypass_media" 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 Oct 16 10:36:39 2007 @@ -898,15 +898,33 @@ */ static switch_status_t on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) { - + switch (itype) { - case SWITCH_INPUT_TYPE_DTMF:{ + case SWITCH_INPUT_TYPE_DTMF: + { char *dtmf = (char *) input; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Digits %s\n", dtmf); + char *terminators; + switch_channel_t *channel = switch_core_session_get_channel(session); + char *p; + + assert(channel); - if (*dtmf == '*') { - return SWITCH_STATUS_BREAK; + if (!(terminators = switch_channel_get_variable(channel, SWITCH_PLAYBACK_TERMINATORS_VARIABLE))) { + terminators = "*"; + } + if (!strcasecmp(terminators, "none")) { + terminators = NULL; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Digits %s\n", dtmf); + + for (p = terminators; p && *p; p++) { + char *d; + for (d = dtmf; d && *d; d++) { + if (*p == *d) { + return SWITCH_STATUS_BREAK; + } + } } } break;

1 0

[commit] r5887 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 10:24:02 2007 New Revision: 5887 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_utils.c Log: add switch_stristr and use it in dptools Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Oct 16 10:24:02 2007 @@ -298,6 +298,8 @@ */ SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, int arraylen); +SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr); + /*! \brief Escape a string by prefixing a list of characters with an escape character \param pool a memory pool to use 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 Oct 16 10:24:02 2007 @@ -1223,7 +1223,7 @@ cause_str = switch_channel_cause2str(cause); snprintf(cause_num, sizeof(cause_num), "%u", cause); - if (switch_true(continue_on_fail) || strstr(cause_str, continue_on_fail) || strstr(cause_str, cause_num)) { + if (switch_true(continue_on_fail) || switch_stristr(cause_str, continue_on_fail) || strstr(cause_str, cause_num)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Continue on fail [%s]: Cause: %s\n", continue_on_fail, cause_str); return; } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Oct 16 10:24:02 2007 @@ -197,6 +197,27 @@ } +SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr) +{ + size_t score = strlen(str), x = 0; + const char *a = str, *b = instr, *p = NULL; + + while(*a && *b) { + if (tolower(*b) == tolower(*a)) { + if (++x == score) { + return p; + } + a++; + } else { + a = str; + p = b+1; + x = 0; + } + b++; + } + return NULL; +} + SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family) { switch_status_t status = SWITCH_STATUS_FALSE;

1 0

[commit] r5886 - in freeswitch/trunk/src: . include
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 09:56:44 2007 New Revision: 5886 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_ivr_originate.c Log: add channel_originate event Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Oct 16 09:56:44 2007 @@ -851,6 +851,7 @@ SWITCH_EVENT_CHANNEL_PARK - A channel has been parked SWITCH_EVENT_CHANNEL_UNPARK - A channel has been unparked SWITCH_EVENT_CHANNEL_APPLICATION- A channel has called and event from an application + SWITCH_EVENT_CHANNEL_ORIGINATE - A channel has been originated SWITCH_EVENT_API - An API call has been executed SWITCH_EVENT_LOG - A LOG event has been triggered SWITCH_EVENT_INBOUND_CHAN - A new inbound channel has been created @@ -902,6 +903,7 @@ SWITCH_EVENT_CHANNEL_PARK, SWITCH_EVENT_CHANNEL_UNPARK, SWITCH_EVENT_CHANNEL_APPLICATION, + SWITCH_EVENT_CHANNEL_ORIGINATE, SWITCH_EVENT_API, SWITCH_EVENT_LOG, SWITCH_EVENT_INBOUND_CHAN, Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Oct 16 09:56:44 2007 @@ -120,6 +120,7 @@ "CHANNEL_PARK", "CHANNEL_UNPARK", "CHANNEL_APPLICATION", + "CHANNEL_ORIGINATE", "API", "LOG", "INBOUND_CHAN", Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Oct 16 09:56:44 2007 @@ -536,11 +536,16 @@ assert(peer_channels[i] != NULL); if (var_event) { + switch_event_t *event; switch_event_header_t *header; /* install the vars from the {} params */ for (header = var_event->headers; header; header = header->next) { switch_channel_set_variable(peer_channels[i], header->name, header->value); } + switch_event_create(&event, SWITCH_EVENT_CHANNEL_ORIGINATE); + assert(event); + switch_channel_event_set_data(peer_channels[i], event); + switch_event_fire(&event); } if (!table) {

1 0

[commit] r5885 - freeswitch/trunk/src
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Mon Oct 15 21:51:15 2007 New Revision: 5885 Modified: freeswitch/trunk/src/switch_core_session.c Log: fix Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Oct 15 21:51:15 2007 @@ -305,11 +305,11 @@ switch_channel_set_originatee_caller_profile(channel, cloned_profile); } } + } - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_OUTGOING) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(peer_channel, event); - switch_event_fire(&event); - } + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_OUTGOING) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(peer_channel, event); + switch_event_fire(&event); } }

1 0

[commit] r5884 - freeswitch/trunk/src
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Mon Oct 15 21:08:51 2007 New Revision: 5884 Modified: freeswitch/trunk/src/switch_apr.c Log: wait there's more Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Oct 15 21:08:51 2007 @@ -561,18 +561,24 @@ SWITCH_DECLARE(switch_status_t) switch_socket_send(switch_socket_t * sock, const char *buf, switch_size_t *len) { - switch_status_t status; - switch_size_t req = *len, wrote = 0, need = 0; - - status = apr_socket_send(sock, buf, len); - if (status == SWITCH_STATUS_SUCCESS) { - wrote = *len; - while (wrote < req && status == SWITCH_STATUS_SUCCESS) { - need = req - wrote; - status = apr_socket_send(sock, buf + wrote, &need); - wrote += need; + switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_size_t req = *len, wrote = 0, need = *len; + int to_count = 0; + + while ((wrote < req && status == SWITCH_STATUS_SUCCESS) || (need == 0 && status == SWITCH_STATUS_BREAK)) { + need = req - wrote; + if ((status = apr_socket_send(sock, buf + wrote, &need)) == SWITCH_STATUS_BREAK) { + if (++to_count > 10000) { + status = SWITCH_STATUS_FALSE; + break; + } + switch_yield(1000); + } else { + to_count = 0; } + wrote += need; } + *len = wrote; return status;

1 0

[commit] r5883 - freeswitch/trunk/src
by Freeswitch SVN 15 Oct '07

15 Oct '07

Author: anthm Date: Mon Oct 15 19:49:05 2007 New Revision: 5883 Modified: freeswitch/trunk/src/switch_apr.c Log: fix apr send func not sending all the bytes we asked it to. Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Oct 15 19:49:05 2007 @@ -561,7 +561,21 @@ SWITCH_DECLARE(switch_status_t) switch_socket_send(switch_socket_t * sock, const char *buf, switch_size_t *len) { - return apr_socket_send(sock, buf, len); + switch_status_t status; + switch_size_t req = *len, wrote = 0, need = 0; + + status = apr_socket_send(sock, buf, len); + if (status == SWITCH_STATUS_SUCCESS) { + wrote = *len; + while (wrote < req && status == SWITCH_STATUS_SUCCESS) { + need = req - wrote; + status = apr_socket_send(sock, buf + wrote, &need); + wrote += need; + } + } + *len = wrote; + return status; + } SWITCH_DECLARE(switch_status_t) switch_socket_sendto(switch_socket_t * sock, switch_sockaddr_t * where, int32_t flags, const char *buf, switch_size_t *len)

1 0

[commit] r5882 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 15 Oct '07

15 Oct '07

Author: brian Date: Mon Oct 15 17:43:12 2007 New Revision: 5882 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: cleanup 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 Mon Oct 15 17:43:12 2007 @@ -307,7 +307,7 @@ if (hours) { say_num(hours, SSM_PRONOUNCED); if (hours == 1) { - say_file("time/hour.wav"); //TODO -- NEED TO GET "hour.wav" recorded + say_file("time/hour.wav"); } else { say_file("time/hours.wav"); } @@ -407,7 +407,7 @@ { switch_channel_t *channel; - char sbuf[16] = ""; /* enuough for 999,999,999,999.99 (w/o the commas or leading $) */ + char sbuf[16] = ""; /* enough for 999,999,999,999.99 (w/o the commas or leading $) */ char *dollars = NULL; char *cents = NULL;

1 0

[commit] r5881 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Oct '07

15 Oct '07

Author: anthm Date: Mon Oct 15 17:03:56 2007 New Revision: 5881 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon Oct 15 17:03:56 2007 @@ -164,7 +164,7 @@ //nua_message(nh, SIPTAG_CONTENT_TYPE_STR("text/plain"), //SIPTAG_PAYLOAD_STR("You suffer from Connectile Dysfunction.\nYou should use stun....\n"), TAG_END()); - nua_options(nh, SIPTAG_FROM_STR(profile->url), SIPTAG_TO_STR(to), NUTAG_URL(contact), SIPTAG_CONTACT_STR(profile->url), TAG_END()); + nua_options(nh, TAG_END()); return 0; }

1 0

[commit] r5880 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/nta src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Oct '07

15 Oct '07

Author: mikej Date: Mon Oct 15 14:31:10 2007 New Revision: 5880 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: use 503 for server congestion, not 486, becuase that means user busy Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Mon Oct 15 14:31:10 2007 @@ -2398,7 +2398,7 @@ else if (!agent->sa_is_stateless && (leg = agent->sa_default_leg)) { if (method == sip_method_invite && agent->sa_in.proceeding->q_length >= agent->sa_max_proceeding) { SU_DEBUG_5(("nta: proceeding queue full for %s (%u)\n", method_name, cseq)); - nta_msg_treply(agent, msg, SIP_486_BUSY_HERE, + nta_msg_treply(agent, msg, SIP_503_SERVICE_UNAVAILABLE, NTATAG_TPORT(tport), TAG_END()); return; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Oct 15 14:31:10 2007 @@ -1885,7 +1885,7 @@ } if (!sofia_endpoint_interface || !(session = switch_core_session_request(sofia_endpoint_interface, NULL))) { - nua_respond(nh, SIP_486_BUSY_HERE, TAG_END()); + nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END()); return; }

1 0

[commit] r5879 - in freeswitch/trunk: conf src src/mod/applications/mod_voicemail
by Freeswitch SVN 15 Oct '07

15 Oct '07

Author: anthm Date: Mon Oct 15 14:02:21 2007 New Revision: 5879 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_ivr_play_say.c Log: tweak defaults Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Mon Oct 15 14:02:21 2007 @@ -144,7 +144,7 @@  <section name="phrases" description="Speech Phrase Management"> <macros> - <language name="en" sound_path="/snds" tts_engine="cepstral" tts_voice="david"> + <language name="en" sound-path="/snds" tts-engine="cepstral" tts-voice="david">    Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Mon Oct 15 14:02:21 2007 @@ -1031,6 +1031,7 @@ break; case VM_CHECK_FOLDER_SUMMARY: { + int informed = 0; char msg_count[80] = ""; switch_channel_set_variable(channel, "voicemail_current_folder", myfolder); message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, @@ -1038,15 +1039,13 @@ if (total_new_urgent_messages > 0) { snprintf(msg_count, sizeof(msg_count), "%d:urgent-new:%s", total_new_urgent_messages, total_new_urgent_messages == 1 ? "" : "s"); - if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) { - goto end; - } + TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); + informed++; } if (total_new_messages > 0) { snprintf(msg_count, sizeof(msg_count), "%d:new:%s", total_new_messages, total_new_messages == 1 ? "" : "s"); - if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) { - goto end; - } + TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); + informed++; } if (!heard_auto_new && total_new_messages > 0) { @@ -1058,16 +1057,14 @@ if (total_saved_urgent_messages > 0) { snprintf(msg_count, sizeof(msg_count), "%d:urgent-saved:%s", total_saved_urgent_messages, total_saved_urgent_messages == 1 ? "" : "s"); - if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) { - goto end; - } + TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); + informed++; } if (total_saved_messages > 0) { snprintf(msg_count, sizeof(msg_count), "%d:saved:%s", total_saved_messages, total_saved_messages == 1 ? "" : "s"); - if ((status = switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)) != SWITCH_STATUS_SUCCESS) { - goto end; - } + TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); + informed++; } if (!heard_auto_saved && total_saved_messages > 0) { @@ -1077,6 +1074,13 @@ continue; } + if (!informed) { + snprintf(msg_count, sizeof(msg_count), "0:new:s"); + TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); + informed++; + } + + vm_check_state = VM_CHECK_MENU; } break; Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Mon Oct 15 14:02:21 2007 @@ -152,9 +152,22 @@ goto done; } - sound_path = (char *) switch_xml_attr_soft(language, "sound_path"); - tts_engine = (char *) switch_xml_attr_soft(language, "tts_engine"); - tts_voice = (char *) switch_xml_attr_soft(language, "tts_voice"); + + if (!(sound_path = (char *) switch_xml_attr(language, "sound-path"))) { + sound_path = (char *) switch_xml_attr(language, "sound_path"); + } + + if (!(tts_engine = (char *) switch_xml_attr(language, "tts-engine"))) { + if (!(tts_engine = (char *) switch_xml_attr(language, "tts_engine"))) { + tts_engine = switch_channel_get_variable(channel, tts_engine); + } + } + + if (!(tts_voice = (char *) switch_xml_attr(language, "tts-voice"))) { + if (!(tts_voice = (char *) switch_xml_attr(language, "tts_voice"))) { + tts_voice = switch_channel_get_variable(channel, tts_voice); + } + } if (sound_path) { old_sound_prefix = switch_channel_get_variable(channel, "sound_prefix"); @@ -252,7 +265,21 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", chan_lang); } } else if (!strcasecmp(func, "speak-text")) { - status = switch_ivr_speak_text(session, tts_engine, tts_voice, odata, args); + char *my_tts_engine = (char *) switch_xml_attr(action, "tts-engine"); + char *my_tts_voice = (char *) switch_xml_attr(action, "tts-voice"); + + if (!my_tts_engine) { + my_tts_engine = tts_engine; + } + + if (!my_tts_voice) { + my_tts_voice = tts_voice; + } + if (switch_strlen_zero(tts_engine) || switch_strlen_zero(tts_voice)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "TTS is not configured\n"); + } else { + status = switch_ivr_speak_text(session, my_tts_engine, my_tts_voice, odata, args); + } } } }

1 0