- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12536 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: mrene Date: Mon Mar 9 12:25:52 2009 New Revision: 12536 Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Mon Mar 9 12:25:52 2009 @@ -169,7 +169,7 @@ return ret; } -static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "[^:]+:[^:]+:[^:]+" }; +static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "[^:]+:[^:]+:.+" }; static switch_xml_config_item_t config_settings[] = { SWITCH_CONFIG_ITEM("odbc-dsn", SWITCH_CONFIG_STRING, 0, &globals.odbc_dsn, NULL, &limit_config_dsn,

1 0

[commit] r12535 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: brian Date: Mon Mar 9 11:36:56 2009 New Revision: 12535 Log: fix MODENDP-196 Modified: freeswitch/trunk/src/switch_loadable_module.c Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Mar 9 11:36:56 2009 @@ -433,6 +433,11 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deleting Endpoint '%s'\n", ptr->interface_name); + if (switch_event_create(&event, SWITCH_EVENT_MODULE_UNLOAD) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "endpoint"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_fire(&event); + } switch_core_hash_delete(loadable_modules.endpoint_hash, ptr->interface_name); } }

1 0

[commit] r12534 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: anthm Date: Mon Mar 9 11:17:01 2009 New Revision: 12534 Log: FSCORE-326 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 Mon Mar 9 11:17:01 2009 @@ -808,7 +808,9 @@ setrlimit(RLIMIT_CPU, &rlp); setrlimit(RLIMIT_DATA, &rlp); setrlimit(RLIMIT_FSIZE, &rlp); +#ifdef RLIMIT_NPROC setrlimit(RLIMIT_NPROC, &rlp); +#endif #ifdef RLIMIT_RTPRIO setrlimit(RLIMIT_RTPRIO, &rlp); #endif

1 0

[commit] r12533 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: anthm Date: Mon Mar 9 11:11:03 2009 New Revision: 12533 Log: FSCORE-325 Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Mon Mar 9 11:11:03 2009 @@ -628,7 +628,7 @@ rlp.rlim_max = SWITCH_THREAD_STACKSIZE; setrlimit(RLIMIT_STACK, &rlp); fprintf(stderr, "Error: stacksize %ld is too large: run ulimit -s %d or run %s -waste.\nauto-adjusting stack size for optimal performance....\n", - rlp.rlim_max / 1024, SWITCH_THREAD_STACKSIZE / 1024, argv[0]); + (int)(rlp.rlim_max / 1024), SWITCH_THREAD_STACKSIZE / 1024, argv[0]); apr_terminate(); ret = (int)execv(argv[0], argv);

1 0

[commit] r12532 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: mrene Date: Mon Mar 9 10:25:05 2009 New Revision: 12532 Log: why didnt that work Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Mon Mar 9 10:25:05 2009 @@ -169,7 +169,7 @@ return ret; } -static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "(.+?):(.+?):(.+)" }; +static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "[^:]+:[^:]+:[^:]+" }; static switch_xml_config_item_t config_settings[] = { SWITCH_CONFIG_ITEM("odbc-dsn", SWITCH_CONFIG_STRING, 0, &globals.odbc_dsn, NULL, &limit_config_dsn, @@ -203,7 +203,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); #endif } - + if (switch_strlen_zero(globals.odbc_dsn) || switch_strlen_zero(odbc_user) || switch_strlen_zero(odbc_pass)) { globals.dbname = "call_limit";

1 0

[commit] r12531 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: anthm Date: Mon Mar 9 10:02:04 2009 New Revision: 12531 Log: add contact-host param to gateways 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 Mon Mar 9 10:02:04 2009 @@ -1087,7 +1087,8 @@ *context = profile->context, *expire_seconds = "3600", *retry_seconds = "30", - *from_user = "", *from_domain = "", *register_proxy = NULL, *contact_params = NULL, *params = NULL, *register_transport = NULL; + *from_user = "", *from_domain = "", *register_proxy = NULL, *contact_host = NULL, + *contact_params = NULL, *params = NULL, *register_transport = NULL; if (!context) { context = "default"; @@ -1190,6 +1191,8 @@ from_user = val; } else if (!strcmp(var, "from-domain")) { from_domain = val; + } else if (!strcmp(var, "contact-host")) { + contact_host = val; } else if (!strcmp(var, "register-proxy")) { register_proxy = val; } else if (!strcmp(var, "contact-params")) { @@ -1295,7 +1298,7 @@ gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s;transport=%s", proxy, register_transport); gateway->register_from = switch_core_sprintf(gateway->pool, "<sip:%s@%s;transport=%s>", from_user, from_domain, register_transport); - sipip = profile->extsipip ? profile->extsipip : profile->sipip; + sipip = contact_host ? contact_host : profile->extsipip ? profile->extsipip : profile->sipip; if (extension_in_contact) { format = strchr(sipip, ':') ? "<sip:%s@[%s]:%d%s>" : "<sip:%s@%s:%d%s>"; gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension,

1 0

[commit] r12530 - freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: intralanman Date: Mon Mar 9 00:38:45 2009 New Revision: 12530 Log: adding config file to hold configurables and logging to syslog now Added: freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/cdr-csv-importer.ini Modified: freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/cdr-csv-importer Modified: freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/cdr-csv-importer ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/cdr-csv-importer (original) +++ freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/cdr-csv-importer Mon Mar 9 00:38:45 2009 @@ -2,32 +2,37 @@ use DBI; use Data::Dumper; +use Sys::Syslog; -$config->{connect_string} = 'DBI:mysql:freeswitch'; -$config->{username} = 'root'; -$config->{password} = ''; -$config->{table} = "cdrs"; -$config->{fields} = [ - "caller_id_name", - "caller_id_number", - "destination_number", - "context", - "start_stamp", - "answer_stamp", - "end_stamp", - "duration", - "billsec", - "hangup_cause", - "uuid", - "bleg_uuid", - "accountcode", - "read_codec", - "write_codec", - ]; +my $config={}; +my $db; +my $identifier = 'cdr-csv-importer'; + +sub parse_config { + open(CONFIG, "<cdr-csv-importer.ini") or die("Can't open config file (cdr-csv-importer.ini)\n"); + while (<CONFIG>) { + #print $_; + chomp; #kill whitespaces + + next if !(m/^[[:alnum:]]/); #skip lines that don't start right + next if m/^\s*$/; #skip lines with only whitespace + next if m/^;/; #skip ini comments + next if m(/^\[.*\]/); # skip the start of a section + + my ($key, $val) = split(/\s+=\s+/, $_, 2); + #print "'$key' = '$val'\n"; + if($key eq "fields") { + @{$config->{fields}} = split(/,/, $val); + } else { + $config->{$key} = $val; + } + } + close(CONFIG); +} sub create_table { - my $db = shift; - my $sql = "CREATE TABLE IF NOT EXISTS`cdrs` ( +# my $db = shift; + my $sql = "CREATE TABLE IF NOT EXISTS `$config->{table}` ( `id` int(11) NOT NULL auto_increment, `caller_id_name` varchar(255) NOT NULL default '', `caller_id_number` varchar(255) NOT NULL default '', @@ -62,7 +67,14 @@ $query->execute(); } -my $db = &connect_db; +openlog($identifier, 'ndelay,pid', LOG_USER); +open(STDERR,"|logger -t \"${identifier}[$$]: \"") or die "Error: Unable to redirect STDERR to logger!"; +open(STDOUT,"|logger -t \"${identifier}[$$]: \"") or die "Error: Unable to redirect STDOUT to logger!"; +&parse_config; +#print Dumper $config; +open(PID, ">$config->{pid_file}"); +print PID $$; +$db = &connect_db; &create_table($db); $field_count = @{$config->{fields}}; my $values = '?'; @@ -71,18 +83,23 @@ $fields = sprintf('%s, %s', $fields, $config->{fields}[$i]); $values = sprintf('%s, ?', $values); } -#print "$field_count - $fields $values\n"; my $query = sprintf( "INSERT INTO %s (%s) VALUES (%s);", $config->{table}, join(',', @{$config->{fields}}), $values ); -#print "$query\n"; +syslog(LOG_INFO, "$query"); + +sub mylog { + $log = shift; + syslog(LOG_INFO, "$log"); +} +print Dumper @ARGV; my $query_handle = $db->prepare($query); while (<STDIN>) { - print $_; + syslog(LOG_INFO, $_); chomp; @values = split(/,/); #print Dumper @values; Added: freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/cdr-csv-importer.ini ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/cdr-csv-importer.ini Mon Mar 9 00:38:45 2009 @@ -0,0 +1,7 @@ +[default] +table = cdrs +username = freeswitch +password = Fr33Sw1tch +connect_string = DBI:mysql:freeswitch +pid_file = /var/run/cdr-csv-importer.pid +fields = caller_id_name,caller_id_number,destination_number,context,start_stamp,answer_stamp,end_stamp,duration,billsec,hangup_cause,uuid,bleg_uuid,accountcode,read_codec,write_codec

1 0

[commit] r12529 - freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: intralanman Date: Sun Mar 8 19:36:03 2009 New Revision: 12529 Log: adding cdr importer... Added: freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/ freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/cdr-csv-importer Added: freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/cdr-csv-importer ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/cdr-csv-importer Sun Mar 8 19:36:03 2009 @@ -0,0 +1,90 @@ +#!/usr/bin/perl + +use DBI; +use Data::Dumper; + +$config->{connect_string} = 'DBI:mysql:freeswitch'; +$config->{username} = 'root'; +$config->{password} = ''; +$config->{table} = "cdrs"; +$config->{fields} = [ + "caller_id_name", + "caller_id_number", + "destination_number", + "context", + "start_stamp", + "answer_stamp", + "end_stamp", + "duration", + "billsec", + "hangup_cause", + "uuid", + "bleg_uuid", + "accountcode", + "read_codec", + "write_codec", + ]; + +sub create_table { + my $db = shift; + my $sql = "CREATE TABLE IF NOT EXISTS`cdrs` ( + `id` int(11) NOT NULL auto_increment, + `caller_id_name` varchar(255) NOT NULL default '', + `caller_id_number` varchar(255) NOT NULL default '', + `destination_number` varchar(255) NOT NULL default '', + `context` varchar(255) NOT NULL default '', + `start_stamp` varchar(255) NOT NULL default '', + `answer_stamp` varchar(255) NOT NULL default '', + `end_stamp` varchar(255) NOT NULL default '', + `duration` varchar(255) NOT NULL default '', + `billsec` varchar(255) NOT NULL default '', + `hangup_cause` varchar(255) NOT NULL default '', + `uuid` varchar(255) NOT NULL default '', + `bleg_uuid` varchar(255) NOT NULL default '', + `accountcode` varchar(255) NOT NULL default '', + `read_codec` varchar(255) NOT NULL default '', + `write_codec` varchar(255) NOT NULL default '', + PRIMARY KEY (`id`), + UNIQUE KEY `uuid` (`uuid`) +) ENGINE=InnoDB"; + $db->do($sql); + if (!$db->{Executed}) { + die("We couldn't CREATE the DB table\n"); + } +} + +sub connect_db { + return DBI->connect($config->{connect_string}, $config->{username}, $config->{password}); +} + +sub is_db_connected { + $query = $db->prepare("SELECT CURRENT_TIMESTAMP;"); + $query->execute(); +} + +my $db = &connect_db; +&create_table($db); +$field_count = @{$config->{fields}}; +my $values = '?'; +my $fields = $config->{fields}[0]; +for ($i=1; $i<$field_count; $i++) { + $fields = sprintf('%s, %s', $fields, $config->{fields}[$i]); + $values = sprintf('%s, ?', $values); +} +#print "$field_count - $fields $values\n"; + + +my $query = sprintf( + "INSERT INTO %s (%s) VALUES (%s);", + $config->{table}, join(',', @{$config->{fields}}), $values + ); +#print "$query\n"; + +my $query_handle = $db->prepare($query); +while (<STDIN>) { + print $_; + chomp; + @values = split(/,/); + #print Dumper @values; + $query_handle->execute(@values); +}

1 0

[commit] r12528 - freeswitch/trunk/src/mod/applications/mod_skel
by FreeSWITCH SVN 08 Mar '09

08 Mar '09

Author: mrene Date: Sun Mar 8 16:53:02 2009 New Revision: 12528 Log: update mod_skel config example Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Sun Mar 8 16:53:02 2009 @@ -83,10 +83,14 @@ static switch_xml_config_item_t instructions[] = { /* parameter name type reloadable pointer default value options structure */ - SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation), - SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, CONFIG_RELOADABLE, &globals.codec_negotiation, (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum), - SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, CONFIG_RELOADABLE, &globals.sip_trace, (void*)SWITCH_FALSE, config_callback_siptrace, NULL ), - SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, CONFIG_RELOADABLE | CONFIG_REQUIRED, &globals.integer, (void*)100, &config_opt_integer), + SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation, \ + "greedy|generous|evil", "Specifies the codec negotiation scheme to be used."), + SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, CONFIG_RELOADABLE, &globals.codec_negotiation, (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum, + "greedy|generous|evil", "Specifies the codec negotiation scheme to be used."), + SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, CONFIG_RELOADABLE, &globals.sip_trace, (void*)SWITCH_FALSE, config_callback_siptrace, NULL , + "yes|no", "If enabled, print out sip messages on the console."), + SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, CONFIG_RELOADABLE | CONFIG_REQUIRED, &globals.integer, (void*)100, &config_opt_integer, + NULL, NULL), SWITCH_CONFIG_ITEM_END() };

