December 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10981 - freeswitch/trunk/src
by FreeSWITCH SVN 28 Dec '08

28 Dec '08

Author: brian Date: Sun Dec 28 18:17:29 2008 New Revision: 10981 Log: fix acl parsing for cidr from recent changes to directory layout Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Dec 28 18:17:29 2008 @@ -881,7 +881,7 @@ if (domain) { switch_event_t *my_params = NULL; switch_xml_t x_domain, xml_root; - switch_xml_t ut; + switch_xml_t gt, gts, ut, uts; switch_event_create(&my_params, SWITCH_EVENT_GENERAL); switch_assert(my_params); @@ -914,6 +914,32 @@ free(token); } } + + for (gts = switch_xml_child(x_domain, "groups"); gts; gts = gts->next) { + for (gt = switch_xml_child(gts, "group"); gt; gt = gt->next) { + for (uts = switch_xml_child(gt, "users"); uts; uts = uts->next) { + for (ut = switch_xml_child(uts, "user"); ut; ut = ut->next) { + const char *user_cidr = switch_xml_attr(ut, "cidr"); + const char *id = switch_xml_attr(ut, "id"); + + if (id && user_cidr) { + char *token = switch_mprintf("%s@%s", id, domain); + switch_assert(token); + + if (switch_network_list_add_cidr_token(list, user_cidr, ok, token) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding %s (%s) [%s] to list %s\n", + user_cidr, ok ? "allow" : "deny", switch_str_nil(token), name); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Adding %s (%s) [%s] to list %s\n", + user_cidr, ok ? "allow" : "deny", switch_str_nil(token), name); + } + free(token); + } + } + } + } + } + switch_xml_free(xml_root); } else if (cidr) { if (switch_network_list_add_cidr(list, cidr, ok) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r10976 - freeswitch/trunk/conf
by FreeSWITCH SVN 27 Dec '08

27 Dec '08

Author: brian Date: Sat Dec 27 18:56:22 2008 New Revision: 10976 Log: notes Modified: freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Sat Dec 27 18:56:22 2008 @@ -80,6 +80,12 @@ --> <X-PRE-PROCESS cmd="set" data="bind_server_ip=auto"/> +  + <!-- external_rtp_ip Used as the public IP address for SDP. Can be an ip address or a string like "stun:stun.server.com"

1 0

[commit] r10973 - freeswitch/trunk/scripts
by FreeSWITCH SVN 27 Dec '08

27 Dec '08

Author: brian Date: Sat Dec 27 14:29:28 2008 New Revision: 10973 Log: I don't wanna loose this. ;) Added: freeswitch/trunk/scripts/m4a-to-wav.sh Added: freeswitch/trunk/scripts/m4a-to-wav.sh ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/m4a-to-wav.sh Sat Dec 27 14:29:28 2008 @@ -0,0 +1,8 @@ +for file in *.m4a; do name=`echo $file | sed "s/\ /\_/g" | sed "s/.m4a//"`; \ + echo "Convert m4a $file to $name.wav"; faad -o $name.wav "$file" > /dev/null 2>&1; \ + for rate in 8000 16000 32000 48000; do mkdir -p $rate; \ + echo "Creating $rate kHz -> $rate/$name.wav"; \ + sox $name.wav -c 1 -r $rate $rate/$name.wav vol 0.06; \ + done; \ + rm -f *.wav; \ +done;

1 0

[commit] r10972 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Dec '08

27 Dec '08

Author: brian Date: Sat Dec 27 12:42:42 2008 New Revision: 10972 Log: on second thought this is much better Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Sat Dec 27 12:42:42 2008 @@ -1185,19 +1185,15 @@ } } - /* Backwards Compatibility */ if (switch_true(parse)) { - switch_xml_t ut, gateways_tag; + switch_xml_t gts, gt, uts, ut, gateways_tag; + /* Backwards Compatibility */ for (ut = switch_xml_child(x_domain_tag, "user"); ut; ut = ut->next) { if (((gateways_tag = switch_xml_child(ut, "gateways")))) { parse_gateways(profile, gateways_tag); } } - } - - /* New Method with <groups> tags and users are now inside a <users> tag */ - if (switch_true(parse)) { - switch_xml_t gts, gt, uts, ut, gateways_tag; + /* New Method with <groups> tags and users are now inside a <users> tag */ for (gts = switch_xml_child(x_domain_tag, "groups"); gts; gts = gts->next) { for (gt = switch_xml_child(gts, "group"); gt; gt = gt->next) { for (uts = switch_xml_child(gt, "users"); uts; uts = uts->next) {

1 0

[commit] r10971 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Dec '08

27 Dec '08

Author: brian Date: Sat Dec 27 12:38:21 2008 New Revision: 10971 Log: can't break backwards compatibility Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Sat Dec 27 12:38:21 2008 @@ -1184,7 +1184,18 @@ dname, profile->name); } } - + + /* Backwards Compatibility */ + if (switch_true(parse)) { + switch_xml_t ut, gateways_tag; + for (ut = switch_xml_child(x_domain_tag, "user"); ut; ut = ut->next) { + if (((gateways_tag = switch_xml_child(ut, "gateways")))) { + parse_gateways(profile, gateways_tag); + } + } + } + + /* New Method with <groups> tags and users are now inside a <users> tag */ if (switch_true(parse)) { switch_xml_t gts, gt, uts, ut, gateways_tag; for (gts = switch_xml_child(x_domain_tag, "groups"); gts; gts = gts->next) {

1 0

[commit] r10970 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Dec '08

27 Dec '08

Author: brian Date: Sat Dec 27 11:56:58 2008 New Revision: 10970 Log: register gateways from users after group changes. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Sat Dec 27 11:56:58 2008 @@ -1184,12 +1184,18 @@ dname, profile->name); } } - + if (switch_true(parse)) { - switch_xml_t ut, gateways_tag; - for (ut = switch_xml_child(x_domain_tag, "user"); ut; ut = ut->next) { - if (((gateways_tag = switch_xml_child(ut, "gateways")))) { - parse_gateways(profile, gateways_tag); + switch_xml_t gts, gt, uts, ut, gateways_tag; + for (gts = switch_xml_child(x_domain_tag, "groups"); gts; gts = gts->next) { + for (gt = switch_xml_child(gts, "group"); gt; gt = gt->next) { + for (uts = switch_xml_child(gt, "users"); uts; uts = uts->next) { + for (ut = switch_xml_child(uts, "user"); ut; ut = ut->next) { + if (((gateways_tag = switch_xml_child(ut, "gateways")))) { + parse_gateways(profile, gateways_tag); + } + } + } } } }

1 0

[commit] r10965 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: mikej Date: Fri Dec 26 16:24:34 2008 New Revision: 10965 Log: formatting Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 16:24:34 2008 @@ -326,7 +326,7 @@ } } - if(argv_error){ + if (argv_error){ printf("\n"); return usage(argv[0]); }

1 0

[commit] r10964 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: mikej Date: Fri Dec 26 16:20:58 2008 New Revision: 10964 Log: better output Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 16:20:58 2008 @@ -391,7 +391,11 @@ esl_log(ESL_LOG_INFO, "Using profile %s [%s]\n", profile->name, profile->host); if (argv_host) { - snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s@%s> ", profile->host, profile->name); + if (argv_port && profile->port != 8021) { + snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s:%u@%s> ", profile->host, profile->port, profile->name); + } else { + snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s@%s> ", profile->host, profile->name); + } } else { snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", profile->name); }

