August 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5674 - in freeswitch/trunk/src: . mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_portaudio mod/endpoints/mod_sofia mod/endpoints/mod_woomera mod/languages/mod_spidermonkey
by Freeswitch SVN 28 Aug '07

28 Aug '07

Author: mikej Date: Tue Aug 28 18:44:02 2007 New Revision: 5674 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_ivr_originate.c Log: little cleanup, remove unnecessary (char *) cast. Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Aug 28 18:44:02 2007 @@ -2650,12 +2650,11 @@ cid_name, cid_num, ldl_session_get_ip(dlsession), - ldl_session_get_value(dlsession, - "ani"), - ldl_session_get_value(dlsession, - "aniii"), - ldl_session_get_value(dlsession, - "rdnis"), (char *) modname, context, + ldl_session_get_value(dlsession, "ani"), + ldl_session_get_value(dlsession, "aniii"), + ldl_session_get_value(dlsession, "rdnis"), + modname, + context, exten)) != 0) { char name[128]; snprintf(name, sizeof(name), "DingaLing/%s", tech_pvt->caller_profile->destination_number); Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Aug 28 18:44:02 2007 @@ -1107,8 +1107,9 @@ iaxevent->ies.calling_ani, NULL, NULL, - (char *) modname, - iaxevent->ies.called_context, iaxevent->ies.called_number)) != 0) { + modname, + iaxevent->ies.called_context, + iaxevent->ies.called_number)) != 0) { char name[128]; snprintf(name, sizeof(name), "IAX/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue Aug 28 18:44:02 2007 @@ -1600,8 +1600,8 @@ } if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - NULL, - dialplan, cid_name, cid_num, NULL, NULL, NULL, NULL, (char *) modname, NULL, + NULL, dialplan, cid_name, cid_num, + NULL, NULL, NULL, NULL, modname, NULL, dest)) != 0) { char name[128]; snprintf(name, sizeof(name), "PortAudio/%s", 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 Tue Aug 28 18:44:02 2007 @@ -1935,7 +1935,10 @@ tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), from_user, profile->dialplan, - displayname, from_user, network_ip, NULL, NULL, NULL, MODNAME, context, destination_number); + displayname, + from_user, + network_ip, + NULL, NULL, NULL, MODNAME, context, destination_number); if (tech_pvt->caller_profile) { 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 Tue Aug 28 18:44:02 2007 @@ -1059,7 +1059,15 @@ if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), NULL, tech_pvt->profile->dialplan, - cid_name, cid_num, ip, NULL, NULL, NULL, (char *) modname, NULL, exten)) != 0) { + cid_name, + cid_num, + ip, + NULL, + NULL, + NULL, + modname, + NULL, + exten)) != 0) { char name[128]; snprintf(name, sizeof(name), "Woomera/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Aug 28 18:44:02 2007 @@ -2430,9 +2430,8 @@ return JS_FALSE; } - caller_profile = switch_caller_profile_new(pool, - username, dialplan, cid_name, cid_num, network_addr, ani, aniii, rdnis, (char *) modname, context, - dest); + caller_profile = switch_caller_profile_new(pool,username, dialplan, cid_name, cid_num, network_addr, + ani, aniii, rdnis, modname, context, dest); if (switch_ivr_originate(session, &peer_session, &jss->cause, dest, to ? atoi(to) : 60, NULL, NULL, NULL, caller_profile) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot Create Outgoing Channel! [%s]\n", dest); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Aug 28 18:44:02 2007 @@ -500,10 +500,12 @@ } new_profile = switch_caller_profile_new(pool, - NULL, - NULL, - cid_name_override, cid_num_override, NULL, NULL, NULL, NULL, __FILE__, NULL, - chan_data); + NULL, + NULL, + cid_name_override, + cid_num_override, + NULL, NULL, NULL, NULL, __FILE__, NULL, + chan_data); } }

1 0

[commit] r5673 - freeswitch/trunk/src
by Freeswitch SVN 28 Aug '07

28 Aug '07

Author: mikej Date: Tue Aug 28 17:55:30 2007 New Revision: 5673 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: simplify by using switch_caller_profile_clone and switch_caller_profile_dup. Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Aug 28 17:55:30 2007 @@ -470,38 +470,18 @@ } caller_caller_profile = caller_profile_override ? caller_profile_override : switch_channel_get_caller_profile(caller_channel); + new_profile = switch_caller_profile_clone(session, caller_caller_profile); + new_profile->destination_number = chan_data; - if (!cid_name_override) { - cid_name_override = caller_caller_profile->caller_id_name; + if (cid_name_override) { + new_profile->caller_id_name = cid_name_override; } - if (!cid_num_override) { - cid_num_override = caller_caller_profile->caller_id_number; + if (cid_num_override) { + new_profile->caller_id_number = cid_num_override; } - new_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - caller_caller_profile->username, - caller_caller_profile->dialplan, - cid_name_override, - cid_num_override, - caller_caller_profile->network_addr, - NULL, - NULL, - caller_caller_profile->rdnis, - caller_caller_profile->source, caller_caller_profile->context, chan_data); - new_profile->flags = caller_caller_profile->flags; - new_profile->caller_ton = caller_caller_profile->caller_ton; - new_profile->caller_numplan = caller_caller_profile->caller_numplan; - new_profile->destination_number_ton = caller_caller_profile->destination_number_ton; - new_profile->destination_number_numplan = caller_caller_profile->destination_number_numplan; pool = NULL; } else { - if (!cid_name_override) { - cid_name_override = "FreeSWITCH"; - } - if (!cid_num_override) { - cid_num_override = "0000000000"; - } - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); status = SWITCH_STATUS_TERM; @@ -509,21 +489,16 @@ } if (caller_profile_override) { - new_profile = switch_caller_profile_new(pool, - caller_profile_override->username, - caller_profile_override->dialplan, - caller_profile_override->caller_id_name, - caller_profile_override->caller_id_number, - caller_profile_override->network_addr, - caller_profile_override->ani, - caller_profile_override->aniii, - caller_profile_override->rdnis, - caller_profile_override->source, caller_profile_override->context, chan_data); - new_profile->caller_ton = caller_profile_override->caller_ton; - new_profile->caller_numplan = caller_profile_override->caller_numplan; - new_profile->destination_number_ton = caller_profile_override->destination_number_ton; - new_profile->destination_number_numplan = caller_profile_override->destination_number_numplan; + new_profile = switch_caller_profile_dup(pool, caller_profile_override); + new_profile->destination_number = chan_data; } else { + if (!cid_name_override) { + cid_name_override = "FreeSWITCH"; + } + if (!cid_num_override) { + cid_num_override = "0000000000"; + } + new_profile = switch_caller_profile_new(pool, NULL, NULL,

1 0

[commit] r5672 - freeswitch/trunk/src
by Freeswitch SVN 28 Aug '07

28 Aug '07

Author: mikej Date: Tue Aug 28 17:43:18 2007 New Revision: 5672 Modified: freeswitch/trunk/src/switch_core_session.c Log: simplify by using switch_caller_profile_clone. Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Aug 28 17:43:18 2007 @@ -201,28 +201,14 @@ ecaller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number"); if (ecaller_id_name || ecaller_id_number) { - if (!ecaller_id_name) { - ecaller_id_name = caller_profile->caller_id_name; + outgoing_profile = switch_caller_profile_clone(session, caller_profile); + + if (ecaller_id_name) { + outgoing_profile->caller_id_name = ecaller_id_name; } - if (!ecaller_id_number) { - ecaller_id_number = caller_profile->caller_id_number; + if (ecaller_id_number) { + outgoing_profile->caller_id_number = ecaller_id_number; } - outgoing_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - caller_profile->username, - caller_profile->dialplan, - ecaller_id_name, - ecaller_id_number, - caller_profile->network_addr, - caller_profile->ani, - caller_profile->aniii, - caller_profile->rdnis, - caller_profile->source, caller_profile->context, caller_profile->destination_number); - outgoing_profile->flags = caller_profile->flags; - outgoing_profile->caller_ton = caller_profile->caller_ton; - outgoing_profile->caller_numplan = caller_profile->caller_numplan; - outgoing_profile->destination_number_ton = caller_profile->destination_number_ton; - outgoing_profile->destination_number_numplan = caller_profile->destination_number_numplan; - } } if (!outgoing_profile) {

1 0

[commit] r5671 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Aug '07

28 Aug '07

Author: anthm Date: Tue Aug 28 13:08:32 2007 New Revision: 5671 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix stupidity 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 Tue Aug 28 13:08:32 2007 @@ -729,7 +729,7 @@ const char *passwd = NULL; const char *a1_hash = NULL; char *sql; - switch_xml_t domain, xml, user, param, xparams; + switch_xml_t domain, xml = NULL, user, param, xparams; char hexdigest[2 * SU_MD5_DIGEST_SIZE + 1] = ""; username = realm = nonce = uri = qop = cnonce = nc = response = NULL; @@ -806,7 +806,6 @@ if (!(xparams = switch_xml_child(user, "params"))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find params for user [%s@%s]\n", username, realm); - switch_xml_free(xml); ret = AUTH_FORBIDDEN; goto end; } @@ -892,7 +891,9 @@ } end: - switch_xml_free(xml); + if (xml) { + switch_xml_free(xml); + } switch_safe_free(input); switch_safe_free(input2); switch_safe_free(username);

1 0

[commit] r5670 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/applications/mod_dptools mod/applications/mod_ivrtest
by Freeswitch SVN 28 Aug '07

28 Aug '07

Author: anthm Date: Tue Aug 28 13:06:20 2007 New Revision: 5670 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/trunk/src/switch_cpp.cpp freeswitch/trunk/src/switch_ivr_menu.c freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_swig.c Log: clean up speak code Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Tue Aug 28 13:06:20 2007 @@ -317,13 +317,12 @@ \param session the session to speak on \param tts_name the desired tts module \param voice_name the desired voice - \param rate the sample rate \param text the text to speak \param args arguements to pass for callbacks etc \return SWITCH_STATUS_SUCCESS if all is well */ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *session, - char *tts_name, char *voice_name, uint32_t rate, char *text, switch_input_args_t *args); + char *tts_name, char *voice_name, char *text, switch_input_args_t *args); /*! \brief Make an outgoing call 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 Tue Aug 28 13:06:20 2007 @@ -3877,7 +3877,7 @@ if (!(conference->tts_engine && conference->tts_voice)) { status = SWITCH_STATUS_FALSE; } else { - status = switch_ivr_speak_text(session, conference->tts_engine, conference->tts_voice, 0, path + 4, NULL); + status = switch_ivr_speak_text(session, conference->tts_engine, conference->tts_voice, path + 4, NULL); } goto done; } 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 Aug 28 13:06:20 2007 @@ -942,7 +942,7 @@ args.input_callback = on_dtmf; args.buf = buf; args.buflen = sizeof(buf); - switch_ivr_speak_text(session, engine, voice, codec->implementation->samples_per_second, text, &args); + switch_ivr_speak_text(session, engine, voice, text, &args); } Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Tue Aug 28 13:06:20 2007 @@ -207,7 +207,7 @@ args.input_callback = show_dtmf; args.buf = buf; args.buflen = sizeof(buf); - switch_ivr_speak_text(session, tts_name, voice_name, codec->implementation->samples_per_second, text, &args); + switch_ivr_speak_text(session, tts_name, voice_name, text, &args); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Done\n"); } @@ -405,7 +405,7 @@ } snprintf(say, sizeof(say), "You Dialed [%s]\n", buf); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, say); - switch_ivr_speak_text(session, "cepstral", "david", codec->implementation->samples_per_second, say, NULL); + switch_ivr_speak_text(session, "cepstral", "david", say, NULL); } } Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Aug 28 13:06:20 2007 @@ -123,7 +123,6 @@ int CoreSession::speak(char *text) { switch_status_t status; - switch_codec_t *codec; sanity_check(-1); @@ -142,9 +141,9 @@ return SWITCH_STATUS_FALSE; } - codec = switch_core_session_get_read_codec(session); + begin_allow_threads(); - status = switch_ivr_speak_text(session, tts_name, voice_name, codec->implementation->samples_per_second, text, ap); + status = switch_ivr_speak_text(session, tts_name, voice_name, text, ap); end_allow_threads(); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Tue Aug 28 13:06:20 2007 @@ -263,7 +263,7 @@ } else { if (strlen(sound) > 4 && strncmp(sound, "say:", 4) == 0) { if (menu->tts_engine && menu->tts_voice) { - status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, sound + 4, &args); + status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, sound + 4, &args); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS engine to play sound\n"); } @@ -369,7 +369,7 @@ status = switch_ivr_play_file(session, NULL, aptr, NULL); break; case SWITCH_IVR_ACTION_SAYTEXT: - status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, aptr, NULL); + status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, aptr, NULL); break; case SWITCH_IVR_ACTION_SAYPHRASE: status = switch_ivr_phrase_macro(session, aptr, "", menu->phrase_lang, NULL); 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 Tue Aug 28 13:06:20 2007 @@ -250,11 +250,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", chan_lang); } } else if (!strcasecmp(func, "speak-text")) { - switch_codec_t *read_codec; - if ((read_codec = switch_core_session_get_read_codec(session))) { - - status = switch_ivr_speak_text(session, tts_engine, tts_voice, read_codec->implementation->samples_per_second, odata, args); - } + status = switch_ivr_speak_text(session, tts_engine, tts_voice, odata, args); } } } @@ -1340,9 +1336,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *session, - char *tts_name, char *voice_name, uint32_t rate, char *text, switch_input_args_t *args) + char *tts_name, char *voice_name, char *text, switch_input_args_t *args) { switch_channel_t *channel; + uint32_t rate = 0; int interval = 0; switch_frame_t write_frame = { 0 }; switch_timer_t timer; @@ -1365,9 +1362,8 @@ switch_core_session_reset(session); read_codec = switch_core_session_get_read_codec(session); - if (rate == 0) { - rate = read_codec->implementation->samples_per_second; - } + rate = read_codec->implementation->samples_per_second; + interval = read_codec->implementation->microseconds_per_frame / 1000; memset(&sh, 0, sizeof(sh)); if (switch_core_speech_open(&sh, tts_name, voice_name, (uint32_t) rate, interval, @@ -1380,7 +1376,7 @@ switch_channel_answer(channel); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPEN TTS %s\n", tts_name); - interval = read_codec->implementation->microseconds_per_frame / 1000; + codec_name = "L16"; if (switch_core_codec_init(&codec, Modified: freeswitch/trunk/src/switch_swig.c ============================================================================== --- freeswitch/trunk/src/switch_swig.c (original) +++ freeswitch/trunk/src/switch_swig.c Tue Aug 28 13:06:20 2007 @@ -260,11 +260,11 @@ return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } -int fs_switch_ivr_speak_text(switch_core_session_t *session, char *tts_name, char *voice_name, uint32_t rate, char *text) +int fs_switch_ivr_speak_text(switch_core_session_t *session, char *tts_name, char *voice_name, char *text) { switch_status_t status; - status = switch_ivr_speak_text(session, tts_name, voice_name, rate, text, NULL); + status = switch_ivr_speak_text(session, tts_name, voice_name, text, NULL); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; }

1 0

[commit] r5669 - in freeswitch/trunk/src: . include
by Freeswitch SVN 28 Aug '07

28 Aug '07

Author: mikej Date: Tue Aug 28 12:41:38 2007 New Revision: 5669 Modified: freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/switch_caller.c Log: add ability to match in dialplan to the ton and numplan caller profile fields. added switch_caller_profile_dup function to be used in the future for places where we copy one profile to another to reduce code duplication. add "pool" member to the caller profile for when we need to allocate strings off that pool. Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Tue Aug 28 12:41:38 2007 @@ -99,6 +99,7 @@ struct switch_caller_profile *originatee_caller_profile; struct switch_channel_timetable *times; struct switch_caller_extension *caller_extension; + switch_memory_pool_t *pool; struct switch_caller_profile *next; }; @@ -189,10 +190,16 @@ \param session session associated with the profile (bound by scope) \param tocopy the existing profile */ - SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(switch_core_session_t *session, switch_caller_profile_t *tocopy); /*! + \brief Duplicate an existing caller profile object + \param pool pool to duplicate with + \param tocopy the existing profile +*/ +SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_dup(switch_memory_pool_t *pool, switch_caller_profile_t *tocopy); + +/*! \brief Add headers to an existing event in regards to a specific profile \param caller_profile the desired profile \param prefix a prefix string to all of the field names (for uniqueness) Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Tue Aug 28 12:41:38 2007 @@ -63,29 +63,31 @@ profile->context = switch_clean_string(switch_core_strdup(pool, switch_str_nil(context))); profile->destination_number = switch_clean_string(switch_core_strdup(pool, switch_str_nil(destination_number))); switch_set_flag(profile, SWITCH_CPF_SCREEN); + profile->pool = pool; } return profile; } -SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(switch_core_session_t *session, switch_caller_profile_t *tocopy) +SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_dup(switch_memory_pool_t *pool, switch_caller_profile_t *tocopy) { switch_caller_profile_t *profile = NULL; - if ((profile = switch_core_session_alloc(session, sizeof(switch_caller_profile_t))) != 0) { - profile->username = switch_core_session_strdup(session, tocopy->username); - profile->dialplan = switch_core_session_strdup(session, tocopy->dialplan); - profile->caller_id_name = switch_core_session_strdup(session, tocopy->caller_id_name); - profile->ani = switch_core_session_strdup(session, tocopy->ani); - profile->aniii = switch_core_session_strdup(session, tocopy->aniii); - profile->caller_id_number = switch_core_session_strdup(session, tocopy->caller_id_number); - profile->network_addr = switch_core_session_strdup(session, tocopy->network_addr); - profile->rdnis = switch_core_session_strdup(session, tocopy->rdnis); - profile->destination_number = switch_core_session_strdup(session, tocopy->destination_number); - profile->uuid = switch_core_session_strdup(session, tocopy->uuid); - profile->source = switch_core_session_strdup(session, tocopy->source); - profile->context = switch_core_session_strdup(session, tocopy->context); - profile->chan_name = switch_core_session_strdup(session, tocopy->chan_name); + + if ((profile = switch_core_alloc(pool, sizeof(switch_caller_profile_t))) != 0) { + profile->username = switch_core_strdup(pool, tocopy->username); + profile->dialplan = switch_core_strdup(pool, tocopy->dialplan); + profile->caller_id_name = switch_core_strdup(pool, tocopy->caller_id_name); + profile->ani = switch_core_strdup(pool, tocopy->ani); + profile->aniii = switch_core_strdup(pool, tocopy->aniii); + profile->caller_id_number = switch_core_strdup(pool, tocopy->caller_id_number); + profile->network_addr = switch_core_strdup(pool, tocopy->network_addr); + profile->rdnis = switch_core_strdup(pool, tocopy->rdnis); + profile->destination_number = switch_core_strdup(pool, tocopy->destination_number); + profile->uuid = switch_core_strdup(pool, tocopy->uuid); + profile->source = switch_core_strdup(pool, tocopy->source); + profile->context = switch_core_strdup(pool, tocopy->context); + profile->chan_name = switch_core_strdup(pool, tocopy->chan_name); profile->caller_ton = tocopy->caller_ton; profile->caller_numplan = tocopy->caller_numplan; profile->ani_ton = tocopy->ani_ton; @@ -95,11 +97,23 @@ profile->destination_number_ton = tocopy->destination_number_ton; profile->destination_number_numplan = tocopy->destination_number_numplan; profile->flags = tocopy->flags; + profile->pool = pool; } return profile; } + +SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(switch_core_session_t *session, switch_caller_profile_t *tocopy) +{ + switch_memory_pool_t *pool; + + pool = switch_core_session_get_pool(session); + + return switch_caller_profile_dup(pool, tocopy); +} + + SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, const char *name) { if (!strcasecmp(name, "dialplan")) { @@ -141,6 +155,30 @@ if (!strcasecmp(name, "chan_name")) { return caller_profile->chan_name; } + if (!strcasecmp(name, "caller_ton")) { + return switch_core_sprintf(caller_profile->pool, "%u", caller_profile->caller_ton); + } + if (!strcasecmp(name, "caller_numplan")) { + return switch_core_sprintf(caller_profile->pool, "%u", caller_profile->caller_numplan); + } + if (!strcasecmp(name, "destination_number_ton")) { + return switch_core_sprintf(caller_profile->pool, "%u", caller_profile->destination_number_ton); + } + if (!strcasecmp(name, "destination_number_numplan")) { + return switch_core_sprintf(caller_profile->pool, "%u", caller_profile->destination_number_numplan); + } + if (!strcasecmp(name, "ani_ton")) { + return switch_core_sprintf(caller_profile->pool, "%u", caller_profile->ani_ton); + } + if (!strcasecmp(name, "ani_numplan")) { + return switch_core_sprintf(caller_profile->pool, "%u", caller_profile->ani_numplan); + } + if (!strcasecmp(name, "rdnis_ton")) { + return switch_core_sprintf(caller_profile->pool, "%u", caller_profile->rdnis_ton); + } + if (!strcasecmp(name, "rdnis_numplan")) { + return switch_core_sprintf(caller_profile->pool, "%u", caller_profile->rdnis_numplan); + } return NULL; }

1 0

[commit] r5668 - freeswitch/trunk/src
by Freeswitch SVN 28 Aug '07

28 Aug '07

Author: mikej Date: Tue Aug 28 11:31:52 2007 New Revision: 5668 Modified: freeswitch/trunk/src/switch_xml.c Log: dos2unix Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Aug 28 11:31:52 2007 @@ -966,16 +966,16 @@ } } - if ((cmd = strstr(bp, ""))) { *e = '\0'; - e += 3; - if(write(write_fd, e, (unsigned) strlen(e)) != (int) strlen(e)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n"); - } + e += 3; + if(write(write_fd, e, (unsigned) strlen(e)) != (int) strlen(e)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n"); + } } else { ml++; } @@ -1031,11 +1031,11 @@ continue; } - - if(write(write_fd, bp, (unsigned) cur) != (int) cur) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n"); - } - + + if(write(write_fd, bp, (unsigned) cur) != (int) cur) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n"); + } + } close(read_fd);

1 0

[commit] r5667 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Aug '07

27 Aug '07

Author: anthm Date: Mon Aug 27 16:53:48 2007 New Revision: 5667 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: free xml later in the code to avoid freeing used memory 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 Aug 27 16:53:48 2007 @@ -839,8 +839,6 @@ } } - switch_xml_free(xml); - if (switch_strlen_zero(passwd) && switch_strlen_zero(a1_hash)) { ret = AUTH_OK; goto end; @@ -894,6 +892,7 @@ } end: + switch_xml_free(xml); switch_safe_free(input); switch_safe_free(input2); switch_safe_free(username);

1 0

[commit] r5666 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Aug '07

27 Aug '07

Author: anthm Date: Mon Aug 27 16:43:34 2007 New Revision: 5666 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix reg var scope 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 Aug 27 16:43:34 2007 @@ -730,7 +730,8 @@ const char *a1_hash = NULL; char *sql; switch_xml_t domain, xml, user, param, xparams; - + char hexdigest[2 * SU_MD5_DIGEST_SIZE + 1] = ""; + username = realm = nonce = uri = qop = cnonce = nc = response = NULL; if (authorization->au_params) { @@ -847,7 +848,6 @@ if (!a1_hash) { su_md5_t ctx; - char hexdigest[2 * SU_MD5_DIGEST_SIZE + 1]; char *input; input = switch_mprintf("%s:%s:%s", username, realm, passwd);

1 0

[commit] r5665 - freeswitch/trunk/scripts/py_modules
by Freeswitch SVN 25 Aug '07

25 Aug '07

Author: greenlizard Date: Sat Aug 25 18:57:44 2007 New Revision: 5665 Modified: freeswitch/trunk/scripts/py_modules/speechtools.py Log: abort upon receiving an empty result in freeswitch event Modified: freeswitch/trunk/scripts/py_modules/speechtools.py ============================================================================== --- freeswitch/trunk/scripts/py_modules/speechtools.py (original) +++ freeswitch/trunk/scripts/py_modules/speechtools.py Sat Aug 25 18:57:44 2007 @@ -83,6 +83,7 @@ self.max_tries=max_tries self.detected_phrases = [] + self.failed = False def setGrammar(self, grammar): """ @@ -124,7 +125,8 @@ console_log("debug", "starting run() while loop\n") while (session.ready() and num_tries < self.max_tries and - len(self.detected_phrases) < self.required_phrases): + len(self.detected_phrases) < self.required_phrases and + not self.failed): console_log("debug", "top of run() while loop\n") session.collectDigits(self.wait_time) num_tries += 1 @@ -172,6 +174,12 @@ # unicode strings. # TODO: check the score body = event['body'] + if not body or len(body) == 0 or body == "(null)": + # freeswitch returned a completely empty result + self.failed = True + # do we want to return stop? what should we return? + return "stop" + dom = minidom.parseString(body) phrase = dom.getElementsByTagName(self.grammar.obj_path)[0] phrase_text = self.getText(phrase)

1 0