1 0

[commit] r12527 - in freeswitch/trunk/libs/esl: . src
by FreeSWITCH SVN 08 Mar '09

08 Mar '09

Author: mrene Date: Sun Mar 8 15:45:18 2009 New Revision: 12527 Log: remove unused var Modified: freeswitch/trunk/libs/esl/Makefile freeswitch/trunk/libs/esl/src/esl_oop.cpp Modified: freeswitch/trunk/libs/esl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/Makefile (original) +++ freeswitch/trunk/libs/esl/Makefile Sun Mar 8 15:45:18 2009 @@ -5,7 +5,7 @@ BASE_FLAGS=$(INCS) -DHAVE_EDITLINE $(DEBUG) -I$(LIBEDIT_DIR)/src/ -fPIC PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes CFLAGS=$(BASE_FLAGS) $(PICKY) -CXXFLAGS=$(BASE_FLAGS) +CXXFLAGS=$(BASE_FLAGS) -Wall -Werror MYLIB=libesl.a LIBS=-lncurses -lpthread -lesl LDFLAGS=-L. Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Sun Mar 8 15:45:18 2009 @@ -296,8 +296,6 @@ const char *ESLevent::serialize(const char *format) { - int isxml = 0; - this_check(""); esl_safe_free(serialized_string);

1 0