- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5535 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 15 Jul '07

15 Jul '07

Author: xachen Date: Sun Jul 15 19:30:14 2007 New Revision: 5535 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: Libpri 1.2.4 no longer available. Also fixed wanpipe to latest minor release on 3.1 branch Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Sun Jul 15 19:30:14 2007 @@ -1,9 +1,9 @@ BASE=../../../.. LIBPRI_HOST=http://ftp.digium.com/pub/libpri -LIBPRI=libpri-1.2.4 +LIBPRI=libpri-1.2.5 LIBPRI_FILE=$(LIBPRI).tar.gz LIBPRI_DIR=$(BASE)/libs/$(LIBPRI) -WANPIPE=wanpipe-3.1.0 +WANPIPE=wanpipe-3.1.1 WANPIPE_HOST=ftp://ftp.sangoma.com/linux/current_wanpipe/ WANPIPE_FILE=$(WANPIPE).tgz WANPIPE_DIR=$(BASE)/libs/$(WANPIPE)

1 0

[commit] r5534 - freeswitch/trunk/scripts/contrib/vile
by Freeswitch SVN 15 Jul '07

15 Jul '07

Author: xachen Date: Sun Jul 15 00:39:51 2007 New Revision: 5534 Added: freeswitch/trunk/scripts/contrib/vile/ Log: Contrib did for Vile

1 0

[commit] r5533 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 13 Jul '07

13 Jul '07

Author: trixter Date: Thu Jul 12 21:37:10 2007 New Revision: 5533 Modified: freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl Log: minor tweaks Modified: freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl (original) +++ freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl Thu Jul 12 21:37:10 2007 @@ -66,7 +66,6 @@ $o = $fs->raw_command("myevents"); $timer = threads->new(\&timeoutHandler); -$timer->detach; # event-date-timestamp @@ -100,5 +99,5 @@ $done=1; $fs->disconnect(); -sleep 3; # wait for the other thread to exit +$timer->join; print "done\n";

1 0

[commit] r5532 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 13 Jul '07

13 Jul '07

Author: trixter Date: Thu Jul 12 20:05:09 2007 New Revision: 5532 Modified: freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl Log: removed cruft Modified: freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl (original) +++ freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl Thu Jul 12 20:05:09 2007 @@ -10,7 +10,6 @@ use FreeSWITCH::Client; use threads; use threads::shared; -use POSIX ':signal_h'; # used for alarm to ensure we get heartbeats use Data::Dumper; # configure these

1 0

[commit] r5531 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 12 Jul '07

12 Jul '07

Author: trixter Date: Thu Jul 12 19:59:51 2007 New Revision: 5531 Added: freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl (contents, props changed) Log: coded to bkws specs, captures dtmf in async mode, prints to console, configurable timeouts for dtmf, from first digit in sequence (optional) and from last digit in sequence. Once a sequence is printed it starts over Added: freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/asyncsock.pl Thu Jul 12 19:59:51 2007 @@ -0,0 +1,105 @@ +#!/usr/bin/perl +# -*- mode:cperl; tab-width:4; c-basic-offset:4; c-indent-level:4; indent-tabs-mode:nil; -*- + +# +# this script will look for dtmf events in event socket in async mode (where FS calls this +# script instead of this script connecting to FS) and fill a buffer, when a timeout occurs it will +# return that entire DTMF sequence, lather, rinse, repeat +# + +use FreeSWITCH::Client; +use threads; +use threads::shared; +use POSIX ':signal_h'; # used for alarm to ensure we get heartbeats +use Data::Dumper; + +# configure these +my $ip = "0.0.0.0"; # the IP we listen on 0.0.0.0 is all +my $port = 8084; # the port we listen on +my $firstDigitDelay = 30; # seconds to wait from the first digit pressed - 0 disables +my $lastDigitDelay = 3; # seconds to wait from the last digit pressed + + +## +# dont touch these +## +my $fs; +my $pid; +my $dtmf : shared =""; +my $firstDigitTS : shared=0; +my $lastDigitTS : shared; +my $done : shared =0; + + +sub timeoutHandler { + while(!$done) { + if($dtmf != "") { + lock($dtmf); + $ts = time; + if (($firstDigitTS > 0) && ($firstDigitTS <= ($ts - $firstDigitDelay))) { + print "First digit timeout - $dtmf\n"; + $dtmf=""; + } elsif ($lastDigitTS <= ($ts - $lastDigitDelay)) { + print "Last digit timeout - $dtmf\n"; + $dtmf=""; + } + } + sleep 1; + } + + if($dtmf != "") { + print "Final DTMF when call died - $dtmf\n"; + } +} + + +$fs = init FreeSWITCH::Client {} or die "Error $@"; + +for (;;) { + $fs->accept($ip,$port); + + if (!($pid = fork)) { + last; + } +} + +$o = $fs->call_command("answer"); +$o = $fs->raw_command("myevents"); + +$timer = threads->new(\&timeoutHandler); +$timer->detach; + + +# event-date-timestamp +# event-name DTMF +while(my $r = $fs->readhash(undef)) { + if ($r->{socketerror}) { + last; + } + + if ($r->{has_event}) { + if($r->{'event-name'} == "DTMF") { + $ts=time; + # you can use the event TS as opposed to the perl one to eliminate network delay, event queue delay + # or whatever, I use the perl one to keep the example simple + + { + lock($dtmf); + if($dtmf == "") { + $firstDigitTS=$ts; + } + $lastDigitTS=$ts; + $dtmf.=$r->{'event'}->{'dtmf-string'}; + } + + print "Got dtmf $r->{'event'}->{'dtmf-string'} at $ts\n"; + } else { + print Dumper $r->{event}; + } + } +} + +$done=1; +$fs->disconnect(); +sleep 3; # wait for the other thread to exit +print "done\n";

