- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9110 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 19 Jul '08

19 Jul '08

Author: mikej Date: Sat Jul 19 11:39:17 2008 New Revision: 9110 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Log: tweak for gcc 4.3 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Sat Jul 19 11:39:17 2008 @@ -255,7 +255,7 @@ static switch_status_t do_config(void) { - char *cf = "lua.conf"; + const char *cf = "lua.conf"; switch_xml_t cfg, xml, settings, param; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {

1 0

[commit] r9109 - in freeswitch/trunk: build conf/autoload_configs
by Freeswitch SVN 19 Jul '08

19 Jul '08

Author: anthm Date: Sat Jul 19 11:20:08 2008 New Revision: 9109 Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/conf/autoload_configs/modules.conf.xml Log: getting this ready Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Sat Jul 19 11:20:08 2008 @@ -64,3 +64,4 @@ #say/mod_say_fr #say/mod_say_it #say/mod_say_nl +#say/mod_say_zh Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Sat Jul 19 11:20:08 2008 @@ -88,5 +88,6 @@  <load module="mod_say_en"/> +  </modules> </configuration>

1 0

[commit] r9108 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 19 Jul '08

19 Jul '08

Author: brian Date: Sat Jul 19 11:18:21 2008 New Revision: 9108 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: adding docs for vm_message_ext Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Sat Jul 19 11:18:21 2008 @@ -78,6 +78,8 @@    +  +  </variables> <vcard>

1 0

[commit] r9107 - in freeswitch/trunk/src: . include mod/applications/mod_voicemail mod/endpoints/mod_sofia
by Freeswitch SVN 19 Jul '08

19 Jul '08

Author: mikej Date: Sat Jul 19 11:16:29 2008 New Revision: 9107 Modified: freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_event.c Log: build tweaks Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Sat Jul 19 11:16:29 2008 @@ -135,7 +135,7 @@ \param header_name the name of the header to read \return the value of the requested header */ - _Ret_opt_z_ SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, char *header_name); + _Ret_opt_z_ SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, const char *header_name); #define switch_event_get_header_nil(e, h) switch_str_nil(switch_event_get_header(e,h)) 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 Sat Jul 19 11:16:29 2008 @@ -1901,7 +1901,7 @@ char *body; char *headers; char *header_string; - char tmp[50] = ""; + char tmpvar[50] = ""; int total_new_messages = 0; int total_saved_messages = 0; int total_new_urgent_messages = 0; @@ -1921,14 +1921,14 @@ switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_current_folder", myfolder); - switch_snprintf(tmp, sizeof(tmp), "%d", total_new_messages); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_total_new_messages", tmp); - switch_snprintf(tmp, sizeof(tmp), "%d", total_saved_messages); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_total_saved_messages", tmp); - switch_snprintf(tmp, sizeof(tmp), "%d", total_new_urgent_messages); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_urgent_new_messages", tmp); - switch_snprintf(tmp, sizeof(tmp), "%d", total_saved_urgent_messages); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_urgent_saved_messages", tmp); + switch_snprintf(tmpvar, sizeof(tmpvar), "%d", total_new_messages); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_total_new_messages", tmpvar); + switch_snprintf(tmpvar, sizeof(tmpvar), "%d", total_saved_messages); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_total_saved_messages", tmpvar); + switch_snprintf(tmpvar, sizeof(tmpvar), "%d", total_new_urgent_messages); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_urgent_new_messages", tmpvar); + switch_snprintf(tmpvar, sizeof(tmpvar), "%d", total_saved_urgent_messages); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_urgent_saved_messages", tmpvar); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_account", myid); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_domain", domain_name); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_caller_id_number", caller_id_number); @@ -1936,8 +1936,8 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_file_path", file_path); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_read_flags", read_flags); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); - switch_snprintf(tmp, sizeof(tmp), "%d", priority); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_priority", tmp); + switch_snprintf(tmpvar, sizeof(tmpvar), "%d", priority); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_priority", tmpvar); if (vm_email) { switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_email", vm_email); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Jul 19 11:16:29 2008 @@ -918,7 +918,7 @@ q = tech_pvt->local_sdp_str; while(p && *p) { - if (!strncmp("c=IN IP", p, 7)) { + if (tech_pvt->adv_sdp_audio_ip && !strncmp("c=IN IP", p, 7)) { strncpy(q, p, 9); p += 9; q += 9; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sat Jul 19 11:16:29 2008 @@ -555,7 +555,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, char *header_name) +SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, const char *header_name) { switch_event_header_t *hp; switch_assert(event);

