May 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13382 - freeswitch/trunk/src
by FreeSWITCH SVN 18 May '09

18 May '09

Author: anthm Date: Mon May 18 12:39:59 2009 New Revision: 13382 Log: MODAPP-280 Modified: freeswitch/trunk/src/switch_ivr_play_say.c 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 Mon May 18 12:39:59 2009 @@ -860,7 +860,8 @@ char *argv[128] = { 0 }; int argc; int cur; - + int done = 0; + switch_core_session_get_read_impl(session, &read_impl); if ((play_delimiter_val = switch_channel_get_variable(channel, "playback_delimiter"))) { @@ -898,7 +899,7 @@ argv[0] = (char *)file; } - for(cur = 0; switch_channel_ready(channel) && cur < argc; cur++) { + for(cur = 0; switch_channel_ready(channel) && !done && cur < argc; cur++) { file = argv[cur]; asis = 0; eof = 0; @@ -1125,7 +1126,6 @@ ilen = samples; for (;;) { - int done = 0; int do_speed = 1; int last_speed = -1;

1 0

[commit] r13381 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 18 May '09

18 May '09

Author: mikej Date: Mon May 18 12:34:35 2009 New Revision: 13381 Log: abolish mailbox attribute in users and use number-alias attribute instead MODAPP-218 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 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 May 18 12:34:35 2009 @@ -1312,35 +1312,38 @@ return -1; } -static void resolve_id(const char **myid, const char *domain_name, const char *action) +static char *resolve_id(const char *myid, const char *domain_name, const char *action) { switch_xml_t xx_user, xx_domain, xx_domain_root; switch_event_t *params; + char *ret = (char *) myid; switch_event_create(&params, SWITCH_EVENT_GENERAL); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", action); - if (switch_xml_locate_user("id", *myid, domain_name, NULL, + if (switch_xml_locate_user("id", myid, domain_name, NULL, &xx_domain_root, &xx_domain, &xx_user, NULL, params) == SWITCH_STATUS_SUCCESS) { - *myid = switch_xml_attr(xx_user, "id"); + ret = strdup(switch_xml_attr(xx_user, "id")); switch_xml_free(xx_domain_root); } switch_event_destroy(&params); + return ret; } -static void message_count(vm_profile_t *profile, const char *myid, const char *domain_name, const char *myfolder, +static void message_count(vm_profile_t *profile, const char *id_in, const char *domain_name, const char *myfolder, int *total_new_messages, int *total_saved_messages, int *total_new_urgent_messages, int *total_saved_urgent_messages) { char msg_count[80] = ""; callback_t cbt = { 0 }; char sql[256]; + char *myid; cbt.buf = msg_count; cbt.len = sizeof(msg_count); - resolve_id(&myid, domain_name, "message-count"); - + myid = resolve_id(id_in, domain_name, "message-count"); + switch_snprintf(sql, sizeof(sql), "select count(*) from voicemail_msgs where username='%s' and domain='%s' and in_folder='%s' and read_epoch=0", myid, domain_name, myfolder); @@ -1364,6 +1367,11 @@ myid, domain_name, myfolder, URGENT_FLAG_STRING); vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); *total_saved_urgent_messages = atoi(msg_count); + + if (myid != id_in) { + free(myid); + } + } #define VM_STARTSAMPLES 1024 * 32 @@ -2137,7 +2145,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", myid, domain_name); ok = 0; } else { - myid = switch_xml_attr(x_user, "id"); + myid = switch_core_session_strdup(session, switch_xml_attr(x_user, "id")); } switch_event_destroy(&params); @@ -2864,7 +2872,7 @@ if (switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), &x_domain_root, &x_domain, &x_user, NULL, locate_params) == SWITCH_STATUS_SUCCESS) { - id = switch_xml_attr(x_user, "id"); + id = switch_core_session_strdup(session, switch_xml_attr(x_user, "id")); if ((x_params = switch_xml_child(x_user, "params"))) { 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"); @@ -3104,7 +3112,7 @@ if (!x_domain_root) { switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), &x_domain_root, &x_domain, &x_user, NULL, NULL); - id = switch_xml_attr(x_user, "id"); + id = switch_core_session_strdup(session, switch_xml_attr(x_user, "id")); } if (x_domain_root) { @@ -3783,15 +3791,16 @@ } -static void do_web(vm_profile_t *profile, const char *user, const char *domain, const char *host, const char *port, const char *uri, switch_stream_handle_t *stream) +static void do_web(vm_profile_t *profile, const char *user_in, const char *domain, const char *host, const char *port, const char *uri, switch_stream_handle_t *stream) { char buf[80] = ""; struct holder holder; char *sql; callback_t cbt = { 0 }; int ttl = 0; + char *user; - resolve_id(&user, domain, "web-vm"); + user = resolve_id(user_in, domain, "web-vm"); stream->write_function(stream, "Content-type: text/html\n\n"); memset(&holder, 0, sizeof(holder)); @@ -3824,6 +3833,10 @@ if (profile->web_tail) { stream->raw_write_function(stream, (uint8_t *) profile->web_tail, strlen(profile->web_tail)); } + + if (user != user_in) { + free(user); + } } #define VM_INJECT_USAGE "[group=]<box> <sound_file> [<cid_num>] [<cid_name>]"

1 0

[commit] r13380 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by FreeSWITCH SVN 18 May '09

18 May '09

Author: brian Date: Mon May 18 12:19:31 2009 New Revision: 13380 Log: remove mailbox from mod_xml_rpc also and check number-alias Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c 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 Mon May 18 12:19:31 2009 @@ -209,7 +209,7 @@ switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", "check"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "number_alias", "check"); if (switch_xml_locate_user("id", user, domain_name, NULL, &x_domain_root, &x_domain, &x_user, NULL, params) != SWITCH_STATUS_SUCCESS) { switch_event_destroy(&params); @@ -217,7 +217,7 @@ } switch_event_destroy(&params); - box = switch_xml_attr_soft(x_user, "mailbox"); + box = switch_xml_attr_soft(x_user, "number-alias"); if ((x_params = switch_xml_child(x_domain, "params"))) {

1 0

[commit] r13379 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 18 May '09

18 May '09

Author: brian Date: Mon May 18 12:16:48 2009 New Revision: 13379 Log: remove mailbox and replace with number_alias Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Mon May 18 12:16:48 2009 @@ -1557,7 +1557,7 @@ const char *passwd = NULL; const char *a1_hash = NULL; char *sql; - char *mailbox = NULL; + char *number_alias = NULL; switch_xml_t domain, xml = NULL, user, param, uparams, dparams, group = NULL, gparams = NULL; char hexdigest[2 * SU_MD5_DIGEST_SIZE + 1] = ""; char *domain_name = NULL; @@ -1714,8 +1714,8 @@ } } - if (!(mailbox = (char *) switch_xml_attr(user, "mailbox"))) { - mailbox = switch_strlen_zero(username) ? "nobody" : username; + if (!(number_alias = (char *) switch_xml_attr(user, "number-alias"))) { + number_alias = switch_strlen_zero(username) ? "nobody" : username; } dparams = switch_xml_child(domain, "params"); @@ -1877,10 +1877,10 @@ switch_xml_t xparams[3]; int i = 0; - switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "sip_mailbox", mailbox); + switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "sip_number_alias", number_alias); switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "sip_auth_username", username); switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "sip_auth_realm", realm); - switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "mailbox", mailbox); + switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "number_alias", number_alias); switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "user_name", username); switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "domain_name", domain_name);

