- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8000 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 01 Apr '08

01 Apr '08

Author: brian Date: Tue Apr 1 14:52:37 2008 New Revision: 8000 Modified: freeswitch/trunk/conf/directory/default/sipphone.com.noload Log: lets actually work correctly peeps.... Modified: freeswitch/trunk/conf/directory/default/sipphone.com.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/sipphone.com.noload (original) +++ freeswitch/trunk/conf/directory/default/sipphone.com.noload Tue Apr 1 14:52:37 2008 @@ -6,8 +6,6 @@ <gateway name="proxy01.sipphone.com"> <param name="username" value="%SPUSERNAME%"/> <param name="password" value="%SPPASSWORD%"/> - <param name="from-domain" value="proxy01.sipphone.com"/> - <param name="caller-id-in-from" value="true"/> <param name="expire-seconds" value="600"/> <param name="register" value="true"/> <param name="retry_seconds" value="5"/>

1 0

[commit] r7999 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 01 Apr '08

01 Apr '08

Author: anthm Date: Tue Apr 1 13:41:38 2008 New Revision: 7999 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update 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 Apr 1 13:41:38 2008 @@ -908,6 +908,30 @@ } } + +static void parse_domain_tag(sofia_profile_t *profile, switch_xml_t x_domain_tag, const char *dname, const char *parse, const char *alias) +{ + + if (switch_true(alias)) { + if (sofia_glue_add_profile(switch_core_strdup(profile->pool, dname), profile) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding Alias [%s] for profile [%s]\n", dname, profile->name); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Adding Alias [%s] for profile [%s] (name in use)\n", + dname, profile->name); + } + } + + if (switch_true(parse)) { + switch_xml_t ut, gateways_tag; + for (ut = switch_xml_child(x_domain_tag, "user"); ut; ut = ut->next) { + if (((gateways_tag = switch_xml_child(ut, "gateways")))) { + parse_gateways(profile, gateways_tag); + } + } + } +} + + switch_status_t config_sofia(int reload, char *profile_name) { char *cf = "sofia.conf"; @@ -1344,22 +1368,25 @@ if ((domains_tag = switch_xml_child(xprofile, "domains"))) { for (domain_tag = switch_xml_child(domains_tag, "domain"); domain_tag; domain_tag = domain_tag->next) { - switch_xml_t droot, actual_domain_tag, ut; - char *dname = (char *) switch_xml_attr_soft(domain_tag, "name"); - char *parse = (char *) switch_xml_attr_soft(domain_tag, "parse"); - + switch_xml_t droot, x_domain_tag; + const char *dname = switch_xml_attr_soft(domain_tag, "name"); + const char *parse = switch_xml_attr_soft(domain_tag, "parse"); + const char *alias = switch_xml_attr_soft(domain_tag, "alias"); + if (!switch_strlen_zero(dname)) { - if (switch_true(parse)) { - if (switch_xml_locate_domain(dname, NULL, &droot, &actual_domain_tag) == SWITCH_STATUS_SUCCESS) { - for (ut = switch_xml_child(actual_domain_tag, "user"); ut; ut = ut->next) { - if (((gateways_tag = switch_xml_child(ut, "gateways")))) { - parse_gateways(profile, gateways_tag); - } + if (!strcasecmp(dname, "all")) { + switch_xml_t xml_root, x_domains; + if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, NULL) == SWITCH_STATUS_SUCCESS) { + for(x_domain_tag = switch_xml_child(x_domains, "domain"); x_domain_tag; x_domain_tag = x_domain_tag->next) { + dname = switch_xml_attr_soft(x_domain_tag, "name"); + parse_domain_tag(profile, x_domain_tag, dname, parse, alias); } - switch_xml_free(droot); + switch_xml_free(xml_root); } + } else if (switch_xml_locate_domain(dname, NULL, &droot, &x_domain_tag) == SWITCH_STATUS_SUCCESS) { + parse_domain_tag(profile, x_domain_tag, dname, parse, alias); + switch_xml_free(droot); } - sofia_glue_add_profile(switch_core_strdup(profile->pool, dname), profile); } } }

1 0

[commit] r7997 - freeswitch/trunk/debian
by Freeswitch SVN 01 Apr '08

01 Apr '08

Author: anthm Date: Tue Apr 1 05:08:46 2008 New Revision: 7997 Modified: freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/rules Log: add some modules to debs Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Tue Apr 1 05:08:46 2008 @@ -33,6 +33,8 @@ opt/freeswitch/mod/mod_sndfile.so* opt/freeswitch/mod/mod_local_stream.so* opt/freeswitch/mod/mod_xml_*.so* +opt/freeswitch/mod/mod_fsv.so* +opt/freeswitch/mod/mod_tone_stream.so* opt/freeswitch/conf/dialplan/public.xml opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/extensions Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Tue Apr 1 05:08:46 2008 @@ -9,7 +9,7 @@ export DEB_DH_INSTALL_SOURCEDIR=debian/tmp export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr export SPIDERMONKEY_MODULES=languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone -export APPLICATIONS_MODULES=applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail +export APPLICATIONS_MODULES=applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail applications/mod_fsv export ASR_TTS_MODULES=asr_tts/mod_openmrcp export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex mod_voipcodecs export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml @@ -17,7 +17,7 @@ export DOTNET_MODULES= export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket -export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile +export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream export LANGUAGES_MODULES= export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog export SAY_MODULES=say/mod_say_de say/mod_say_en say/mod_say_fr

1 0

[commit] r7996 - freeswitch/trunk
by Freeswitch SVN 01 Apr '08

01 Apr '08

Author: anthm Date: Tue Apr 1 05:05:24 2008 New Revision: 7996 Modified: freeswitch/trunk/freeswitch.spec Log: add some modules to rpm spec file Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Tue Apr 1 05:05:24 2008 @@ -154,7 +154,7 @@ PASSTHRU_CODEC_MODULES="codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr" SPIDERMONKEY_MODULES="languages/mod_spidermonkey languages/mod_spidermonkey_curl languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone" -APPLICATIONS_MODULES="applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail" +APPLICATIONS_MODULES="applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail applications/mod_fsv" ASR_TTS_MODULES="asr_tts/mod_openmrcp" CODECS_MODULES="codecs/mod_ilbc codecs/mod_h26x codecs/mod_voipcodecs codecs/mod_speex" DIALPLANS_MODULES="dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml" @@ -162,7 +162,7 @@ DOTNET_MODULES= ENDPOINTS_MODULES="endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap" EVENT_HANDLERS_MODULES="event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv" -FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_sndfile" +FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream" LANGUAGES_MODULES= LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog" SAY_MODULES="say/mod_say_en say/mod_say_fr say/mod_say_de" @@ -373,6 +373,8 @@ %{prefix}/mod/mod_xml_rpc.so* %{prefix}/mod/mod_xml_curl.so* %{prefix}/mod/mod_xml_cdr.so* +%{prefix}/mod/mod_fsv.so +%{prefix}/mod/mod_tone_stream.so %files codec-passthru-amr %defattr(-,freeswitch,daemon)

1 0

[commit] r7995 - freeswitch/trunk/src
by Freeswitch SVN 01 Apr '08

01 Apr '08

Author: mikej Date: Mon Mar 31 22:34:58 2008 New Revision: 7995 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: potential fix for MODLANG-54 Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Mar 31 22:34:58 2008 @@ -85,10 +85,12 @@ { memset(&caller_profile, 0, sizeof(caller_profile)); init_vars(); - session = new_session; - channel = switch_core_session_get_channel(session); - allocated = 1; - switch_core_session_read_lock(session); + if (new_session) { + session = new_session; + channel = switch_core_session_get_channel(session); + allocated = 1; + switch_core_session_read_lock(session); + } } CoreSession::~CoreSession()

1 0

[commit] r7994 - in freeswitch/trunk/src: . include
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: anthm Date: Mon Mar 31 14:04:22 2008 New Revision: 7994 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/switch_cpp.cpp Log: add more sanity check to the switch_cpp Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Mon Mar 31 14:04:22 2008 @@ -113,6 +113,7 @@ switch_core_session_t *session; switch_channel_t *channel; unsigned int flags; + int allocated; input_callback_state cb_state; // callback state, always pointed to by the buf // field in this->args switch_channel_state_t hook_state; // store hookstate for on_hangup callback Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Mar 31 14:04:22 2008 @@ -37,8 +37,8 @@ #pragma warning(disable:4127 4003) #endif -#define sanity_check(x) do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) -#define sanity_check_noreturn do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return;}} while(0) +#define sanity_check(x) do { if (!(session && allocated)) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) +#define sanity_check_noreturn do { if (!(session && allocated)) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return;}} while(0) #define init_vars() do { session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; memset(&args, 0, sizeof(args)); ap = NULL; caller_profile.source = "mod_unknown"; caller_profile.dialplan = ""; caller_profile.context = ""; caller_profile.caller_id_name = ""; caller_profile.caller_id_number = ""; caller_profile.network_addr = ""; caller_profile.ani = ""; caller_profile.aniii = ""; caller_profile.rdnis = ""; caller_profile.username = ""; on_hangup = NULL; cb_state.function = NULL; } while(0) @@ -54,7 +54,7 @@ ap = NULL; on_hangup = NULL; cb_state.function = NULL; - + memset(&caller_profile, 0, sizeof(caller_profile)); caller_profile.source = "mod_unknown"; caller_profile.dialplan = ""; @@ -71,11 +71,13 @@ CoreSession::CoreSession(char *nuuid) { - memset(&caller_profile, 0, sizeof(caller_profile)); - init_vars(); - uuid = strdup(nuuid); - if (session = switch_core_session_locate(uuid)) { + + if (session = switch_core_session_locate(nuuid)) { channel = switch_core_session_get_channel(session); + init_vars(); + uuid = strdup(nuuid); + memset(&caller_profile, 0, sizeof(caller_profile)); + allocated = 1; } } @@ -85,6 +87,7 @@ init_vars(); session = new_session; channel = switch_core_session_get_channel(session); + allocated = 1; switch_core_session_read_lock(session); } @@ -369,6 +372,7 @@ } if (a_leg_session) a_leg_session->end_allow_threads(); + allocated = 1; return SWITCH_STATUS_SUCCESS; failed:

1 0

[commit] r7992 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: anthm Date: Mon Mar 31 13:14:49 2008 New Revision: 7992 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: add a bunch of locking to mod_iax, if it deadlocks nobody will be suprised part 2 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 Mon Mar 31 13:14:49 2008 @@ -1080,16 +1080,18 @@ case IAX_EVENT_BUSY: case IAX_EVENT_HANGUP: if (channel) { + switch_mutex_lock(globals.mutex); switch_mutex_lock(tech_pvt->flag_mutex); switch_clear_flag(tech_pvt, TFLAG_IO); switch_clear_flag(tech_pvt, TFLAG_VOICE); switch_mutex_unlock(tech_pvt->flag_mutex); - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hangup %s\n", switch_channel_get_name(channel)); switch_set_flag_locked(tech_pvt, TFLAG_HANGUP); switch_channel_hangup(channel, iaxevent->etype == IAX_EVENT_HANGUP ? SWITCH_CAUSE_NORMAL_CLEARING : SWITCH_CAUSE_FACILITY_REJECTED); iaxevent->session = NULL; + switch_mutex_unlock(globals.mutex); } break; case IAX_EVENT_CNG:

1 0

[commit] r7991 - freeswitch/trunk/docs
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: mikej Date: Mon Mar 31 13:14:36 2008 New Revision: 7991 Modified: freeswitch/trunk/docs/ChangeLog Log: start our changelog Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Mon Mar 31 13:14:36 2008 @@ -0,0 +1,11 @@ +freeswitch (1.0.rc2) + + Fixed speex protocol negotiation issues (8k vs 16k) + Fixed mod_iax race conditions + Fixed ptime negotiation issues when re-packetizing + Added ip based acl lists + +freeswitch (1.0.rc1) + + +

1 0

[commit] r7989 - in freeswitch/trunk: . docs
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: mikej Date: Mon Mar 31 12:37:22 2008 New Revision: 7989 Added: freeswitch/trunk/docs/ChangeLog Modified: freeswitch/trunk/bootstrap.sh Log: add ChangeLog Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Mon Mar 31 12:37:22 2008 @@ -15,9 +15,9 @@ # keep automake from making us magically GPL, and to stop complaining about missing files. cp -f docs/COPYING . cp -f docs/AUTHORS . +cp -f docs/ChangeLog . touch NEWS touch README -touch ChangeLog # autoconf 2.59 or newer ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'` Added: freeswitch/trunk/docs/ChangeLog ==============================================================================

1 0

[commit] r7988 - freeswitch/trunk/src
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: mikej Date: Mon Mar 31 12:06:08 2008 New Revision: 7988 Modified: freeswitch/trunk/src/switch_utils.c Log: make compiler quiet about null termination. Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Mar 31 12:06:08 2008 @@ -143,11 +143,11 @@ SWITCH_DECLARE(int) switch_parse_cidr(const char *string, uint32_t *ip, uint32_t *mask, uint32_t *bitp) { - char host[128] = ""; + char host[128]; char *bit_str; int32_t bits; - strncpy(host, string, sizeof(host) - 1); + switch_copy_string(host, string, sizeof(host)); bit_str = strchr(host, '/'); if (!bit_str) {

1 0