1 0

[commit] r5530 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 12 Jul '07

12 Jul '07

Author: trixter Date: Thu Jul 12 00:51:34 2007 New Revision: 5530 Added: freeswitch/trunk/scripts/contrib/trixter/mod_xml_cdr.c Log: this is a replacement until other patches can be applied, it contains all my current patches to fix various things Added: freeswitch/trunk/scripts/contrib/trixter/mod_xml_cdr.c ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/mod_xml_cdr.c Thu Jul 12 00:51:34 2007 @@ -0,0 +1,284 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Brian West <brian.west(a)mac.com> + * Bret McDanel <trixter AT 0xdecafbad.com> + * + * mod_xml_cdr.c -- XML CDR Module to files or curl + * + */ +#include <sys/stat.h> +#include <switch.h> +#include <curl/curl.h> + +static struct { + char *cred; + char *url; + char *logDir; + char *errLogDir; + uint32_t delay; + uint32_t retries; + uint32_t shutdown; +} globals; + +SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_cdr_shutdown); +SWITCH_MODULE_DEFINITION(mod_xml_cdr, mod_xml_cdr_load, NULL, NULL); + +/* this function would have access to the HTML returned by the webserver, we dont need it + * and the default curl activity is to print to stdout, something not as desirable + * so we have a dummy function here + */ +static void httpCallBack() +{ + return; +} + +static switch_status_t my_on_hangup(switch_core_session_t *session) +{ + switch_xml_t cdr; + char *xml_text; + char *path; + int fd = -1; + uint32_t curTry; + long httpRes; + CURL *curl_handle = NULL; + char *curl_xml_text; + char *logdir; + switch_channel_t *channel = switch_core_session_get_channel(session); + int i; + + if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { + + /* build the XML */ + if(!(xml_text = switch_mprintf("<?xml version=\"1.0\"?>\n%s",switch_xml_toxml(cdr)) )) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + return SWITCH_STATUS_FALSE; + } + + /* do we log to the disk no matter what? */ + /* all previous functionality is retained */ + + if (!(logdir = switch_channel_get_variable(channel, "xml_cdr_base"))) { + logdir = globals.logDir; + } + + if(!switch_strlen_zero(logdir)) { + if ((path = switch_mprintf("%s/xml_cdr/%s.cdr.xml", logdir, switch_core_session_get_uuid(session)))) { + if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { + write(fd, xml_text, (unsigned) strlen(xml_text)); + close(fd); + fd = -1; + } else { + char ebuf[512] = { 0 }; +#ifdef WIN32 + strerror_s(ebuf, sizeof(ebuf), errno); +#else + strerror_r(errno, ebuf, sizeof(ebuf)); +#endif + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error![%s]\n", ebuf); + } + free(path); + } + } + + /* try to post it to the web server */ + if(!switch_strlen_zero(globals.url)) { + curl_handle = curl_easy_init(); + if(!(curl_xml_text = switch_mprintf("cdr=%s",xml_text) )) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + free(xml_text); + return SWITCH_STATUS_FALSE; + } + + if (!switch_strlen_zero(globals.cred)) { + curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY); + curl_easy_setopt(curl_handle, CURLOPT_USERPWD, globals.cred); + } + + curl_easy_setopt(curl_handle, CURLOPT_POST, 1); + curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_xml_text); + curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); + curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); + curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); + + + /* these were used for testing, optionally they may be enabled if someone desires + curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 120); // tcp timeout + curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); // 302 recursion level + */ + + for(curTry=0;curTry<=globals.retries;curTry++) { + curl_easy_perform(curl_handle); + curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE,&httpRes); + if(httpRes==200) { + curl_easy_cleanup(curl_handle); + free(curl_xml_text); + free(xml_text); + return SWITCH_STATUS_SUCCESS; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Got error [%ld] posting to web server\n",httpRes); + } + + /* make sure we dont sleep on the last try */ + for(i=0;i<globals.delay && (curTry != (globals.retries));i++) { + switch_sleep(1000); + if(globals.shutdown) { + /* we are shutting down so dont try to webpost any more */ + i=globals.delay; + curTry=globals.retries; + } + } + + } + free(curl_xml_text); + curl_easy_cleanup(curl_handle); + + /* if we are here the web post failed for some reason */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to post to web server, writing to file\n"); + + if ((path = switch_mprintf("%s/%s.cdr.xml", globals.errLogDir, switch_core_session_get_uuid(session)))) { + if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { + write(fd, xml_text, (unsigned) strlen(xml_text)); + close(fd); + fd = -1; + } else { + char ebuf[512] = { 0 }; +#ifdef WIN32 + strerror_s(ebuf, sizeof(ebuf), errno); +#else + strerror_r(errno, ebuf, sizeof(ebuf)); +#endif + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error![%s]\n", ebuf); + } + free(path); + } + } + free(xml_text); + switch_xml_free(cdr); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Generating Data!\n"); + } + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_state_handler_table_t state_handlers = { + /*.on_init */ NULL, + /*.on_ring */ NULL, + /*.on_execute */ NULL, + /*.on_hangup */ my_on_hangup, + /*.on_loopback */ NULL, + /*.on_transmit */ NULL +}; + +SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load) +{ + char *cf = "xml_cdr.conf"; + switch_xml_t cfg, xml, settings, param; + + + /* test global state handlers */ + switch_core_add_state_handler(&state_handlers); + + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + memset(&globals,0,sizeof(globals)); + + /* parse the config */ + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "cred")) { + globals.cred = val; + } else if (!strcasecmp(var, "url")) { + globals.url = val; + } else if (!strcasecmp(var, "delay")) { + globals.delay = (uint32_t) atoi(val); + } else if (!strcasecmp(var, "retries")) { + globals.retries = (uint32_t) atoi(val); + } else if (!strcasecmp(var, "logDir")) { + if (switch_strlen_zero(val)) { + globals.logDir = SWITCH_GLOBAL_dirs.log_dir; + } else { + globals.logDir = val; + } + } else if (!strcasecmp(var, "errLogDir")) { + globals.errLogDir = val; + } + + } + } + if(globals.retries < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "retries is negative, setting to 0\n"); + globals.retries = 0; + } + + + if(globals.retries && globals.delay<=0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "retries set but delay 0 setting to 5000ms\n"); + globals.delay = 5000; + } + + if(!switch_strlen_zero(globals.url) && switch_strlen_zero(globals.errLogDir)) { + if (!(globals.errLogDir = switch_mprintf("%s/xml_cdr", SWITCH_GLOBAL_dirs.log_dir))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + return SWITCH_STATUS_FALSE; + } + } + + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_cdr_shutdown) +{ + + globals.shutdown=1; + return SWITCH_STATUS_SUCCESS; +} + + + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r5529 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 12 Jul '07