1 0

[commit] r13378 - freeswitch/trunk/src
by FreeSWITCH SVN 18 May '09

18 May '09

Author: mikej Date: Mon May 18 12:11:47 2009 New Revision: 13378 Log: abolish mailbox attribute in users and use number-alias attribute instead MODAPP-218 Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon May 18 12:11:47 2009 @@ -2026,7 +2026,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *session, const char *data) { switch_xml_t x_domain, xml = NULL, x_user, x_param, x_params, x_group = NULL; - char *user, *mailbox, *domain; + char *user, *number_alias, *domain; switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_FALSE; @@ -2049,8 +2049,8 @@ status = SWITCH_STATUS_SUCCESS; - if ((mailbox = (char *) switch_xml_attr(x_user, "mailbox"))) { - switch_channel_set_variable(channel, "mailbox", mailbox); + if ((number_alias = (char *) switch_xml_attr(x_user, "number-alias"))) { + switch_channel_set_variable(channel, "number_alias", number_alias); } if ((x_params = switch_xml_child(x_domain, "variables"))) {

1 0

[commit] r13377 - in freeswitch/trunk/src: . mod/applications/mod_commands mod/applications/mod_voicemail
by FreeSWITCH SVN 18 May '09

18 May '09

Author: mikej Date: Mon May 18 12:06:13 2009 New Revision: 13377 Log: abolish mailbox attribute in users and use number-alias attribute instead MODAPP-218 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon May 18 12:06:13 2009 @@ -357,7 +357,6 @@ switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "user", user); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", user); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "domain", domain); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "type", type); 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 May 18 12:06:13 2009 @@ -1312,6 +1312,22 @@ return -1; } +static void resolve_id(const char **myid, const char *domain_name, const char *action) +{ + switch_xml_t xx_user, xx_domain, xx_domain_root; + switch_event_t *params; + + switch_event_create(&params, SWITCH_EVENT_GENERAL); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", action); + + if (switch_xml_locate_user("id", *myid, domain_name, NULL, + &xx_domain_root, &xx_domain, &xx_user, NULL, params) == SWITCH_STATUS_SUCCESS) { + *myid = switch_xml_attr(xx_user, "id"); + switch_xml_free(xx_domain_root); + } + + switch_event_destroy(&params); +} static void message_count(vm_profile_t *profile, const char *myid, const char *domain_name, const char *myfolder, int *total_new_messages, int *total_saved_messages, int *total_new_urgent_messages, int *total_saved_urgent_messages) @@ -1322,6 +1338,8 @@ cbt.buf = msg_count; cbt.len = sizeof(msg_count); + + resolve_id(&myid, domain_name, "message-count"); switch_snprintf(sql, sizeof(sql), "select count(*) from voicemail_msgs where username='%s' and domain='%s' and in_folder='%s' and read_epoch=0", @@ -1746,7 +1764,7 @@ switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params, x_param; switch_status_t status; char pass_buf[80] = "", *mypass = NULL, id_buf[80] = "", *myfolder = NULL; - const char *thepass = NULL, *myid = id, *actual_id = NULL, *thehash = NULL, *vmhash = NULL; + const char *thepass = NULL, *myid = id, *thehash = NULL, *vmhash = NULL; char term = 0; uint32_t timeout, attempts = 0; int failed = 0; @@ -1792,7 +1810,6 @@ play_msg_type = MSG_NONE; attempts = profile->max_login_attempts; myid = id; - actual_id = NULL; mypass = NULL; myfolder = "inbox"; vm_check_state = VM_CHECK_AUTH; @@ -1912,7 +1929,7 @@ vm_execute_sql(profile, sql, profile->mutex); vm_check_state = VM_CHECK_FOLDER_SUMMARY; - update_mwi(profile, actual_id ? actual_id : myid, domain_name, myfolder); + update_mwi(profile, myid, domain_name, myfolder); } break; case VM_CHECK_CONFIG: @@ -2020,13 +2037,10 @@ 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); - if (actual_id) { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Actual-User", actual_id); - } 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", actual_id ? actual_id : myid, domain_name, switch_channel_get_variable(channel, "network_addr"), + if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"), &xx_domain_root, &xx_domain, &xx_user, NULL, params) == SWITCH_STATUS_SUCCESS) { switch_xml_free(xx_domain_root); } @@ -2114,7 +2128,6 @@ switch_event_create(&params, SWITCH_EVENT_GENERAL); switch_assert(params); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", myid); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "destination_number", caller_profile->destination_number); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "caller_id_number", caller_id_number); @@ -2123,26 +2136,15 @@ &x_domain_root, &x_domain, &x_user, NULL, params) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", myid, domain_name); ok = 0; + } else { + myid = switch_xml_attr(x_user, "id"); } - + switch_event_destroy(&params); if (!ok) { goto end; - } else { - const char *x_box = switch_xml_attr(x_user, "mailbox"); - - if (x_box) { - myid = switch_core_session_strdup(session, x_box); - } - - if ((actual_id = switch_xml_attr(x_user, "id"))) { - actual_id = switch_core_session_strdup(session, actual_id); - } else { - actual_id = id; - } } - } thepass = thehash = NULL; @@ -2313,7 +2315,6 @@ { char *file_path = NULL, *dir_path = NULL; const char *myid = switch_xml_attr(x_user, "id"); - const char *mybox = switch_xml_attr(x_user, "mailbox"); switch_uuid_t uuid; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; const char *filename; @@ -2334,10 +2335,6 @@ switch_event_t *local_event = NULL; switch_status_t ret = SWITCH_STATUS_SUCCESS; - if (mybox) { - myid = mybox; - } - if (params) { switch_event_create(&local_event, SWITCH_EVENT_REQUEST_PARAMS); params = local_event; @@ -2846,7 +2843,6 @@ switch_event_t *vars = NULL; const char *vm_cc = NULL, *vtmp, *vm_ext = NULL; int disk_quota = 0; - switch_event_t *params = NULL; if (!(caller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"))) { caller_id_name = caller_profile->caller_id_name; @@ -2865,10 +2861,10 @@ switch_event_create(&locate_params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(locate_params); - switch_event_add_header_string(locate_params, SWITCH_STACK_BOTTOM, "mailbox", id); if (switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), &x_domain_root, &x_domain, &x_user, NULL, locate_params) == SWITCH_STATUS_SUCCESS) { + id = switch_xml_attr(x_user, "id"); if ((x_params = switch_xml_child(x_user, "params"))) { 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"); @@ -3105,13 +3101,10 @@ } } - switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); - switch_assert(params); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", id); - if (!x_domain_root) { switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), - &x_domain_root, &x_domain, &x_user, NULL, params); + &x_domain_root, &x_domain, &x_user, NULL, NULL); + id = switch_xml_attr(x_user, "id"); } if (x_domain_root) { @@ -3135,8 +3128,6 @@ } - switch_event_destroy(&params); - end: if (x_domain_root) { @@ -3419,11 +3410,11 @@ switch_xml_t x_item; switch_xml_t x_channel; int items; - char *user; - char *domain; - char *host; - char *port; - char *uri; + const char *user; + const char *domain; + const char *host; + const char *port; + const char *uri; }; @@ -3792,7 +3783,7 @@ } -static void do_web(vm_profile_t *profile, char *user, char *domain, char *host, char *port, char *uri, switch_stream_handle_t *stream) +static void do_web(vm_profile_t *profile, const char *user, const char *domain, const char *host, const char *port, const char *uri, switch_stream_handle_t *stream) { char buf[80] = ""; struct holder holder; @@ -3800,6 +3791,8 @@ callback_t cbt = { 0 }; int ttl = 0; + resolve_id(&user, domain, "web-vm"); + stream->write_function(stream, "Content-type: text/html\n\n"); memset(&holder, 0, sizeof(holder)); holder.profile = profile; Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon May 18 12:06:13 2009 @@ -1686,14 +1686,14 @@ } if (user_name) { - if (params && switch_event_get_header(params, (char *) "mailbox")) { - if ((*user = switch_xml_find_child_multi(tag, "user", "mailbox", user_name, "type", type, NULL))) { + if (!strcasecmp(key, "id")) { + if ((*user = switch_xml_find_child_multi(tag, "user", key, user_name, "number-alias", user_name, "type", type, NULL))) { + return SWITCH_STATUS_SUCCESS; + } + } else { + if ((*user = switch_xml_find_child_multi(tag, "user", key, user_name, "type", type, NULL))) { return SWITCH_STATUS_SUCCESS; } - } - - if ((*user = switch_xml_find_child_multi(tag, "user", key, user_name, "type", type, NULL))) { - return SWITCH_STATUS_SUCCESS; } }

1 0

[commit] r13376 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 18 May '09

18 May '09

Author: brian Date: Mon May 18 12:04:51 2009 New Revision: 13376 Log: adding default local stream just in case Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Mon May 18 12:04:51 2009 @@ -1,4 +1,13 @@ <configuration name="local_stream.conf" description="stream files from local dir"> +  + <directory name="default" path="$${base_dir}/sounds/music/8000"> + <param name="rate" value="8000"/> + <param name="shuffle" value="true"/> + <param name="channels" value="1"/> + <param name="interval" value="20"/> + <param name="timer-name" value="soft"/> + </directory> + <directory name="moh/8000" path="$${base_dir}/sounds/music/8000"> <param name="rate" value="8000"/> <param name="shuffle" value="true"/>

1 0

[commit] r13375 - freeswitch/trunk/conf/directory/default
by FreeSWITCH SVN 18 May '09

18 May '09

Author: mikej Date: Mon May 18 10:42:38 2009 New Revision: 13375 Log: remove mailbox= attribute Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/directory/default/brian.xml Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1000" mailbox="1000"> + <user id="1000"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1000"/> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1001" mailbox="1001"> + <user id="1001"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1001"/> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1002" mailbox="1002"> + <user id="1002"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1002"/> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1003" mailbox="1003"> + <user id="1003"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1003"/> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1004" mailbox="1004"> + <user id="1004"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1004"/> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1005" mailbox="1005"> + <user id="1005"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1005"/> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1006" mailbox="1006"> + <user id="1006"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1006"/> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1007" mailbox="1007"> + <user id="1007"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1007"/> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1008" mailbox="1008"> + <user id="1008"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1008"/> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1009" mailbox="1009"> + <user id="1009"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1009"/> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1010" mailbox="1010"> + <user id="1010"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1010"/> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1011" mailbox="1011"> + <user id="1011"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1011"/> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1012" mailbox="1012"> + <user id="1012"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1012"/> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1013" mailbox="1013"> + <user id="1013"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1013"/> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1014" mailbox="1014"> + <user id="1014"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1014"/> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1015" mailbox="1015"> + <user id="1015"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1015"/> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1016" mailbox="1016"> + <user id="1016"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1016"/> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1017" mailbox="1017"> + <user id="1017"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1017"/> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1018" mailbox="1018"> + <user id="1018"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1018"/> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Mon May 18 10:42:38 2009 @@ -1,5 +1,5 @@ <include> - <user id="1019" mailbox="1019"> + <user id="1019"> <params> <param name="password" value="$${default_password}"/> <param name="vm-password" value="1019"/> Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon May 18 10:42:38 2009 @@ -3,7 +3,7 @@ ipauth if you have an cidr= in the user attributes ie cidr="1.2.3.4/32" see <node type="allow" domain="$${domain}"/> in default acl.conf.xml --> - <user id="brian" mailbox="9999" cidr="192.0.2.0/24"> + <user id="brian" cidr="192.0.2.0/24">  <gateways>

1 0

[commit] r13374 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 18 May '09

18 May '09

Author: mikej Date: Mon May 18 09:56:09 2009 New Revision: 13374 Log: fix small memory Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon May 18 09:56:09 2009 @@ -2093,17 +2093,20 @@ { char *argv[10] = { 0 }; int argc = 0; - char *var, *val, *myarg; + char *var, *val, *myarg = NULL; mdl_profile_t *profile = NULL; int x; + switch_status_t status = SWITCH_STATUS_SUCCESS; if (session) { - return SWITCH_STATUS_FALSE; + status = SWITCH_STATUS_FALSE; + goto done; } if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", LOGIN_SYNTAX); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto done; } myarg = strdup(cmd); @@ -2112,7 +2115,8 @@ if (switch_strlen_zero(cmd) || argc != 1) { stream->write_function(stream, "USAGE: %s\n", LOGIN_SYNTAX); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto done; } if (argv[0] && !strncasecmp(argv[0], "profile=", 8)) { @@ -2123,7 +2127,8 @@ if (switch_test_flag(profile, TFLAG_IO)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile already exists.\n"); stream->write_function(stream, "Profile already exists\n"); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto done; } } @@ -2145,9 +2150,10 @@ } else { stream->write_function(stream, "FAIL\n"); } + done: + switch_safe_free(myarg); - return SWITCH_STATUS_SUCCESS; - + return status; } static switch_status_t load_config(void)

1 0

[commit] r13373 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 18 May '09

18 May '09

Author: brian Date: Mon May 18 09:09:49 2009 New Revision: 13373 Log: MODAPP-254 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon May 18 09:09:49 2009 @@ -1096,6 +1096,7 @@ switch_core_session_ctl(SCSC_LAST_SPS, &last_sps); switch_core_session_ctl(SCSC_SPS, &sps); stream->write_function(stream, "%d session(s) %d/%d\n", switch_core_session_count(), last_sps, sps); + stream->write_function(stream, "%d session(s) max\n", switch_core_session_limit(0)); if (html) { stream->write_function(stream, "</b>\n");

1 0