- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10079 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: anthm Date: Mon Oct 20 10:09:45 2008 New Revision: 10079 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add fix from MODENDP-143 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 20 10:09:45 2008 @@ -2891,7 +2891,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Process REFER to [%s@%s]\n", exten, (char *) refer_to->r_url->url_host); - if (refer_to->r_url->url_headers) { + if (refer_to->r_url->url_headers && strstr(refer_to->r_url->url_headers, "Replaces=")) { sip_replaces_t *replaces; nua_handle_t *bnh; char *rep;

1 0

[commit] r10078 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: mikej Date: Mon Oct 20 08:57:43 2008 New Revision: 10078 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax2-parser.c Log: (FSBUILD-83) format string issue found by new gcc. Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax2-parser.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/iax2-parser.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/iax2-parser.c Mon Oct 20 08:57:43 2008 @@ -56,7 +56,7 @@ static void internaloutput(const char *str) { - printf(str); + printf("%s", str); } static void internalerror(const char *str)

1 0

[commit] r10077 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: mikej Date: Mon Oct 20 08:54:37 2008 New Revision: 10077 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: (FSBUILD-83) no need to allocate this twice 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 20 08:54:37 2008 @@ -1548,7 +1548,6 @@ static void update_mwi(vm_profile_t *profile, const char *id, const char *domain_name, const char *myfolder) { - char *mwi_id; const char *yn = "no"; int total_new_messages = 0; int total_saved_messages = 0; @@ -1565,13 +1564,10 @@ if (total_new_messages || total_new_urgent_messages) { yn = "yes"; } - mwi_id = switch_mprintf("%s@%s", id, domain_name); - switch_assert(mwi_id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", "%s@%s", id, domain_name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); switch_event_fire(&event); - switch_safe_free(mwi_id); }

1 0

[commit] r10076 - freeswitch/trunk/src
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: mikej Date: Sun Oct 19 23:58:04 2008 New Revision: 10076 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: attempt to fix FSCORE-207 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 Sun Oct 19 23:58:04 2008 @@ -755,15 +755,15 @@ read_codec = switch_core_session_get_read_codec(session); - if (!strcasecmp(read_codec->implementation->iananame, "l16")) { - l16++; - } - - if (switch_strlen_zero(file) || !read_codec) { + if (switch_strlen_zero(file) || !read_codec || !read_codec->implementation) { status = SWITCH_STATUS_FALSE; goto end; } + if (!strcasecmp(read_codec->implementation->iananame, "l16")) { + l16++; + } + if ((alt = strchr(file, ':'))) { char *dup;

1 0

[commit] r10075 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: mikej Date: Sun Oct 19 23:51:26 2008 New Revision: 10075 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: tweak Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sun Oct 19 23:51:26 2008 @@ -73,11 +73,15 @@ } } else { +#ifdef WIN32 + x64++; +#else if (sizeof(void *) == 4) { arch = "i586"; } else { x64++; } +#endif if ((mh = mpg123_new(arch, NULL))) { if (x64) {

1 0

[commit] r10074 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: mikej Date: Sun Oct 19 20:32:21 2008 New Revision: 10074 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: don't send disconnect on every reply. Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sun Oct 19 20:32:21 2008 @@ -619,7 +619,7 @@ } } - if (listener->sock) { + if (listener->sock && listener->hup) { char content_buf[512] = ""; const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com!\n"; int message_len = strlen(message);

1 0

[commit] r10073 - freeswitch/trunk/debian
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: brian Date: Sun Oct 19 20:13:42 2008 New Revision: 10073 Modified: freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install Log: remove these from debs Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Sun Oct 19 20:13:42 2008 @@ -47,7 +47,6 @@ /opt/freeswitch/conf/autoload_configs/alsa.conf.xml /opt/freeswitch/conf/autoload_configs/portaudio.conf.xml /opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -/opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml /opt/freeswitch/conf/autoload_configs/enum.conf.xml /opt/freeswitch/conf/autoload_configs/logfile.conf.xml /opt/freeswitch/conf/autoload_configs/limit.conf.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Sun Oct 19 20:13:42 2008 @@ -88,7 +88,6 @@ opt/freeswitch/conf/autoload_configs/alsa.conf.xml opt/freeswitch/conf/autoload_configs/portaudio.conf.xml opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml opt/freeswitch/conf/autoload_configs/enum.conf.xml opt/freeswitch/conf/autoload_configs/logfile.conf.xml opt/freeswitch/conf/autoload_configs/limit.conf.xml

1 0

[commit] r10072 - in freeswitch/trunk/src/mod: applications/mod_conference applications/mod_voicemail asr_tts/mod_openmrcp formats/mod_shout
by Freeswitch SVN 19 Oct '08

19 Oct '08

Author: mikej Date: Sun Oct 19 19:58:43 2008 New Revision: 10072 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: (MDXMLINT-36) don't add module interfaces before returning from error conditions in module load functions 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 Sun Oct 19 19:58:43 2008 @@ -5290,11 +5290,6 @@ } api_syntax = p; - SWITCH_ADD_API(api_interface, "conference", "Conference module commands", conf_api_main, p); - SWITCH_ADD_APP(app_interface, global_app_name, global_app_name, NULL, conference_function, NULL, SAF_NONE); - SWITCH_ADD_APP(app_interface, "conference_set_auto_outcall", "conference_set_auto_outcall", NULL, conference_auto_function, NULL, SAF_NONE); - SWITCH_ADD_CHAT(chat_interface, CONF_CHAT_PROTO, chat_send); - /* create/register custom event message type */ if (switch_event_reserve_subclass(CONF_EVENT_MAINT) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", CONF_EVENT_MAINT); @@ -5316,6 +5311,11 @@ return SWITCH_STATUS_GENERR; } + SWITCH_ADD_API(api_interface, "conference", "Conference module commands", conf_api_main, p); + SWITCH_ADD_APP(app_interface, global_app_name, global_app_name, NULL, conference_function, NULL, SAF_NONE); + SWITCH_ADD_APP(app_interface, "conference_set_auto_outcall", "conference_set_auto_outcall", NULL, conference_auto_function, NULL, SAF_NONE); + SWITCH_ADD_CHAT(chat_interface, CONF_CHAT_PROTO, chat_send); + send_presence(SWITCH_EVENT_PRESENCE_IN); globals.running = 1; 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 Sun Oct 19 19:58:43 2008 @@ -3555,7 +3555,6 @@ } /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_APP(app_interface, "voicemail", "Voicemail", VM_DESC, voicemail_function, VM_USAGE, SAF_NONE); if (switch_event_bind(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL) != SWITCH_STATUS_SUCCESS) { @@ -3563,6 +3562,7 @@ return SWITCH_STATUS_GENERR; } + SWITCH_ADD_APP(app_interface, "voicemail", "Voicemail", VM_DESC, voicemail_function, VM_USAGE, SAF_NONE); SWITCH_ADD_API(commands_api_interface, "voicemail", "voicemail", voicemail_api_function, VOICEMAIL_SYNTAX); SWITCH_ADD_API(commands_api_interface, "voicemail_inject", "voicemail_inject", voicemail_inject_api_function, VM_INJECT_USAGE); SWITCH_ADD_API(commands_api_interface, "vm_boxcount", "vm_boxcount", boxcount_api_function, BOXCOUNT_SYNTAX); Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Sun Oct 19 19:58:43 2008 @@ -937,6 +937,11 @@ switch_speech_interface_t *speech_interface; switch_asr_interface_t *asr_interface; + /* initialize openmrcp */ + if (openmrcp_init() != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); speech_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SPEECH_INTERFACE); @@ -961,11 +966,6 @@ asr_interface->asr_check_results = openmrcp_asr_check_results; asr_interface->asr_get_results = openmrcp_asr_get_results; - /* initialize openmrcp */ - if (openmrcp_init() != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; - } - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sun Oct 19 19:58:43 2008 @@ -1458,6 +1458,7 @@ curl_global_init(CURL_GLOBAL_ALL); + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE); file_interface->interface_name = modname; @@ -1470,16 +1471,12 @@ file_interface->file_set_string = shout_file_set_string; file_interface->file_get_string = shout_file_get_string; - /* connect my internal structure to the blank pointer passed to me */ - //*module_interface = &shout_module_interface; - shout_init(); mpg123_init(); + load_config(); SWITCH_ADD_API(shout_api_interface, "telecast", "telecast", telecast_api_function, TELECAST_SYNTAX); - load_config(); - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10071 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 19 Oct '08

19 Oct '08

Author: brian Date: Sun Oct 19 19:55:54 2008 New Revision: 10071 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: don't add API or complete till after the config is parsed Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Sun Oct 19 19:55:54 2008 @@ -343,10 +343,6 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_API(xml_curl_api_interface, "xml_curl", "XML Curl", xml_curl_function, XML_CURL_SYNTAX); - switch_console_set_complete("add xml_curl debug_on"); - switch_console_set_complete("add xml_curl debug_off"); - memset(&globals,0,sizeof(globals)); globals.pool = pool; globals.hash_root = NULL; @@ -358,6 +354,10 @@ return SWITCH_STATUS_FALSE; } + SWITCH_ADD_API(xml_curl_api_interface, "xml_curl", "XML Curl", xml_curl_function, XML_CURL_SYNTAX); + switch_console_set_complete("add xml_curl debug_on"); + switch_console_set_complete("add xml_curl debug_off"); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10070 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 19 Oct '08

19 Oct '08

Author: mikej Date: Sun Oct 19 19:31:24 2008 New Revision: 10070 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: fix windows build Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sun Oct 19 19:31:24 2008 @@ -620,14 +620,14 @@ } if (listener->sock) { - char buf[512] = ""; + char content_buf[512] = ""; const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com!\n"; - int mlen = strlen(message); + int message_len = strlen(message); - switch_snprintf(buf, sizeof(buf), "Content-Type: text/disconnect-notice\nContent-Length %d\n\n", mlen); - len = strlen(buf); - switch_socket_send(listener->sock, buf, &len); - len = mlen; + switch_snprintf(content_buf, sizeof(content_buf), "Content-Type: text/disconnect-notice\nContent-Length %d\n\n", message_len); + len = strlen(content_buf); + switch_socket_send(listener->sock, content_buf, &len); + len = message_len; switch_socket_send(listener->sock, message, &len); }

1 0