1 0

[commit] r9106 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 19 Jul '08

19 Jul '08

Author: brian Date: Fri Jul 18 22:20:48 2008 New Revision: 9106 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Log: doh Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Fri Jul 18 22:20:48 2008 @@ -49,7 +49,7 @@ $(DESTDIR)$(PREFIX)/grammar/model/wsj1: mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/wsj1 - mv $(POCKETSPHINX_DIR)/model/hmm/wsj1/* $(DESTDIR)$(PREFIX)/grammar/model/communicator/wsj1 + mv $(POCKETSPHINX_DIR)/model/hmm/wsj1/* $(DESTDIR)$(PREFIX)/grammar/model/wsj1 grammar_maker: @cp -f $(BASE)/scripts/mklm $(DESTDIR)$(PREFIX)/bin/mklm

1 0

[commit] r9105 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: brian Date: Fri Jul 18 19:58:48 2008 New Revision: 9105 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update to syntax thanks sekil. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Jul 18 19:58:48 2008 @@ -1642,7 +1642,7 @@ const char *usage_string = "USAGE:\n" "--------------------------------------------------------------------------------\n" "sofia help\n" - "sofia profile <profile_name> [start|stop|restart|flush_inbound_reg [<call_id>]|[register|unregister] [<gateway name>|all]] [reloadxml]\n" + "sofia profile <profile_name> [start|stop|restart|rescan|flush_inbound_reg [<call_id>]|[register|unregister|killgw] [<gateway name>|all]] [reloadxml]\n" "sofia status [[profile | gateway] <name>]\n" "sofia loglevel [0-9]\n" "--------------------------------------------------------------------------------\n";

1 0

[commit] r9104 - freeswitch/trunk/src/mod/asr_tts/mod_flite
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: brian Date: Fri Jul 18 19:40:26 2008 New Revision: 9104 Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Log: mac works part 2 Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Fri Jul 18 19:40:26 2008 @@ -4,7 +4,7 @@ FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_kal.a $(FLITE_LIBDIR)/libflite_cmu_us_kal16.a $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a LOCAL_CFLAGS=-I$(switch_srcdir)/libs/$(FLITE)/include -LOCAL_LIBADD=$(FLITE_A) -lm +LOCAL_LIBADD=$(FLITE_A) BASE=../../../.. include $(BASE)/build/modmake.rules @@ -21,5 +21,5 @@ $(FLITE_A): $(FLITE_DIR) $(FLITE_DIR)/Makefile cd $(FLITE_DIR) && $(MAKE) test -d $(FLITE_LIBDIR) || mkdir $(FLITE_LIBDIR) - cd $(FLITE_DIR) && FLITE_TMP_LIBDIR=`./config.guess | sed "s/-[^-]*//" | sed "s/i[3456]86/i386/"` && cp build/$$FLITE_TMP_LIBDIR/lib/*.a $(FLITE_LIBDIR) + cd $(FLITE_DIR) && FLITE_TMP_LIBDIR=`$(FLITE_DIR)/config.guess | sed "s/-[^-]*//" | sed "s/i[3456]86/i386/"` && cp build/$$FLITE_TMP_LIBDIR/lib/*.a $(FLITE_LIBDIR)

1 0