1 0

[commit] r10963 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: mikej Date: Fri Dec 26 16:10:40 2008 New Revision: 10963 Log: fix command line args when config file present Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 16:10:40 2008 @@ -365,16 +365,6 @@ } esl_config_close_file(&cfg); } - - if (argv_host) { - esl_set_string(profiles[cur].host, temp_host); - } - if (argv_port) { - profiles[cur].port = (esl_port_t)temp_port; - } - if (argv_pass) { - esl_set_string(profiles[cur].pass, temp_pass); - } if (optind < argc) { if (get_profile(argv[optind], &profile)) { @@ -388,10 +378,20 @@ } } + if (argv_host) { + esl_set_string(profile->host, temp_host); + } + if (argv_port) { + profile->port = (esl_port_t)temp_port; + } + if (argv_pass) { + esl_set_string(profile->pass, temp_pass); + } + esl_log(ESL_LOG_INFO, "Using profile %s [%s]\n", profile->name, profile->host); if (argv_host) { - snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", profile->host); + snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s@%s> ", profile->host, profile->name); } else { snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", profile->name); }

1 0

[commit] r10962 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 26 Dec '08

26 Dec '08

Author: silik0n Date: Fri Dec 26 15:47:53 2008 New Revision: 10962 Log: add debug to profile config Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Dec 26 15:47:53 2008 @@ -168,6 +168,7 @@ char host[128]; esl_port_t port; char pass[128]; + int debug; } cli_profile_t; static cli_profile_t profiles[128] = {{{0}}}; @@ -257,7 +258,7 @@ int argv_pass = 0 ; int temp_port = 0; int argv_port = 0; - int temp_log = 0; + int temp_log = -1; int argv_error = 0; int argv_exec = 0; char argv_command[256] = ""; @@ -355,7 +356,12 @@ if (pt > 0) { profiles[cur].port = (esl_port_t)pt; } - } + } else if (!strcasecmp(var, "debug")) { + int dt = atoi(val); + if (dt > -1 && dt < 8){ + profiles[cur].debug = dt; + } + } } esl_config_close_file(&cfg); } @@ -376,6 +382,9 @@ profile = &profiles[0]; } else { esl_log(ESL_LOG_INFO, "Chosen profile %s\n", profile->name); + if (temp_log < 0 ) { + esl_global_set_default_logger(profile->debug); + } } }

1 0