- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8760 - freeswitch/trunk/src
by Freeswitch SVN 05 Jun '08

05 Jun '08

Author: anthm Date: Wed Jun 4 20:23:58 2008 New Revision: 8760 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: update Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Jun 4 20:23:58 2008 @@ -1195,7 +1195,7 @@ peer_channel = peer_channels[idx]; } else { status = SWITCH_STATUS_FALSE; - if (caller_channel) { + if (caller_channel && peer_channel) { process_import(session, peer_channel); } peer_channel = NULL; @@ -1238,7 +1238,9 @@ if (status == SWITCH_STATUS_SUCCESS) { if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); - process_import(session, peer_channel); + if (peer_channel) { + process_import(session, peer_channel); + } } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel)); *cause = SWITCH_CAUSE_SUCCESS;

1 0

[commit] r8759 - freeswitch/trunk/src
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 19:33:29 2008 New Revision: 8759 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: add import var Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Jun 4 19:33:29 2008 @@ -454,6 +454,29 @@ return status; } +static void process_import(switch_core_session_t *session, switch_channel_t *peer_channel) +{ + const char *import, *val; + switch_channel_t *caller_channel; + + switch_assert(session && peer_channel); + caller_channel = switch_core_session_get_channel(session); + + if ((import = switch_channel_get_variable(caller_channel, "import"))) { + char *mydata = switch_core_session_strdup(session, import); + int i, argc; + char *argv[64] = { 0 }; + + if ((argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { + for(i = 0; i < argc; i++) { + if ((val = switch_channel_get_variable(peer_channel, argv[i]))) { + switch_channel_set_variable(caller_channel, argv[i], val); + } + } + } + } +} + #define MAX_PEERS 128 SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *session, switch_core_session_t **bleg, @@ -1172,6 +1195,9 @@ peer_channel = peer_channels[idx]; } else { status = SWITCH_STATUS_FALSE; + if (caller_channel) { + process_import(session, peer_channel); + } peer_channel = NULL; goto done; } @@ -1212,6 +1238,7 @@ if (status == SWITCH_STATUS_SUCCESS) { if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); + process_import(session, peer_channel); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel)); *cause = SWITCH_CAUSE_SUCCESS;

1 0

[commit] r8758 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 19:18:59 2008 New Revision: 8758 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: blank username will trigger a lookup for user "nobody" 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 Wed Jun 4 19:18:59 2008 @@ -1033,14 +1033,15 @@ domain_name = realm; } - if (switch_xml_locate_user("id", username, domain_name, ip, &xml, &domain, &user, params) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate_user("id", switch_strlen_zero(username) ? "nobody" : username, + domain_name, ip, &xml, &domain, &user, params) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", username, domain_name); ret = AUTH_FORBIDDEN; goto end; } if (!(mailbox = (char *) switch_xml_attr(user, "mailbox"))) { - mailbox = username; + mailbox = switch_strlen_zero(username) ? "nobody" : username; } dparams = switch_xml_child(domain, "params");

1 0

[commit] r8757 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 19:15:57 2008 New Revision: 8757 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: avoiding deadlock (by not locking then locking again) 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 Wed Jun 4 19:15:57 2008 @@ -1561,8 +1561,6 @@ "pa ringdev #<num>|<partial name>\n" "--------------------------------------------------------------------------------\n"; - switch_mutex_lock(globals.pa_mutex); - if (stream->param_event) { http = switch_event_get_header(stream->param_event, "http-host"); } @@ -1679,7 +1677,11 @@ if (http) { stream->write_function(stream, "<pre>"); } + + switch_mutex_lock(globals.pa_mutex); status = func(&argv[lead], argc - lead, stream); + switch_mutex_unlock(globals.pa_mutex); + if (http) { stream->write_function(stream, "\n\n</pre>"); } @@ -1726,8 +1728,6 @@ "<td><input name=action type=submit value=\"D\"></td></tr>\n" "</table>" "</form><br></center></td></tr></table>\n"); } - switch_mutex_lock(globals.pa_mutex); - switch_safe_free(mycmd); return status; }

1 0