[commit] r9103 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 19:16:07 2008 New Revision: 9103 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Jul 18 19:16:07 2008 @@ -552,7 +552,8 @@ if (use_ip) { tech_pvt->extrtpip = switch_core_session_strdup(tech_pvt->session, use_ip); - if (sofia_glue_ext_address_lookup(tech_pvt->profile, tech_pvt, &ip, &sdp_port, tech_pvt->extrtpip, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { + if (sofia_glue_ext_address_lookup(tech_pvt->profile, tech_pvt, &ip, &sdp_port, + tech_pvt->extrtpip, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; } } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jul 18 19:16:07 2008 @@ -905,7 +905,7 @@ { if (switch_sockaddr_info_get(&rtp_session->remote_stun_addr, stun_ip, SWITCH_UNSPEC, - rtp_session->stun_port, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS || !rtp_session->remote_stun_addr) { + stun_port, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS || !rtp_session->remote_stun_addr) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error resolving stun ping addr\n"); return SWITCH_STATUS_FALSE;

1 0

[commit] r9102 - freeswitch/trunk/src/mod/asr_tts/mod_flite
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: brian Date: Fri Jul 18 19:10:44 2008 New Revision: 9102 Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/flite-1.3.diff Log: make flite work on mac also... doesn't break linux build either. Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/flite-1.3.diff ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/flite-1.3.diff (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/flite-1.3.diff Fri Jul 18 19:10:44 2008 @@ -1,6 +1,18 @@ -diff -ru /usr/src/flite-1.3-current/include/cst_val.h flite-1.3-current/include/cst_val.h ---- /usr/src/flite-1.3-current/include/cst_val.h 2004-12-19 14:34:19.000000000 -0600 -+++ flite-1.3-current/include/cst_val.h 2008-07-09 12:44:26.000000000 -0500 +diff -ur /root/flite-1.3-current/include/cst_file.h flite-1.3-current/include/cst_file.h +--- /root/flite-1.3-current/include/cst_file.h 2005-02-07 07:26:42.000000000 -0600 ++++ flite-1.3-current/include/cst_file.h 2008-07-18 18:08:13.000000000 -0500 +@@ -53,7 +53,6 @@ + #include <System/StdIOPalm.h> + typedef FILE * cst_file; + #else +-#include <unistd.h> + #include <stdio.h> + typedef FILE * cst_file; + #endif +Only in flite-1.3-current/include: cst_file.h~ +diff -ur /root/flite-1.3-current/include/cst_val.h flite-1.3-current/include/cst_val.h +--- /root/flite-1.3-current/include/cst_val.h 2004-12-19 14:34:19.000000000 -0600 ++++ flite-1.3-current/include/cst_val.h 2008-07-18 18:07:57.000000000 -0500 @@ -145,6 +145,6 @@ /* Generic pointer vals */ @@ -9,9 +21,9 @@ +CST_VAL_USER_TYPE_DCLS(userdata,cst_userdata) #endif -diff -ru /usr/src/flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c ---- /usr/src/flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c 2004-12-31 17:22:10.000000000 -0600 -+++ flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c 2008-07-09 12:36:53.000000000 -0500 +diff -ur /root/flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c +--- /root/flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c 2004-12-31 17:22:10.000000000 -0600 ++++ flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c 2008-07-18 18:07:57.000000000 -0500 @@ -50,8 +50,14 @@ cst_voice *register_cmu_us_kal(const char *voxdir) @@ -28,9 +40,9 @@ /* Set up basic values for synthesizing with this voice */ usenglish_init(v); feat_set_string(v->features,"name","cmu_us_kal_diphone"); -diff -ru /usr/src/flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c ---- /usr/src/flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c 2005-01-03 08:08:06.000000000 -0600 -+++ flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c 2008-07-09 12:36:53.000000000 -0500 +diff -ur /root/flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c +--- /root/flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c 2005-01-03 08:08:06.000000000 -0600 ++++ flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c 2008-07-18 18:07:57.000000000 -0500 @@ -46,16 +46,22 @@ static cst_utterance *cmu_us_kal_postlex(cst_utterance *u); extern cst_diphone_db cmu_us_kal16_db;

1 0

[commit] r9101 - freeswitch/trunk/src
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 18:30:22 2008 New Revision: 9101 Modified: freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jul 18 18:30:22 2008 @@ -207,7 +207,7 @@ uint8_t buf[256] = { 0 }; uint8_t *start = buf; switch_stun_packet_t *packet; - unsigned int elapsed; + //unsigned int elapsed; switch_size_t bytes; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -220,6 +220,7 @@ goto end; } +#if 0 if (rtp_session->last_stun) { elapsed = (unsigned int) ((switch_timestamp_now() - rtp_session->last_stun) / 1000); @@ -229,6 +230,7 @@ goto end; } } +#endif if (rtp_session->funny_stun) { *start++ = 0; @@ -239,6 +241,13 @@ packet = switch_stun_packet_build_header(SWITCH_STUN_BINDING_REQUEST, NULL, start); bytes = switch_stun_packet_length(packet); + + if (rtp_session->funny_stun) { + packet = (switch_stun_packet_t *) buf; + bytes += 4; + } + + switch_socket_sendto(rtp_session->sock_output, rtp_session->remote_stun_addr, 0, (void *) packet, &bytes); rtp_session->stuncount = rtp_session->default_stuncount;

1 0