12 Jul '07

Author: trixter Date: Thu Jul 12 00:46:50 2007 New Revision: 5529 Added: freeswitch/trunk/scripts/contrib/trixter/callcredit.pl (contents, props changed) Log: script that will query a webserver at set intervals about calls in progress so you can deduct credit in realtime for each call, typical example prepaid calling application Added: freeswitch/trunk/scripts/contrib/trixter/callcredit.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/callcredit.pl Thu Jul 12 00:46:50 2007 @@ -0,0 +1,190 @@ +#!/usr/bin/perl +# -*- mode:cperl; tab-width:4; c-basic-offset:4; c-indent-level:4; indent-tabs-mode:nil; -*- + +# +# this script will look for call setup/tear down events and every INTERVAL query the server for credit +# on the calls in progress, if it gets a message saying to hangup a call it will - implying credit no +# longer exists +# +# this script also informs the webserver of the call setup/tear down info so that it can keep track and +# later only post a list of UUIDs for the webserver to process. +# +# the webserver should return the following +# HANGUP: 1234-5678-90ab-cdef +# IGNORE: fedc-ba09-8765-4321 +# +# to hangup the first or stop getting reports about the 2nd uuid +# +# uuids are passed to the webserver in a php style array named uuid so its easy to loop through them and +# check them for validity + +use FreeSWITCH::Client; +use POSIX ':signal_h'; # used for alarm to ensure we get heartbeats +use Data::Dumper; # used to print out myhash debug info + +# use DBI instead of these two for direct database inserts/deletes +# which is likely to be more efficient, this is however just an example +use LWP::UserAgent; # for posting to the webserver +use URI::Escape ('uri_escape'); # to html encode values + + +# configure these +my $password = "ClueCon"; # the password for event socket +my $host = "localhost"; # the hostname to connect to +my $port = 8021; # the port to connect to +my $timeout = 1; # when setting this make sure its low enough to detect + # lost heartbeats and high enough that it doesnt hose your + # system, also queryInterval is checked each time this runs + # so you should make queryInterval an interger multiple +my $queryInterval = 3; +my $heartbeatInterval = 30; # seconds to expect a heartbeat event or reconnect +my $url = "http://localhost/activecalls.php"; # the url to post the data to use http://user:pass@host/script for auth credentials + + +## +# dont touch these +## +my $fs; +my $lastheartbeat; +my $lastQuery; +my %uuids; +my $ua = LWP::UserAgent->new; +$ua->agent("FreeSWITCH/1.0"); + + +# this connects to the event socket +sub es_connect() + { + print "Connecting to $host:$port\n"; + eval { + $fs = init FreeSWITCH::Client {-password => $password, -host => $host, -port => $port}; + if(defined $fs) { + # channel_create doesnt have the destination number so we wait for the codec event + $fs->sendmsg({'command' => 'event plain heartbeat channel_hangup codec'}); + $lastheartbeat = time; + } + } or do { + print "Error connecting - waiting for retry\n"; + } + + } + + +sigaction SIGALRM, new POSIX::SigAction sub { + if ($lastheartbeat < (time - $heartbeatInterval)) { + print "Did not receive a heartbeat in the specified timeout\n"; + if (defined $fs) { + $fs->disconnect(); + undef $fs; + } + es_connect(); + } + + + # check the calls + $uuidstr = ""; + $queryTime = time; + for my $uuid ( keys %uuids ) { + if($uuids{$uuid} > 2 && $uuids{$uuid}<= ($queryTime - $queryInterval)) { + $uuidstr .= "&uuid[]=$uuid"; + $uuids{$uuid}=$queryTime; + } + } + + if($uuidstr ne "") { + my $req = HTTP::Request->new(POST => $url); + $req->content_type('application/x-www-form-urlencoded'); + $req->content($uuidstr); + my $res = $ua->request($req); + if(!$res->is_success) { + print "Error checking credit got ".$res->status_line."\n"; + } + @lines = split(/\n/,$res->content); + + foreach $line (@lines) { + if($line =~ /^HANGUP: (.*)/) { + print "hanging up $1\n"; + $fs->sendmsg({'command' => "api killchan $1"}); + } elsif ($line =~ /^IGNORE: (.*)/) { + delete $uuids{$1}; + } + + print "LINE: $line\n\n"; + } + + # XXX we need to figure out how to hangup calls here + } + + + + # reset the alarm + alarm $timeout; +} or die "Error setting SIGALRM handler: $!\n"; + + + +es_connect(); +alarm $timeout; + +while (1) { + if(defined $fs) { + my $reply = $fs->readhash(undef); + if ($reply->{socketerror}) { + es_connect(); + } + + if ($reply->{body}) { + $myhash = $reply->{event}; + + if ($myhash->{'event-name'} eq "HEARTBEAT") { ## Deal with heartbeats + $lastheartbeat = time; + print "Got a heartbeat\n"; + + } elsif ($myhash->{'event-name'} eq "CODEC") { ## New call setup + if(!$uuids{$myhash->{'unique-id'}}) { + print $myhash->{'unique-id'}." has called\n"; + $uuids{$myhash->{'unique-id'}}=time; + $urlstr=""; + while ( my ($key, $value) = each(%$myhash) ) { + $urlstr .= "&$key=".uri_escape($value); + } + + my $req = HTTP::Request->new(POST => $url); + $req->content_type('application/x-www-form-urlencoded'); + $req->content($urlstr); + my $res = $ua->request($req); + if(!$res->is_success) { + print "Error posting NEWCALL to webserver got ".$res->status_line."\n"; + } + } + + + + } elsif ($myhash->{'event-name'} eq "CHANNEL_HANGUP") { ## hangup event + print $myhash->{'unique-id'}." has hung up\n"; + delete $uuids{$myhash->{'unique-id'}}; # we get a codec event after hangup + + $urlstr=""; + while ( my ($key, $value) = each(%$myhash) ) { + $urlstr .= "&$key=".uri_escape($value); + } + + my $req = HTTP::Request->new(POST => $url); + $req->content_type('application/x-www-form-urlencoded'); + $req->content($urlstr); + my $res = $ua->request($req); + if(!$res->is_success) { + print "Error posting HANGUP to webserver got ".$res->status_line."\n"; + } + + + } else { ## Unknown event + print "EVENT NAME: " . $myhash->{'event-name'} . "\n"; + print Dumper $myhash; + # print "$reply->{body}\n"; # print out what was sent, myhash is translated by Client.pm + } + + } + } +} +