[commit] r8756 - in freeswitch/trunk: conf src/mod/applications/mod_voicemail
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 18:52:37 2008 New Revision: 8756 Modified: freeswitch/trunk/conf/notify-voicemail.tpl freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix var names and add voicemail_notify_email template var Modified: freeswitch/trunk/conf/notify-voicemail.tpl ============================================================================== --- freeswitch/trunk/conf/notify-voicemail.tpl (original) +++ freeswitch/trunk/conf/notify-voicemail.tpl Wed Jun 4 18:52:37 2008 @@ -1,5 +1,5 @@ From: "${voicemail_caller_id_name}" <${voicemail_caller_id_number}@${voicemail_domain}> -To: <${voicemail_email}> +To: <${voicemail_notify_email}> Subject: Voicemail from "${voicemail_caller_id_name}" <${voicemail_caller_id_number}> ${voicemail_message_len} X-Priority: ${voicemail_priority} X-Mailer: FreeSWITCH 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 Wed Jun 4 18:52:37 2008 @@ -1288,7 +1288,7 @@ int total_new_urgent_messages = 0; int total_saved_urgent_messages = 0; int heard_auto_saved = 0, heard_auto_new = 0; - char *email_vm = NULL; + char *vm_email = NULL; char foo[2] = ""; switch_input_args_t args = { 0 }; @@ -1392,7 +1392,7 @@ message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); memset(&cbt, 0, sizeof(cbt)); - cbt.email = email_vm; + cbt.email = vm_email; switch (play_msg_type) { case MSG_NEW: { @@ -1661,7 +1661,7 @@ } else if (!strcasecmp(var, "vm-password")) { thepass = val; } else if (!strcasecmp(var, "vm-mailto")) { - email_vm = switch_core_session_strdup(session, val); + vm_email = switch_core_session_strdup(session, val); } } switch_xml_free(x_domain_root); @@ -1731,8 +1731,8 @@ switch_caller_profile_t *caller_profile = switch_channel_get_caller_profile(channel); switch_file_handle_t fh = { 0 }; switch_input_args_t args = { 0 }; - char *email_vm = NULL; - char *email_notify_vm = NULL; + char *vm_email = NULL; + char *vm_notify_email = NULL; int send_mail = 0; cc_t cc = { 0 }; char *read_flags = NORMAL_FLAG_STRING; @@ -1789,9 +1789,9 @@ const char *val = switch_xml_attr_soft(x_param, "value"); if (!strcasecmp(var, "vm-mailto")) { - email_vm = switch_core_session_strdup(session, val); + vm_email = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "vm-notify-mailto")) { - email_notify_vm = switch_core_session_strdup(session, val); + vm_notify_email = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "email-addr")) { email_addr = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "vm-email-all-messages")) { @@ -1806,17 +1806,17 @@ } } - if (send_main && switch_strlen_zero(email_vm) && !switch_strlen_zero(email_addr)) { - email_vm = switch_core_session_strdup(session, email_addr); - if (switch_strlen_zero(email_vm)) { + if (send_main && switch_strlen_zero(vm_email) && !switch_strlen_zero(email_addr)) { + vm_email = switch_core_session_strdup(session, email_addr); + if (switch_strlen_zero(vm_email)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No email address, not going to send email.\n"); send_main = 0; } } - if (send_notify && switch_strlen_zero(email_notify_vm)) { - email_notify_vm = email_vm; - if (switch_strlen_zero(email_notify_vm)) { + if (send_notify && switch_strlen_zero(vm_notify_email)) { + vm_notify_email = vm_email; + if (switch_strlen_zero(vm_notify_email)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No notify email address, not going to notify.\n"); send_notify = 0; } @@ -1986,7 +1986,7 @@ end: - if (send_mail && !switch_strlen_zero(email_vm) && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + if (send_mail && !switch_strlen_zero(vm_email) && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { switch_event_t *event; char *from; char *body; @@ -2026,8 +2026,12 @@ switch_channel_set_variable(channel, "voicemail_time", date); switch_snprintf(tmp, sizeof(tmp), "%d", priority); switch_channel_set_variable(channel, "voicemail_priority", tmp); - switch_channel_set_variable(channel, "voicemail_email", email_vm); - + if (vm_email) { + switch_channel_set_variable(channel, "voicemail_email", vm_email); + } + if (vm_notify_email) { + switch_channel_set_variable(channel, "voicemail_notify_email", vm_notify_email); + } l_duration = (long) message_len *1000000; switch_core_measure_time(l_duration, &duration); duration.day += duration.yr * 365; @@ -2077,12 +2081,12 @@ } if (email_attach) { - switch_simple_email(email_vm, from, header_string, body, file_path); + switch_simple_email(vm_email, from, header_string, body, file_path); } else { - switch_simple_email(email_vm, from, header_string, body, NULL); + switch_simple_email(vm_email, from, header_string, body, NULL); } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", email_vm); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", vm_email); switch_safe_free(body); if (headers != profile->email_headers) { @@ -2124,9 +2128,9 @@ body = switch_mprintf("%u second Voicemail from %s %s", message_len, caller_profile->caller_id_name, caller_profile->caller_id_number); } - switch_simple_email(email_notify_vm, from, header_string, body, NULL); + switch_simple_email(vm_notify_email, from, header_string, body, NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending notify message to %s\n", email_notify_vm); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending notify message to %s\n", vm_notify_email); switch_safe_free(body); if (headers != profile->notify_email_headers) {

1 0

[commit] r8755 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: stkn Date: Wed Jun 4 14:01:26 2008 New Revision: 8755 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Log: Only link libswift, other libs are dynamically loaded by the swift engine Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Wed Jun 4 14:01:26 2008 @@ -1,4 +1,4 @@ -LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm" ; fi ; +LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lm" ; fi ; LOCAL_INSERT_CFLAGS=test $$osarch = "Darwin" || echo "-I$(SWIFT_HOME)/include -I/opt/swift/include"; LOCAL_CFLAGS=-w

1 0

[commit] r8754 - freeswitch/trunk/libs/apr/memory/unix
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 13:53:33 2008 New Revision: 8754 Modified: freeswitch/trunk/libs/apr/memory/unix/apr_pools.c Log: prevent endless loop Modified: freeswitch/trunk/libs/apr/memory/unix/apr_pools.c ============================================================================== --- freeswitch/trunk/libs/apr/memory/unix/apr_pools.c (original) +++ freeswitch/trunk/libs/apr/memory/unix/apr_pools.c Wed Jun 4 13:53:33 2008 @@ -1990,7 +1990,12 @@ } lastp = &c->next; - c = c->next; + + if (c == c->next) { + c = NULL; + } else { + c = c->next; + } } }

1 0

[commit] r8753 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 12:13:15 2008 New Revision: 8753 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add per user acl 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 Wed Jun 4 12:13:15 2008 @@ -1060,7 +1060,7 @@ passwd = val; } - if (!strcasecmp(var, "auth_acl")) { + if (!strcasecmp(var, "auth-acl")) { auth_acl = val; } @@ -1079,7 +1079,7 @@ passwd = val; } - if (!strcasecmp(var, "auth_acl")) { + if (!strcasecmp(var, "auth-acl")) { auth_acl = val; }

1 0

[commit] r8752 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 12:11:09 2008 New Revision: 8752 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add per user acl 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 Wed Jun 4 12:11:09 2008 @@ -785,6 +785,8 @@ if (ok && !(profile->pflags & PFLAG_BLIND_REG)) { type = REG_AUTO_REGISTER; } else if (!ok) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", network_ip, profile->reg_acl[x]); + nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto end; } }

1 0

[commit] r8751 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 12:04:08 2008 New Revision: 8751 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add per user acl 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 Wed Jun 4 12:04:08 2008 @@ -785,8 +785,6 @@ if (ok && !(profile->pflags & PFLAG_BLIND_REG)) { type = REG_AUTO_REGISTER; } else if (!ok) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", network_ip, profile->reg_acl[x]); - nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto end; } } @@ -933,6 +931,7 @@ char hexdigest[2 * SU_MD5_DIGEST_SIZE + 1] = ""; char *domain_name = NULL; switch_event_t *params = NULL; + const char *auth_acl = NULL; username = realm = nonce = uri = qop = cnonce = nc = response = NULL; @@ -1037,7 +1036,7 @@ ret = AUTH_FORBIDDEN; goto end; } - + if (!(mailbox = (char *) switch_xml_attr(user, "mailbox"))) { mailbox = username; } @@ -1059,6 +1058,10 @@ passwd = val; } + if (!strcasecmp(var, "auth_acl")) { + auth_acl = val; + } + if (!strcasecmp(var, "a1-hash")) { a1_hash = val; } @@ -1074,12 +1077,24 @@ passwd = val; } + if (!strcasecmp(var, "auth_acl")) { + auth_acl = val; + } + if (!strcasecmp(var, "a1-hash")) { a1_hash = val; } } } + if (auth_acl) { + if (!switch_check_network_list_ip(ip, auth_acl)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by user acl %s\n", ip, auth_acl); + ret = AUTH_FORBIDDEN; + goto end; + } + } + if (switch_strlen_zero(passwd) && switch_strlen_zero(a1_hash)) { ret = AUTH_OK; goto skip_auth;

1 0