- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10199 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Wed Oct 29 20:52:11 2008 New Revision: 10199 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: apply patch from MODAPP-156 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Wed Oct 29 20:52:11 2008 @@ -245,22 +245,24 @@ } } - if (!(mypass1 && mypass2)) { + if (!switch_strlen_zero(mypass2) && !strcasecmp(mypass2, "user-choose")) { + mypass2 = NULL; + } + + if (!mypass1) { r->requestInfo.user = strdup(user); goto authed; } else { - if (mypass1) { - if (at) { - switch_snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass1); - } else { - switch_snprintf(z, sizeof(z), "%s:%s", user, mypass1); - } - Base64Encode(z, t); + if (at) { + switch_snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass1); + } else { + switch_snprintf(z, sizeof(z), "%s:%s", user, mypass1); + } + Base64Encode(z, t); - if (!strcmp(p, t)) { - r->requestInfo.user = strdup(box ? box : user); - goto authed; - } + if (!strcmp(p, t)) { + r->requestInfo.user = strdup(box ? box : user); + goto authed; } if (mypass2) { @@ -278,18 +280,16 @@ } if (box) { - if (mypass1) { - if (at) { - switch_snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass1); - } else { - switch_snprintf(z, sizeof(z), "%s:%s", box, mypass1); - } - Base64Encode(z, t); + if (at) { + switch_snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass1); + } else { + switch_snprintf(z, sizeof(z), "%s:%s", box, mypass1); + } + Base64Encode(z, t); - if (!strcmp(p, t)) { - r->requestInfo.user = strdup(box); - goto authed; - } + if (!strcmp(p, t)) { + r->requestInfo.user = strdup(box); + goto authed; } if (mypass2) {

1 0

[commit] r10198 - in freeswitch/trunk/src: . mod/event_handlers/mod_event_socket
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Wed Oct 29 20:39:55 2008 New Revision: 10198 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_event.c Log: add event socket listener filters filter <header-name> <header-value> filter <header-name> /<regexp>/ filter delete <header-name> filter delete all once even one filter is enabled you must pass a filter condition to get any events. which events are still limited by the events <event list> as always. 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 Wed Oct 29 20:39:55 2008 @@ -63,6 +63,7 @@ switch_memory_pool_t *pool; event_format_t format; switch_mutex_t *flag_mutex; + switch_mutex_t *filter_mutex; uint32_t flags; switch_log_level_t level; char *ebuf; @@ -79,6 +80,7 @@ switch_sockaddr_t *sa; char remote_ip[50]; switch_port_t remote_port; + switch_event_t *filters; struct listener *next; }; @@ -189,7 +191,11 @@ switch_thread_rwlock_unlock((*listener)->rwlock); switch_core_hash_destroy(&(*listener)->event_hash); switch_core_destroy_memory_pool(&(*listener)->pool); - + switch_mutex_lock((*listener)->filter_mutex); + if ((*listener)->filters) { + switch_event_destroy(&(*listener)->filters); + } + switch_mutex_unlock((*listener)->filter_mutex); *listener = NULL; } @@ -223,7 +229,8 @@ expire_listener(&l); continue; } - + + if (l->event_list[SWITCH_EVENT_ALL]) { send = 1; } else if ((l->event_list[event->event_id])) { @@ -232,6 +239,29 @@ } } + if (send && l->filters) { + switch_event_header_t *hp; + const char *hval; + + send = 0; + switch_mutex_lock(l->filter_mutex); + for (hp = l->filters->headers; hp; hp = hp->next) { + if ((hval = switch_event_get_header(event, hp->name))) { + if (*hp->value == '/') { + switch_regex_t *re = NULL; + int ovector[30]; + send = switch_regex_perform(hval, hp->value, &re, ovector, sizeof(ovector) / sizeof(ovector[0])); + switch_regex_safe_free(re); + } else { + if (!strcasecmp(hp->value, hval)) { + send = 1; + } + } + } + } + switch_mutex_unlock(l->filter_mutex); + } + if (send && switch_test_flag(l, LFLAG_MYEVENTS)) { char *uuid = switch_event_get_header(event, "unique-id"); if (!uuid || strcmp(uuid, switch_core_session_get_uuid(l->session))) { @@ -341,6 +371,8 @@ listener->session = session; switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_core_hash_init(&listener->event_hash, listener->pool); switch_set_flag(listener, LFLAG_AUTHED); for (x = 1; x < argc; x++) { @@ -520,6 +552,8 @@ listener->pool = pool; listener->format = EVENT_FORMAT_PLAIN; switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_core_hash_init(&listener->event_hash, listener->pool); switch_set_flag(listener, LFLAG_AUTHED); switch_set_flag(listener, LFLAG_STATEFUL); @@ -1049,6 +1083,44 @@ goto done; } + if (!strncasecmp(cmd, "filter ", 7)) { + char *header_name = cmd + 7; + char *header_val; + + strip_cr(header_name); + + while(header_name && *header_name && *header_name == ' ') header_name++; + + if (!(header_val = strchr(header_name, ' '))) { + switch_snprintf(reply, reply_len, "-ERR invalid syntax"); + goto done; + } + + *header_val++ = '\0'; + + + switch_mutex_lock(listener->filter_mutex); + if (!listener->filters) { + switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + } + + if (!strcasecmp(header_name, "delete")) { + if (!strcasecmp(header_val, "all")) { + switch_event_destroy(&listener->filters); + switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + } else { + switch_event_del_header(listener->filters, header_val); + } + switch_snprintf(reply, reply_len, "+OK filter deleted. [%s]", header_val); + } else { + switch_event_add_header_string(listener->filters, SWITCH_STACK_BOTTOM, header_name, header_val); + switch_snprintf(reply, reply_len, "+OK filter added. [%s]=[%s]", header_name, header_val); + } + switch_mutex_unlock(listener->filter_mutex); + + goto done; + } + if (listener->session || !strncasecmp(cmd, "myevents ", 9)) { switch_channel_t *channel = NULL; @@ -1651,7 +1723,11 @@ switch_thread_rwlock_wrlock(listener->rwlock); flush_listener(listener, SWITCH_TRUE, SWITCH_TRUE); - + switch_mutex_lock(listener->filter_mutex); + if (listener->filters) { + switch_event_destroy(&listener->filters); + } + switch_mutex_unlock(listener->filter_mutex); if (listener->sock) { char disco_buf[512] = ""; const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com!\n"; @@ -1831,6 +1907,8 @@ listener_pool = NULL; listener->format = EVENT_FORMAT_PLAIN; switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_core_hash_init(&listener->event_hash, listener->pool); switch_socket_addr_get(&listener->sa, SWITCH_TRUE, listener->sock); switch_get_addr(listener->remote_ip, sizeof(listener->remote_ip), listener->sa); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Oct 29 20:39:55 2008 @@ -605,13 +605,17 @@ SWITCH_DECLARE(switch_status_t) switch_event_del_header(switch_event_t *event, const char *header_name) { - switch_event_header_t *hp, *lp = NULL; + switch_event_header_t *hp, *lp = NULL, *tp; switch_status_t status = SWITCH_STATUS_FALSE; int x = 0; - for (hp = event->headers; hp; hp = hp->next) { + tp = event->headers; + while (tp) { + hp = tp; + tp = tp->next; + x++; switch_assert(x < 1000); - if (!strcmp(header_name, hp->name)) { + if (!strcasecmp(header_name, hp->name)) { if (lp) { lp->next = hp->next; } else { @@ -627,9 +631,9 @@ FREE(hp); } status = SWITCH_STATUS_SUCCESS; - break; + } else { + lp = hp; } - lp = hp; } return status;

1 0

[commit] r10197 - freeswitch/trunk/conf/dialplan/default
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: brian Date: Wed Oct 29 19:15:07 2008 New Revision: 10197 Added: freeswitch/trunk/conf/dialplan/default/01_example.com.xml - copied unchanged from r10196, /freeswitch/trunk/conf/dialplan/default/01_provider.com.xml Removed: freeswitch/trunk/conf/dialplan/default/01_provider.com.xml Log: fix FSCORE-211

1 0

[commit] r10196 - in freeswitch/trunk/conf: . dialplan/default directory/default
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: brian Date: Wed Oct 29 19:14:22 2008 New Revision: 10196 Added: freeswitch/trunk/conf/directory/default/example.com.xml - copied unchanged from r10189, /freeswitch/trunk/conf/directory/default/provider.com.xml Removed: freeswitch/trunk/conf/directory/default/provider.com.xml Modified: freeswitch/trunk/conf/dialplan/default/01_provider.com.xml freeswitch/trunk/conf/vars.xml Log: fix FSCORE-211 Modified: freeswitch/trunk/conf/dialplan/default/01_provider.com.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default/01_provider.com.xml (original) +++ freeswitch/trunk/conf/dialplan/default/01_provider.com.xml Wed Oct 29 19:14:22 2008 @@ -1,6 +1,6 @@ <include> - <extension name="local.provider.com"> + <extension name="local.example.com"> <condition field="${toll_allow}" expression="local"/> <condition field="destination_number" expression="^(\d{7})$"> <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> @@ -9,7 +9,7 @@ </condition> </extension> - <extension name="domestic.provider.com"> + <extension name="domestic.example.com"> <condition field="${toll_allow}" expression="domestic"/> <condition field="destination_number" expression="^(\d{11})$"> <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> @@ -18,7 +18,7 @@ </condition> </extension> - <extension name="international.provider.com"> + <extension name="international.example.com"> <condition field="${toll_allow}" expression="international"/> <condition field="destination_number" expression="^(011\d{10+})$"> <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed Oct 29 19:14:22 2008 @@ -120,13 +120,13 @@ Setting up your default sip provider is easy. Below are some values that should work in most cases. - These are for conf/directory/default/provider.com.xml + These are for conf/directory/default/example.com.xml --> - <X-PRE-PROCESS cmd="set" data="default_provider=provider.com"/> + <X-PRE-PROCESS cmd="set" data="default_provider=example.com"/> <X-PRE-PROCESS cmd="set" data="default_provider_username=joeuser"/> <X-PRE-PROCESS cmd="set" data="default_provider_password=password"/> - <X-PRE-PROCESS cmd="set" data="default_provider_from_domain=provider.com"/> + <X-PRE-PROCESS cmd="set" data="default_provider_from_domain=example.com"/>  <X-PRE-PROCESS cmd="set" data="default_provider_register=false"/> <X-PRE-PROCESS cmd="set" data="default_provider_contact=5000"/>

1 0

[commit] r10195 - freeswitch/trunk/src
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: anthm Date: Wed Oct 29 16:22:34 2008 New Revision: 10195 Modified: freeswitch/trunk/src/switch_channel.c Log: declinatio mortuus obfirmo! Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 29 16:22:34 2008 @@ -473,19 +473,15 @@ const char *uuid; const char *val = NULL; switch_assert(channel != NULL); - + if (!switch_strlen_zero(varname)) { if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { switch_core_session_t *session; - switch_mutex_lock(channel->profile_mutex); if ((session = switch_core_session_locate(uuid))) { switch_channel_t *tchannel = switch_core_session_get_channel(session); - switch_mutex_lock(tchannel->profile_mutex); val = switch_channel_get_variable(tchannel, varname); - switch_mutex_unlock(tchannel->profile_mutex); switch_core_session_rwunlock(session); } - switch_mutex_unlock(channel->profile_mutex); } } @@ -619,18 +615,11 @@ if (!switch_strlen_zero(varname)) { if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { switch_core_session_t *session; - switch_mutex_lock(channel->profile_mutex); if ((session = switch_core_session_locate(uuid))) { switch_channel_t *tchannel = switch_core_session_get_channel(session); - switch_mutex_lock(tchannel->profile_mutex); - switch_event_del_header(tchannel->variables, varname); - if (value) { - switch_event_add_header_string(tchannel->variables, SWITCH_STACK_BOTTOM, varname, value); - } - switch_mutex_unlock(tchannel->profile_mutex); + switch_channel_set_variable(tchannel, varname, value); switch_core_session_rwunlock(session); } - switch_mutex_unlock(channel->profile_mutex); return SWITCH_STATUS_SUCCESS; } }

1 0

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

29 Oct '08

Author: anthm Date: Wed Oct 29 15:15:14 2008 New Revision: 10194 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: update 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 Wed Oct 29 15:15:14 2008 @@ -163,20 +163,33 @@ return SWITCH_STATUS_SUCCESS; } +static void flush_listener(listener_t *listener, switch_bool_t flush_log, switch_bool_t flush_events) +{ + void *pop; + + if (listener->log_queue) { + while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) { + if (pop) free(pop); + } + } + + if (listener->event_queue) { + while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { + if (!pop) continue; + switch_event_t *pevent = (switch_event_t *) pop; + switch_event_destroy(&pevent); + } + } +} static void expire_listener(listener_t **listener) { - void *pop; + flush_listener(*listener, SWITCH_TRUE, SWITCH_TRUE); switch_thread_rwlock_unlock((*listener)->rwlock); switch_core_hash_destroy(&(*listener)->event_hash); switch_core_destroy_memory_pool(&(*listener)->pool); - while (switch_queue_trypop((*listener)->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { - switch_event_t *pevent = (switch_event_t *) pop; - switch_event_destroy(&pevent); - } - *listener = NULL; } @@ -1310,9 +1323,7 @@ switch_snprintf(reply, reply_len, "-ERR invalid log level"); } } else if (!strncasecmp(cmd, "nolog", 5)) { - void *pop; - while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS); - + flush_listener(listener, SWITCH_TRUE, SWITCH_FALSE); if (switch_test_flag(listener, LFLAG_LOG)) { switch_clear_flag_locked(listener, LFLAG_LOG); switch_snprintf(reply, reply_len, "+OK no longer logging"); @@ -1434,8 +1445,7 @@ switch_snprintf(reply, reply_len, "+OK events nixed"); } else if (!strncasecmp(cmd, "noevents", 8)) { - void *pop; - while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS); + flush_listener(listener, SWITCH_FALSE, SWITCH_TRUE); if (switch_test_flag(listener, LFLAG_EVENTS)) { uint8_t x = 0; @@ -1640,6 +1650,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session complete, waiting for children\n"); switch_thread_rwlock_wrlock(listener->rwlock); + flush_listener(listener, SWITCH_TRUE, SWITCH_TRUE); if (listener->sock) { char disco_buf[512] = "";

1 0

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

29 Oct '08

Author: anthm Date: Wed Oct 29 14:19:49 2008 New Revision: 10193 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: make connect event have chan vars 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 Wed Oct 29 14:19:49 2008 @@ -1535,7 +1535,7 @@ goto done; } - if (switch_event_create(&call_event, SWITCH_EVENT_COMMAND) != SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&call_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); switch_clear_flag_locked(listener, LFLAG_RUNNING); goto done;

1 0

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

29 Oct '08

Author: anthm Date: Wed Oct 29 14:00:27 2008 New Revision: 10192 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix broken fix 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 Wed Oct 29 14:00:27 2008 @@ -1948,6 +1948,9 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(nsession)); data = switch_core_session_strdup(nsession, outbound_profile->destination_number); + if ((dest_to = strchr(data, '^'))) { + *dest_to++ = '\0'; + } profile_name = data; nchannel = switch_core_session_get_channel(nsession); @@ -1988,10 +1991,6 @@ tech_pvt->transport = gateway_ptr->register_transport; - if ((dest_to = strchr(dest, '^'))) { - *dest_to++ = '\0'; - } - /* * Handle params, strip them off the destination and add them to the * invite contact.

1 0

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

29 Oct '08

Author: brian Date: Wed Oct 29 13:28:12 2008 New Revision: 10191 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: add events and pass-change dir lookup so xml_curl users can detect vm-pass change 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 Oct 29 13:28:12 2008 @@ -45,6 +45,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load); SWITCH_MODULE_DEFINITION(mod_voicemail, mod_voicemail_load, NULL, NULL); +#define VM_EVENT_MAINT "vm::maintenance" #define VM_MAX_GREETINGS 9 @@ -1646,7 +1647,8 @@ int informed = 0; char msg_count[80] = ""; switch_input_args_t folder_args = { 0 }; - + switch_event_t *params; + folder_args.input_callback = cancel_on_dtmf; folder_args.buf = &global_buf; folder_args.buflen = sizeof(global_buf); @@ -1655,6 +1657,18 @@ message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); + + switch_event_create_subclass(&params, SWITCH_EVENT_CUSTOM, VM_EVENT_MAINT); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Action", "folder-summary"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User", myid); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Domain", domain_name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Folder", myfolder); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Total-New-Messages", "%u", total_new_messages); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Total-Saved-Messages", "%u", total_saved_messages); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Total-New-Urgent-Messages", "%u", total_new_urgent_messages); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Total-Saved-Urgent-Messages", "%u", total_saved_urgent_messages); + switch_event_fire(&params); + if (total_new_urgent_messages > 0) { switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-new", total_new_urgent_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &folder_args)); @@ -1835,6 +1849,8 @@ } else if (!strcmp(input, profile->change_pass_key)) { char buf[256] = ""; char macro[256] = ""; + switch_event_t *params; + switch_xml_t xx_user, xx_domain, xx_domain_root; switch_snprintf(macro, sizeof(macro), "phrase:%s:%s", VM_ENTER_PASS_MACRO, profile->terminator_key); TRY_CODE(switch_ivr_read(session, 0, 255, macro, NULL, buf, sizeof(buf), 10000, profile->terminator_key)); @@ -1843,6 +1859,20 @@ switch_safe_free(file_path); switch_safe_free(sql); + switch_event_create_subclass(&params, SWITCH_EVENT_CUSTOM, VM_EVENT_MAINT); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Action", "change-password"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User-Password", buf); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User", myid); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Domain", domain_name); + switch_channel_event_set_data(channel, params); + + if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"), + &xx_domain_root, &xx_domain, &xx_user, params) == SWITCH_STATUS_SUCCESS) { + switch_xml_free(xx_domain_root); + } + + switch_event_fire(&params); + } else if (!strcmp(input, profile->record_name_key)) { file_path = switch_mprintf("%s%srecorded_name.%s", dir_path, SWITCH_PATH_SEPARATOR, profile->file_ext); TRY_CODE(create_file(session, profile, VM_RECORD_NAME_MACRO, file_path, &message_len, SWITCH_FALSE)); @@ -1866,7 +1896,7 @@ } else { switch_snprintf(key_buf, sizeof(key_buf), "%s:%s:%s:%s", profile->play_new_messages_key, profile->play_saved_messages_key, profile->config_menu_key, profile->terminator_key); - + status = vm_macro_get(session, VM_MENU_MACRO, key_buf, input, sizeof(input), 1, "", &term, timeout); } @@ -1953,23 +1983,6 @@ } - if (!mypass) { - if (auth) { - mypass = "OK"; - } else { - status = vm_macro_get(session, VM_ENTER_PASS_MACRO, profile->terminator_key, - pass_buf, sizeof(pass_buf), 0, profile->terminator_key, &term, timeout); - if (status != SWITCH_STATUS_SUCCESS) { - goto end; - } - if (*pass_buf == '\0') { - continue; - } else { - mypass = pass_buf; - } - } - } - x_params = switch_xml_child(x_user, "params"); thepass = thehash = NULL; @@ -1978,7 +1991,7 @@ for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr_soft(x_param, "name"); const char *val = switch_xml_attr_soft(x_param, "value"); - + if (!strcasecmp(var, "a1-hash")) { thehash = val; } else if (!strcasecmp(var, "vm-a1-hash")) { @@ -2003,6 +2016,26 @@ } + + if (!mypass) { + if (auth) { + mypass = "OK"; + } else { + status = vm_macro_get(session, VM_ENTER_PASS_MACRO, profile->terminator_key, + pass_buf, sizeof(pass_buf), 0, profile->terminator_key, &term, timeout); + if (status != SWITCH_STATUS_SUCCESS) { + goto end; + } + if (*pass_buf == '\0') { + continue; + } else { + mypass = pass_buf; + } + } + } + + + if (vmhash) { thehash = vmhash; } @@ -2216,7 +2249,22 @@ if (insert_db && switch_file_exists(file_path, pool) == SWITCH_STATUS_SUCCESS) { char *usql; + switch_event_t *params; + switch_event_create_subclass(&params, SWITCH_EVENT_CUSTOM, VM_EVENT_MAINT); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Action", "leave-message"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User", myid); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Domain", domain_name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Caller-ID-Name", caller_id_name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Caller-ID-Number", caller_id_number); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-File-Path", file_path); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Flags", read_flags); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Folder", myfolder); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Message-Len", "%u", message_len); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Timestamp", "%lu", (unsigned long) switch_timestamp(NULL)); + + switch_event_fire(&params); + usql = switch_mprintf("insert into voicemail_msgs values(%ld,0,'%q','%q','%q','%q','%q','%q','%q','%u','','%q')", (long) switch_timestamp(NULL), myid, domain_name, uuid_str, caller_id_name, caller_id_number, myfolder, file_path, message_len, read_flags); @@ -3577,6 +3625,12 @@ switch_api_interface_t *commands_api_interface; switch_status_t status; + /* create/register custom event message type */ + if (switch_event_reserve_subclass(VM_EVENT_MAINT) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", VM_EVENT_MAINT); + return SWITCH_STATUS_TERM; + } + if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { return status; }

1 0

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

29 Oct '08

Author: anthm Date: Wed Oct 29 12:29:28 2008 New Revision: 10190 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: sigh 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 Wed Oct 29 12:29:28 2008 @@ -2966,7 +2966,8 @@ switch_clear_flag_locked(b_tech_pvt, TFLAG_SIP_HOLD); switch_clear_flag_locked(tech_pvt, TFLAG_HOLD_LOCK); - switch_ivr_park_session(b_session); + switch_channel_set_state(switch_core_session_get_channel(b_session), CS_PARK); + new_b_session = switch_core_session_locate(br_b); a_session = switch_core_session_locate(br_a); sofia_info_send_sipfrag(a_session, new_b_session);

1 0