1 0

[commit] r5528 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 11 Jul '07

11 Jul '07

Author: trixter Date: Wed Jul 11 15:34:42 2007 New Revision: 5528 Added: freeswitch/trunk/scripts/contrib/trixter/newgcc.svndiff Log: this patches FS to work with the newer GCC variants that do stricter checks on things Added: freeswitch/trunk/scripts/contrib/trixter/newgcc.svndiff ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/newgcc.svndiff Wed Jul 11 15:34:42 2007 @@ -0,0 +1,178 @@ +Index: src/switch_ivr_originate.c +=================================================================== +--- src/switch_ivr_originate.c (revision 5527) ++++ src/switch_ivr_originate.c (working copy) +@@ -373,7 +373,8 @@ + fail_on_single_reject = 1; + } + +- if ((!switch_strlen_zero(file)) && (!strcmp(file, "undef"))) { ++ /* was switch_strlen_zero(file) but newer GCC detects that file's address is always != 0 */ ++ if (*file!='\0' && !strcmp(file, "undef")) { + *file = '\0'; + } + +Index: src/mod/applications/mod_commands/mod_commands.c +=================================================================== +--- src/mod/applications/mod_commands/mod_commands.c (revision 5527) ++++ src/mod/applications/mod_commands/mod_commands.c (working copy) +@@ -1059,8 +1059,10 @@ + } + + snprintf(id, sizeof(id), "%d", holder->rows); +- switch_xml_set_attr_d(row, "row_id", id); + ++ /* was switch_xml_set_attr_d(row, "row_id", id); but newer GCC reports that id will always be != 0 */ ++ switch_xml_set_attr(switch_xml_set_flag(row, SWITCH_XML_DUP), strdup("row_id"), strdup(id)); ++ + for(x = 0; x < argc; x++) { + char *name = columnNames[x]; + char *val = switch_str_nil(argv[x]); +@@ -1229,7 +1231,8 @@ + char count[50]; + char *xmlstr; + snprintf(count, sizeof(count), "%d", holder.count); +- switch_xml_set_attr_d(holder.xml, "row_count", count); ++ /* was switch_xml_set_attr_d(holder.xml, "row_count", count); but newer GCC reports that count is != 0 always */ ++ switch_xml_set_attr(switch_xml_set_flag(holder.xml, SWITCH_XML_DUP), strdup("row_count"), strdup(count)); + xmlstr = switch_xml_toxml(holder.xml); + + if (xmlstr) { +Index: src/mod/endpoints/mod_sofia/sofia.c +=================================================================== +--- src/mod/endpoints/mod_sofia/sofia.c (revision 5527) ++++ src/mod/endpoints/mod_sofia/sofia.c (working copy) +@@ -1785,7 +1785,8 @@ + } + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + +- if (!switch_strlen_zero(key)) { ++ /* was !switch_strlen_zero(key) but newer GCC reports that key always != 0 */ ++ if (*key!='\0') { + tech_pvt->key = switch_core_session_strdup(session, key); + } + +Index: src/mod/endpoints/mod_sofia/sofia_glue.c +=================================================================== +--- src/mod/endpoints/mod_sofia/sofia_glue.c (revision 5527) ++++ src/mod/endpoints/mod_sofia/sofia_glue.c (working copy) +@@ -581,11 +581,12 @@ + extra_headers = stream.data; + } + ++ /* newer GCC reports that rpid, alert_info and max_forwards always != 0 so replaced switch_strlen_zero */ + nua_invite(tech_pvt->nh, +- TAG_IF(!switch_strlen_zero(rpid), SIPTAG_HEADER_STR(rpid)), +- TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), ++ TAG_IF(*rpid!='\0', SIPTAG_HEADER_STR(rpid)), ++ TAG_IF(*alert_info!='\0', SIPTAG_HEADER_STR(alert_info)), + TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), +- TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), ++ TAG_IF(*max_forwards!='\0', SIPTAG_MAX_FORWARDS_STR(max_forwards)), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), + SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), + SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), SOATAG_HOLD(holdstr), TAG_END()); +@@ -629,11 +630,12 @@ + + nua_handle_bind(tech_pvt->nh2, tech_pvt->sofia_private); + ++ /* newer GCC complains that rpid is always != 0 -- removed TAG_IF */ + nua_invite(tech_pvt->nh2, +- TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)), +- SIPTAG_CONTACT_STR(tech_pvt->profile->url), +- SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), +- SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), TAG_END()); ++ SIPTAG_HEADER_STR(rpid), ++ SIPTAG_CONTACT_STR(tech_pvt->profile->url), ++ SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), ++ SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), TAG_END()); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + } +Index: src/mod/endpoints/mod_sofia/sofia_presence.c +=================================================================== +--- src/mod/endpoints/mod_sofia/sofia_presence.c (revision 5527) ++++ src/mod/endpoints/mod_sofia/sofia_presence.c (working copy) +@@ -1033,7 +1033,8 @@ + if ((ci = switch_loadable_module_get_chat_interface(proto))) { + ci->chat_send(SOFIA_CHAT_PROTO, from_addr, to_addr, "", msg, full_from); + } else { +- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", proto ? proto : "(none)"); ++ /* newer GCC reports that proto will always != null so removed the test */ ++ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", proto); + } + + } +Index: src/mod/event_handlers/mod_event_socket/mod_event_socket.c +=================================================================== +--- src/mod/event_handlers/mod_event_socket/mod_event_socket.c (revision 5527) ++++ src/mod/event_handlers/mod_event_socket/mod_event_socket.c (working copy) +@@ -1055,7 +1055,8 @@ + switch_clear_flag_locked(listener, LFLAG_RUNNING); + goto done; + } +- if (!switch_strlen_zero(reply)) { ++ /* newer GCC reports that reply always != 0 removed switch_strlen_zero */ ++ if (*reply!='\0') { + snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); + len = strlen(buf); + switch_socket_send(listener->sock, buf, &len); +@@ -1084,7 +1085,8 @@ + break; + } + +- if (!switch_strlen_zero(reply)) { ++ /* newer GCC reports that reply always != 0 removed switch_strlen_zero */ ++ if (*reply!='\0') { + snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); + len = strlen(buf); + switch_socket_send(listener->sock, buf, &len); +Index: src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +=================================================================== +--- src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (revision 5527) ++++ src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (working copy) +@@ -783,7 +783,10 @@ + + if ((mods = switch_xml_child(cfg, "modules"))) { + for (ld = switch_xml_child(mods, "load"); ld; ld = ld->next) { +- const char *val = switch_xml_attr_soft(ld, "module"); ++ /* newer GCC doesnt like pasing val because it was a const, made it non-const which is potentially bad ++ * but that happens anyway when it goes to sm_load_module ++ */ ++ char *val = (char *)switch_xml_attr_soft(ld, "module"); + if (strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Invalid extension for %s\n", val); + continue; +@@ -1527,6 +1530,11 @@ + + CHANNEL_SANITY_CHECK(); + ++ if (argc < 3) { ++ *rval = BOOLEAN_TO_JSVAL(JS_FALSE); ++ return JS_FALSE; ++ } ++ + if (argc > 0) { + tts_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + } +Index: src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c +=================================================================== +--- src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (revision 5527) ++++ src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (working copy) +@@ -327,12 +327,14 @@ + if (action) { + if (switch_core_management_exec(relative_oid, action, buf, sizeof(buf)) == SWITCH_STATUS_SUCCESS) { + if (action == SMA_SET) { +- if (switch_strlen_zero(buf)) { ++ /* newer GCC claims buf always != 0, removed switch_strlen_zero */ ++ if (*buf=='\0') { + snprintf(buf, sizeof(buf), "OK\n"); + } + } + } else { +- if (switch_strlen_zero(buf)) { ++ /* newer GCC claims buf always != 0, removed switch_strlen_zero */ ++ if (*buf=='\0') { + snprintf(buf, sizeof(buf), "ERROR\n"); + } + }

1 0

[commit] r5527 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 11 Jul '07

11 Jul '07

Author: cparker Date: Wed Jul 11 14:04:56 2007 New Revision: 5527 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: UINT4 to uint32_t, so we can be C99 at least Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Wed Jul 11 14:04:56 2007 @@ -30,8 +30,6 @@ * */ -#define _BSD_SOURCE 1 - #include <switch.h> #include <sys/stat.h> #include <freeradius-client.h> @@ -130,8 +128,8 @@ rc_handle *rad_config; int retval = 0; VALUE_PAIR *send = NULL; - UINT4 client_port = 0; - UINT4 status_type = PW_STATUS_START; + uint32_t client_port = 0; + uint32_t status_type = PW_STATUS_START; char *uuid_str; @@ -249,14 +247,14 @@ rc_handle *rad_config; int retval = 0; VALUE_PAIR *send = NULL; - UINT4 client_port = 0; - UINT4 status_type = PW_STATUS_STOP; + uint32_t client_port = 0; + uint32_t status_type = PW_STATUS_STOP; switch_time_t callstartdate = 0; switch_time_t callanswerdate = 0; switch_time_t callenddate = 0; switch_time_t calltransferdate = 0; switch_time_t billusec = 0; - UINT4 billsec = 0; + uint32_t billsec = 0; char *uuid_str; @@ -375,7 +373,7 @@ } if (rc_avpair_add(rad_config, &send, PW_FS_BILLUSEC, &billusec, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed adding Freeswitch-Billusec: %u\n", (UINT4)billusec); + "failed adding Freeswitch-Billusec: %u\n", (uint32_t)billusec); rc_destroy(rad_config); return SWITCH_STATUS_TERM; }

1 0

[commit] r5526 - freeswitch/trunk/src
by Freeswitch SVN 11 Jul '07

11 Jul '07

Author: anthm Date: Wed Jul 11 12:15:26 2007 New Revision: 5526 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: tweak Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Jul 11 12:15:26 2007 @@ -373,7 +373,7 @@ fail_on_single_reject = 1; } - if (!switch_strlen_zero(file) && !strcmp(file, "undef")) { + if ((!switch_strlen_zero(file)) && (!strcmp(file, "undef"))) { *file = '\0'; }

1 0