- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7192 - freeswitch/trunk/scripts/contrib/wasim
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Sat Jan 12 15:03:00 2008 New Revision: 7192 Added: freeswitch/trunk/scripts/contrib/wasim/ freeswitch/trunk/scripts/contrib/wasim/cFS.pl freeswitch/trunk/scripts/contrib/wasim/cdrload.pl freeswitch/trunk/scripts/contrib/wasim/fshour.pl Log: add scripts from wasim (MODAPP-69 MODEVENT-11) Added: freeswitch/trunk/scripts/contrib/wasim/cFS.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/wasim/cFS.pl Sat Jan 12 15:03:00 2008 @@ -0,0 +1,84 @@ +#!/usr/bin/perl + +# Convergence FreeSwitch Tools Version 7.0 : AGI +# (c) MMII Convergence. All rights reserved. +# <info(a)convergence.pk> http://www.convergence.pk + +# This program is free software, distributed under the terms of +# the GNU General Public License.http://www.gnu.org/licenses.html + +#$0 -t day -s 30 -e 20 -p 92 will get stats on daily basis for the last 30 to 20 hours for number beginning with 92 +# make sure end_timestamp is indexed in the db + +#use warnings; +use strict; +use DBI(); +use Getopt::Long; + +GetOptions ( + 't|time:s' => \(my $t = 'hour'), + 's|start:i' => \(my $i = '24'), + 'e|end:i' => \(my $j = '0'), + 'p|prefix:s' => \(my $prefix = 'WHERE 1') +); + +my $prefix = "WHERE destination_number like '$prefix%' " if ($prefix ne 'WHERE 1'); + +my $dbh = DBI->connect("DBI:mysql:database=freeswitch;host=x.x.x.x","USER","PASS") or &die_call; + +my ($tcalls,$tans,$tmins,$tamins,$tacd,$tasr,$tbpct,$tbmins,$tpdd); +while ($i > $j) { + &get_stats($i); + $i--; +} +$tasr = eval { ( sprintf("%.2f", $tans / $tcalls * 100)) }; +$tacd = eval { ( sprintf("%.2f", $tamins / $tans)) }; +$tbpct = eval { ( sprintf("%.2f", $tamins / $tmins * 100)) }; +$tpdd = eval { ( sprintf("%.2f", (($tbmins - $tamins) * 60) / $tans)) }; + +print "\t\t\t ------ \t -----\t ------\t ------ \t ---- \t -----\t ------\n" if $tans; +print "\t\t\ttotal: $tcalls\tanswer: $tans\tasr: $tasr%\tminute: $tamins\tacd: $tacd\tpdd: $tpdd\tbill%: $tbpct%\n" if $tans; + +exit; + +sub get_stats { + my ($calls,$ans,$mins,$amins,$acd,$asr,$bpct,$pdd,$bmins); + my $time = shift; + my $ntime = $time-1; + my $stm = "select count(*) as calls, sum(duration)/60 as mins from cdr $prefix and end_timestamp between + date_sub(now(), interval $time $t) and date_sub(now(), interval $ntime $t)"; + my $res = &do_db($stm); + $calls = $res->{'calls'}; + $tcalls = $tcalls + $calls; + $mins = sprintf("%.0f", $res->{'mins'}); + $tmins = $tmins + $mins; + + $stm = "select count(*) as ans, sum(billsec)/60 as amins, sum(duration)/60 as bmins,date_sub(now(), + interval $ntime $t) as start from cdr $prefix AND HANGUP_CAUSE='NORMAL_CLEARING' + and end_timestamp between date_sub(now(), interval $time $t) and date_sub(now(), interval $ntime $t)"; + $res = &do_db($stm); + my $when = $res->{'start'}; + $ans = $res->{'ans'}; + $tans = $tans + $ans; + $amins = sprintf("%.0f", $res->{'amins'}); + $tamins = $tamins + $amins; + $bmins = sprintf("%.0f", $res->{'bmins'}); + $tbmins = $tbmins + $bmins; + + $asr = eval { ( sprintf("%.2f", $ans / $calls * 100)) }; + $acd = eval { ( sprintf("%.2f", $amins / $ans)) }; + $bpct = eval { ( sprintf("%.2f", $amins / $mins * 100)) }; + $pdd = eval { ( sprintf("%.2f", (($bmins - $amins) * 60) / $ans)) }; + + print "$time $when\tcalls: $calls\tanswer: $ans\tasr: $asr%\tminute: $amins\tacd: $acd\tpdd: $pdd\tbill%: $bpct%\n" if $ans; +} + +sub do_db { + my $sql = shift; +# print "$sql\n"; + my $get = $dbh->prepare($sql) or die "Couldn't prepare statement: " . $dbh->errstr; + $get->execute(); + my $res = $get->fetchrow_hashref(); + $get->finish(); + return $res; +} Added: freeswitch/trunk/scripts/contrib/wasim/cdrload.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/wasim/cdrload.pl Sat Jan 12 15:03:00 2008 @@ -0,0 +1,32 @@ +#!/usr/bin/perl -w + +# Convergence FreeSwitch Tools Version 7.0 : AGI +# (c) MMII Convergence. All rights reserved. +# <info(a)convergence.pk> http://www.convergence.pk + +# This program is free software, distributed under the terms of +# the GNU General Public License.http://www.gnu.org/licenses.html + +use strict; +use DBI(); + +my @cc = ("killall", "-HUP", "freeswitch"); +system(@cc) == 0 + or die "$0: system @cc failed: $?"; + +my $dbh = DBI->connect("DBI:mysql:database=DB;host=HOST","USER","PASSWORD") + or die "$0: Couldn't connect to database: " . DBI->errstr; + +my @LS = `ls -1t /usr/local/freeswitch/log/cdr-csv/Master.csv.*`; +foreach my $line (@LS) { + chop($line); + my $stm = "load data local infile '$line' into table TABLE fields enclosed by '\"' terminated by ','"; + my $ul = $dbh->prepare($stm) + or die "$0: Couldn't prepare statement $stm: " . $dbh->errstr;; + $ul->execute(); + $ul->finish; + system("cat $line >> /usr/local/freeswitch/log/cdr-csv/FULL_Master.csv"); + unlink $line; +} + +exit; Added: freeswitch/trunk/scripts/contrib/wasim/fshour.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/wasim/fshour.pl Sat Jan 12 15:03:00 2008 @@ -0,0 +1,87 @@ +#!/usr/bin/perl + +# Convergence FreeSwitch Tools Version 7.0 : AGI +# (c) MMII Convergence. All rights reserved. +# <info(a)convergence.pk> http://www.convergence.pk + +# This program is free software, distributed under the terms of +# the GNU General Public License.http://www.gnu.org/licenses.html + +# usage: $0 interval start end prefix +# for example: $0 day 30 20 92 will get stats on daily basis for the last 30 to 30 hours for number beginning with 92 +# make sure end_timestamp is indexed in the db + +#use warnings; +my $debug=0; +use strict; +use DBI(); +use Getopt::Long; + +GetOptions ( + 't|time:s' => \(my $t = 'hour'), + 's|start:i' => \(my $i = '24'), + 'e|end:i' => \(my $j = '0'), + 'p|prefix:s' => \(my $p = 'WHERE 1'), + 'n|notprefix:s' => \(my $n = 'AND 1'), + 'd|date:s' => \(my $d = 'NOW()') +); + +$p = "WHERE destination_number like '$p%' " if ($p ne 'WHERE 1'); +$n = "AND destination_number not like '$n%' " if ($n ne 'AND 1'); +my $dbh = DBI->connect("DBI:mysql:database=freeswitch;host=x.x.x.x","USER","PASS") or &die_call; + +my ($tcalls,$tans,$tmins,$tamins,$tacd,$tasr,$tbpct,$tbmins,$tpdd); + +while ($i > $j) { + &get_stats($d,$i); + $i--; +} +$tasr = eval { ( sprintf("%.2f", $tans / $tcalls * 100)) }; +$tacd = eval { ( sprintf("%.2f", $tamins / $tans)) }; +$tbpct = eval { ( sprintf("%.2f", $tamins / $tmins * 100)) }; +$tpdd = eval { ( sprintf("%.2f", (($tbmins - $tamins) * 60) / $tans)) }; + +print "\t\t\t ------ \t -----\t ------\t ------ \t ---- \t -----\t ------\n" if $tans; +print "\t\t\ttotal: $tcalls\tanswer: $tans\tasr: $tasr%\tminute: $tamins\tacd: $tacd\tpdd: $tpdd\tbill%: $tbpct%\n" if $tans; + +exit; + +sub get_stats { + my $x = shift; + my $i = shift; + my $j = $i-1; + my ($calls,$ans,$mins,$amins,$acd,$asr,$bpct,$pdd,$bmins); + my $stm = "SELECT COUNT(*) AS calls, SUM(duration)/60 AS mins FROM cdr $p $n AND end_timestamp BETWEEN DATE_SUB($d, INTERVAL $i $t) AND DATE_SUB($d, INTERVAL $j $t)"; + my $res = &do_db($stm); + $calls = $res->{'calls'}; + $tcalls = $tcalls + $calls; + $mins = sprintf("%.0f", $res->{'mins'}); + $tmins = $tmins + $mins; + + $stm = "SELECT COUNT(*) AS ans, SUM(billsec)/60 AS amins, SUM(duration)/60 AS bmins, DATE_SUB($d, INTERVAL $i $t) AS start FROM cdr $p $n AND HANGUP_CAUSE='NORMAL_CLEARING' AND end_timestamp BETWEEN DATE_SUB($d, INTERVAL $i $t) AND DATE_SUB($d, INTERVAL $j $t)"; + $res = &do_db($stm); + my $when = $res->{'start'}; + $ans = $res->{'ans'}; + $tans = $tans + $ans; + $amins = sprintf("%.0f", $res->{'amins'}); + $tamins = $tamins + $amins; + $bmins = sprintf("%.0f", $res->{'bmins'}); + $tbmins = $tbmins + $bmins; + + $asr = eval { ( sprintf("%.2f", $ans / $calls * 100)) }; + $acd = eval { ( sprintf("%.2f", $amins / $ans)) }; + $bpct = eval { ( sprintf("%.2f", $amins / $mins * 100)) }; + $pdd = eval { ( sprintf("%.2f", (($bmins - $amins) * 60) / $ans)) }; + + print "$i $when\tcalls: $calls\tanswer: $ans\tasr: $asr%\tminute: $amins\tacd: $acd\tpdd: $pdd\tbill%: $bpct%\n" if $ans; +} + +sub do_db { + my $sql = shift; + print "$sql\n" if $debug; + my $get = $dbh->prepare($sql) or die "Couldn't prepare statement: " . $dbh->errstr; + $get->execute(); + my $res = $get->fetchrow_hashref(); + $get->finish(); + return $res; +}

1 0

[commit] r7191 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Sat Jan 12 14:56:47 2008 New Revision: 7191 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: use braces on ifs. 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 Jan 12 14:56:47 2008 @@ -2354,8 +2354,9 @@ switch_channel_set_variable(channel, "sip_from_comment", sip->sip_from->a_comment); - if (sip->sip_from->a_params) + if (sip->sip_from->a_params) { set_variable_sip_param(channel, "from", sip->sip_from->a_params); + } switch_channel_set_variable(channel, "sofia_profile_name", profile->name); @@ -2420,8 +2421,9 @@ switch_channel_set_variable(channel, "sip_to_comment", sip->sip_to->a_comment); - if (sip->sip_to->a_params) + if (sip->sip_to->a_params) { set_variable_sip_param(channel, "to", sip->sip_to->a_params); + } if (sip->sip_contact->m_url->url_port) { port = atoi(sip->sip_contact->m_url->url_port); @@ -2483,9 +2485,9 @@ switch_channel_set_variable(channel, "sip_referred_by_cid", sip->sip_referred_by->b_cid); - if (sip->sip_referred_by->b_params) + if (sip->sip_referred_by->b_params) { set_variable_sip_param(channel, "referred_by", sip->sip_referred_by->b_params); - + } } sofia_glue_attach_private(session, profile, tech_pvt, channel_name);

1 0

[commit] r7190 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Sat Jan 12 14:53:12 2008 New Revision: 7190 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: Parse "tag" and "generic_param" of From and To headers, Parse referred by header to vars (MODENDP-72) 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 Jan 12 14:53:12 2008 @@ -28,6 +28,7 @@ * Paul D. Tinsley <pdt at jackhammer.org> * Bret McDanel <trixter AT 0xdecafbad.com> * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> + * Norman Brandinger * * * sofia.c -- SOFIA SIP Endpoint (sofia code) @@ -49,6 +50,7 @@ extern su_log_t sresolv_log[]; extern su_log_t stun_log[]; +static void set_variable_sip_param(switch_channel_t *channel, char *header_type, sip_param_t const *params); static void sofia_info_send_sipfrag(switch_core_session_t *aleg, switch_core_session_t *bleg); @@ -2256,6 +2258,7 @@ const char *displayname = NULL; const char *destination_number = NULL; const char *from_user = NULL, *from_host = NULL; + const char *referred_by_user = NULL, *referred_by_host = NULL; const char *context = NULL; const char *dialplan = NULL; char network_ip[80]; @@ -2349,6 +2352,11 @@ } } + switch_channel_set_variable(channel, "sip_from_comment", sip->sip_from->a_comment); + + if (sip->sip_from->a_params) + set_variable_sip_param(channel, "from", sip->sip_from->a_params); + switch_channel_set_variable(channel, "sofia_profile_name", profile->name); if (!switch_strlen_zero(sip->sip_from->a_display)) { @@ -2409,6 +2417,11 @@ host = switch_channel_get_variable(channel, "sip_to_host"); user = switch_channel_get_variable(channel, "sip_to_user"); + + switch_channel_set_variable(channel, "sip_to_comment", sip->sip_to->a_comment); + + if (sip->sip_to->a_params) + set_variable_sip_param(channel, "to", sip->sip_to->a_params); if (sip->sip_contact->m_url->url_port) { port = atoi(sip->sip_contact->m_url->url_port); @@ -2452,6 +2465,29 @@ } } + if (sip->sip_referred_by) { + + referred_by_user = sip->sip_referred_by->b_url->url_user; + referred_by_host = sip->sip_referred_by->b_url->url_host; + channel_name = url_set_chanvars(session, sip->sip_referred_by->b_url, sip_referred_by); + + check_decode(referred_by_user, session); + + if (!switch_strlen_zero(referred_by_user)) { + if (*referred_by_user == '+') { + switch_channel_set_variable(channel, "sip_referred_by_user_stripped", (const char *) (referred_by_user + 1)); + } else { + switch_channel_set_variable(channel, "sip_referred_by_user_stripped", referred_by_user); + } + } + + switch_channel_set_variable(channel, "sip_referred_by_cid", sip->sip_referred_by->b_cid); + + if (sip->sip_referred_by->b_params) + set_variable_sip_param(channel, "referred_by", sip->sip_referred_by->b_params); + + } + sofia_glue_attach_private(session, profile, tech_pvt, channel_name); sofia_glue_tech_prepare_codecs(tech_pvt); @@ -2724,3 +2760,82 @@ } } } + +/* + * This subroutine will take the a_params of a sip_addr_s structure and spin through them. + * Each param will be used to create a channel variable. + * In the SIP RFC's, this data is called generic-param. + * Note that the tag-param is also included in the a_params list. + * + * From: "John Doe" <sip:5551212@1.2.3.4>;tag=ed23266b52cbb17eo2;ref=101;mbid=201 + * + * For example, the header above will produce an a_params list with three entries + * tag=ed23266b52cbb17eo2 + * ref=101 + * mbid=201 + * + * The a_params list is parsed and the lvalue is used to create the channel variable name while the + * rvalue is used to create the channel variable value. + * + * If no equal (=) sign is found during parsing, a channel variable name is created with the param and + * the value is set to NULL. + * + * Pointers are used for copying the sip_header_name for performance reasons. There are no calls to + * any string functions and no memory is allocated/dealocated. The only limiter is the size of the + * sip_header_name array. +*/ +static void set_variable_sip_param(switch_channel_t *channel, char *header_type, sip_param_t const *params) +{ + char sip_header_name[128] = ""; + char var1[] = "sip_"; + char *cp, *sh, *sh_end, *sh_save; + + /* Build the static part of the sip_header_name variable from */ + /* the header_type. If the header type is "referred_by" then */ + /* sip_header_name = "sip_referred_by_". */ + sh = sip_header_name; + sh_end = sh + sizeof(sip_header_name) - 1; + for (cp=var1; *cp; cp++, sh++) { + *sh = *cp; + } + *sh = '\0'; + + /* Copy the header_type to the sip_header_name. Before copying */ + /* each character, check that we aren't going to overflow the */ + /* the sip_header_name buffer. We have to account for the */ + /* trailing underscore and NULL that will be added to the end. */ + for (cp=header_type; (*cp && (sh < (sh_end-1))); cp++, sh++) { + *sh = *cp; + } + *sh++ = '_'; + *sh = '\0'; + + /* sh now points to the NULL at the end of the partially built */ + /* sip_header_name variable. This is also the start of the */ + /* variable part of the sip_header_name built from the lvalue */ + /* of the parms data. */ + sh_save = sh; + + while (params && params[0]) { + + /* Copy the params data to the sip_header_name variable until */ + /* the end of the params string is reached, an '=' is detected */ + /* or until the sip_header_name buffer has been exhausted. */ + for (cp=(char *)(*params); ((*cp != '=') && *cp && (sh < sh_end)); cp++, sh++) { + *sh = *cp; + } + + /* cp now points to either the end of the parms data or the */ + /* equal (=) sign spearating the lvalue and rvalue. */ + if (*cp == '=') + cp++; + *sh = '\0'; + switch_channel_set_variable(channel, sip_header_name, cp); + + /* Bump pointer to next param in the list. Also reset the */ + /* sip_header_name pointer to the beginning of the dynamic area */ + params++; + sh = sh_save; + } + +}

1 0

[commit] r7189 - freeswitch/trunk/scripts
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: anthm Date: Sat Jan 12 14:25:35 2008 New Revision: 7189 Added: freeswitch/trunk/scripts/dtmftest.js Log: update Added: freeswitch/trunk/scripts/dtmftest.js ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/dtmftest.js Sat Jan 12 14:25:35 2008 @@ -0,0 +1,20 @@ +function onPlayFile(s, type, obj, arg) + { + try { + if (type == "dtmf") { + console_log("info", "DTMF digit: " + s.name + " [" + obj.digit + "] len [" + obj.duration + "]\n\n"); + } + + } catch (e) { + console_log("err", e + "\n"); + } + + return true; + + } + +session.answer(); + +while(session.ready()) { + session.streamFile(argv[0], onPlayFile); +}

1 0

[commit] r7188 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Sat Jan 12 14:15:05 2008 New Revision: 7188 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: Two ways for forcing SIP username to be the same as the auth username - i.e. locking a user to an extension (MODENDP-68) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Sat Jan 12 14:15:05 2008 @@ -123,7 +123,8 @@ PFLAG_GREEDY = (1 << 10), PFLAG_MULTIREG = (1 << 11), PFLAG_SUPRESS_CNG = (1 << 12), - PFLAG_TLS = (1 << 13) + PFLAG_TLS = (1 << 13), + PFLAG_CHECKUSER = (1 << 14) } PFLAGS; typedef enum { @@ -454,8 +455,8 @@ void sofia_presence_cancel(void); switch_status_t config_sofia(int reload, char *profile_name); void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale); -auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, - const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime); +auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, const char *regstr, char *np, size_t nplen, + char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user); void sofia_reg_handle_sip_r_challenge(int status, char const *phrase, nua_t *nua, sofia_profile_t *profile, 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 Jan 12 14:15:05 2008 @@ -194,7 +194,7 @@ char network_ip[80]; get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_addr); auth_res = sofia_reg_parse_auth(profile, authorization, - (char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip, NULL, 0); + (char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip, NULL, 0, REG_INVITE, NULL); } if (auth_res != AUTH_OK) { @@ -1057,6 +1057,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_FULL_ID; } + } else if (!strcasecmp(var, "inbound-reg-force-matching-username")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_CHECKUSER; + } } else if (!strcasecmp(var, "bitpacking")) { if (!strcasecmp(val, "aal2")) { profile->codec_flags = SWITCH_CODEC_FLAG_AAL2; 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 Sat Jan 12 14:15:05 2008 @@ -28,6 +28,7 @@ * Paul D. Tinsley <pdt at jackhammer.org> * Bret McDanel <trixter AT 0xdecafbad.com> * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> + * David Knell <> * * * sofia_ref.c -- SOFIA SIP Endpoint (registration code) @@ -344,6 +345,7 @@ int network_port; int cd = 0; const char *call_id = NULL; + char *force_user; /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ switch_assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); @@ -410,7 +412,7 @@ if (authorization) { char *v_contact_str; - if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip->sip_request->rq_method_name, key, keylen, network_ip, v_event, exptime)) + if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip->sip_request->rq_method_name, key, keylen, network_ip, v_event, exptime, regtype, to_user)) == AUTH_STALE) { stale = 1; } @@ -419,6 +421,14 @@ char *exp_var; register_gateway = switch_event_get_header(*v_event, "sip-register-gateway"); + + /* Allow us to force the SIP user to be something specific - needed if + * we - for example - want to be able to ensure that the username a UA can + * be contacted at is the same one that they used for authentication. + */ + if ((force_user = switch_event_get_header(*v_event, "sip-force-user"))) { + to_user = force_user; + } if ((v_contact_str = switch_event_get_header(*v_event, "sip-force-contact"))) { if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction")) { @@ -742,8 +752,8 @@ } -auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, - const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime) +auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, const char *regstr, + char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user) { int indexnum; const char *cur; @@ -815,6 +825,15 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Authorization header!\n"); goto end; } + + /* Optional check that auth name == SIP username */ + if ((regtype == REG_REGISTER) && (profile->pflags & PFLAG_CHECKUSER)) { + if (switch_strlen_zero(username) || switch_strlen_zero(to_user) || strcasecmp(to_user, username)) { + /* Names don't match, so fail */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SIP username %s does not match auth username\n", switch_str_nil(to_user)); + goto end; + } + } if (switch_strlen_zero(np)) { first = 1; @@ -1093,3 +1112,4 @@ +

1 0

[commit] r7187 - in freeswitch/trunk: conf/directory/default scripts
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: brian Date: Sat Jan 12 10:19:49 2008 New Revision: 7187 Added: freeswitch/trunk/conf/directory/default/sip.broadvoice.com.noload Modified: freeswitch/trunk/scripts/sipsetup Log: added these from Robert La Ferla. Thank you. Added: freeswitch/trunk/conf/directory/default/sip.broadvoice.com.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/sip.broadvoice.com.noload Sat Jan 12 10:19:49 2008 @@ -0,0 +1,33 @@ +<include> + <user id="%BVUSERNAME%"> + <gateways> + <gateway name="sip.broadvoice.com"> +  + <param name="username" value="%BVUSERNAME%"/> +  + <param name="realm" value="BroadWorks"/> +  + <param name="from-domain" value="sip.broadvoice.com"/> +  + <param name="password" value="%BVPASSWORD%"/> +  +  +  + <param name="extension" value="%BVEXTENSION%"/> +  + <param name="proxy" value="sip.broadvoice.com"/> +  +  +  + <param name="register" value="true"/> +  + <param name="retry_seconds" value="3600"/> +  +  + </gateway> + </gateways> + <params> + <param name="password" value="%BVPASSWORD%"/> + </params> + </user> +</include> Modified: freeswitch/trunk/scripts/sipsetup ============================================================================== --- freeswitch/trunk/scripts/sipsetup (original) +++ freeswitch/trunk/scripts/sipsetup Sat Jan 12 10:19:49 2008 @@ -17,7 +17,8 @@ "3" => "IS", "4" => "AL", "5" => "SB", - "6" => "VU" + "6" => "VU", + "7" => "BV" }; @@ -29,6 +30,14 @@ "dialprefix" => "1-393" }; +my $BROADVOICE = { + "type" => "network", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "sip.broadvoice.com", + "dialprefix" => "1-393" + }; + my $SIPHONE = { "type" => "network", "register" => "true", @@ -71,7 +80,8 @@ "IS" => $IDEASIP, "AL" => $ASTERLINK, "SB" => $SIPBROKER, - "VU" => $VOIPUSER + "VU" => $VOIPUSER, + "BV" => $BROADVOICE }; print "\n" x 60; @@ -88,6 +98,7 @@ 4. Configure Asterlink.com 5. Configure SIPBroker.com 6. Configure voipuser.org + 7. Configure broadvoice.com X. Exit @@ -98,7 +109,7 @@ chomp($i); if ($i =~ m/X|x/) { print "Thanks you!\n"; exit; - } elsif ($i > 6) { + } elsif ($i > 7) { print "Invalid Choice\n"; &welcome; } else { if (exists($providers->{$i})) {

1 0

[commit] r7186 - in freeswitch/trunk/src: . include
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Sat Jan 12 02:14:48 2008 New Revision: 7186 Modified: freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/switch_event.c Log: constify functions Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Sat Jan 12 02:14:48 2008 @@ -211,7 +211,7 @@ \param user_data optional private data to pass to the event handlers \return */ -SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(char *file, char *func, int line, switch_event_t **event, void *user_data); +SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(const char *file, const char *func, int line, switch_event_t **event, void *user_data); /*! \brief Bind an event callback to a specific event @@ -222,7 +222,7 @@ \param user_data optional user specific data to pass whenever the callback is invoked \return SWITCH_STATUS_SUCCESS if the event was binded */ -SWITCH_DECLARE(switch_status_t) switch_event_bind(const char *id, switch_event_types_t event, char *subclass_name, switch_event_callback_t callback, +SWITCH_DECLARE(switch_status_t) switch_event_bind(const char *id, switch_event_types_t event, const char *subclass_name, switch_event_callback_t callback, void *user_data); /*! @@ -238,7 +238,7 @@ \param type the event id to return \return SWITCH_STATUS_SUCCESS if there was a match */ -SWITCH_DECLARE(switch_status_t) switch_name_event(char *name, switch_event_types_t *type); +SWITCH_DECLARE(switch_status_t) switch_name_event(const char *name, switch_event_types_t *type); /*! \brief Reserve a subclass name for private use with a custom event @@ -248,7 +248,7 @@ \note There is nothing to enforce this but I reccommend using module::event_name for the subclass names */ -SWITCH_DECLARE(switch_status_t) switch_event_reserve_subclass_detailed(char *owner, char *subclass_name); +SWITCH_DECLARE(switch_status_t) switch_event_reserve_subclass_detailed(const char *owner, const char *subclass_name); /*! \brief Render a string representation of an event sutable for printing or network transport Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sat Jan 12 02:14:48 2008 @@ -289,7 +289,7 @@ return EVENT_NAMES[event]; } -SWITCH_DECLARE(switch_status_t) switch_name_event(char *name, switch_event_types_t *type) +SWITCH_DECLARE(switch_status_t) switch_name_event(const char *name, switch_event_types_t *type) { switch_event_types_t x; switch_assert(BLOCK != NULL); @@ -305,7 +305,7 @@ return SWITCH_STATUS_FALSE; } -SWITCH_DECLARE(switch_status_t) switch_event_reserve_subclass_detailed(char *owner, char *subclass_name) +SWITCH_DECLARE(switch_status_t) switch_event_reserve_subclass_detailed(const char *owner, const char *subclass_name) { switch_event_subclass_t *subclass; @@ -861,7 +861,7 @@ return xml; } -SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(char *file, char *func, int line, switch_event_t **event, void *user_data) +SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(const char *file, const char *func, int line, switch_event_t **event, void *user_data) { switch_time_exp_t tm; char date[80] = ""; @@ -937,7 +937,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_status_t) switch_event_bind(const char *id, switch_event_types_t event, char *subclass_name, switch_event_callback_t callback, +SWITCH_DECLARE(switch_status_t) switch_event_bind(const char *id, switch_event_types_t event, const char *subclass_name, switch_event_callback_t callback, void *user_data) { switch_event_node_t *event_node;

1 0

[commit] r7185 - freeswitch/trunk/src
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Fri Jan 11 23:56:20 2008 New Revision: 7185 Modified: freeswitch/trunk/src/switch_rtp.c Log: un-revert patch accidentally overwritten. (always use our ssrc) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 11 23:56:20 2008 @@ -130,6 +130,7 @@ uint32_t autoadj_tally; uint16_t seq; + uint32_t ssrc; uint8_t sending_dtmf; switch_payload_t payload; switch_payload_t rpayload; @@ -541,6 +542,7 @@ } rtp_session->seq = (uint16_t) rand(); + rtp_session->ssrc = ssrc; rtp_session->send_msg.header.ssrc = htonl(ssrc); rtp_session->send_msg.header.ts = 0; rtp_session->send_msg.header.m = 0; @@ -1339,6 +1341,7 @@ if (flags && *flags & SFF_RFC2833) { send_msg->header.pt = rtp_session->te; } + send_msg->header.ssrc = htonl(rtp_session->ssrc); } else { uint8_t m = 0;

1 0

[commit] r7184 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: anthm Date: Fri Jan 11 23:00:21 2008 New Revision: 7184 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Jan 11 23:00:21 2008 @@ -1723,6 +1723,7 @@ if (session) { switch_ivr_transfer_variable(session, nsession, SOFIA_REPLACES_HEADER); + switch_ivr_transfer_variable(session, nsession, "sip_auto_answer"); switch_ivr_transfer_variable(session, nsession, SOFIA_SIP_HEADER_PREFIX_T); if (switch_core_session_compare(session, nsession)) { /* It's another sofia channel! so lets cache what they use as a pt for telephone event so

1 0

[commit] r7183 - in freeswitch/trunk: conf/autoload_configs src
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: anthm Date: Fri Jan 11 22:40:25 2008 New Revision: 7183 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml freeswitch/trunk/src/switch_ivr_menu.c Log: update fix to FSCORE-85 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Fri Jan 11 22:40:25 2008 @@ -9,7 +9,7 @@ <entry action="menu-exit" digits="*"/> <entry action="menu-play-sound" digits="1" params="soundfiles/features.wav"/> <entry action="menu-sub" digits="2" param="demo2"/> - <entry action="menu-exec-api" digits="3" param="bridge sofia/$${domain}/888(a)conference.freeswtich.org"/> + <entry action="menu-exec-app" digits="3" param="bridge sofia/$${domain}/888(a)conference.freeswtich.org"/> <entry action="menu-call-transfer" digits="4" param="888"/> <entry action="menu-sub" digits="8" param="menu8"/> </menu> Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Fri Jan 11 22:40:25 2008 @@ -489,8 +489,6 @@ if (xml_ctx != NULL && name != NULL && xml_ctx->pool != NULL && switch_ivr_menu_stack_xml_find(xml_ctx, name) == NULL) { switch_ivr_menu_xml_map_t *map = switch_core_alloc(xml_ctx->pool, sizeof(switch_ivr_menu_xml_map_t)); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "switch_ivr_menu_stack_xml_add binding '%s'\n", name); - // and we have memory if (map != NULL) { map->name = switch_core_strdup(xml_ctx->pool, name); map->action = action; @@ -507,6 +505,10 @@ } else { status = SWITCH_STATUS_MEMERR; } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "switch_ivr_menu_stack_xml_add binding '%s'\n", name); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to add binding %s\n", name); } return status; @@ -533,7 +535,7 @@ static switch_bool_t is_valid_action(const char *action) { int i; - + if (!switch_strlen_zero(action)) { for(i = 0;;i++) { if (!iam[i].name) { @@ -575,10 +577,9 @@ } // build the standard/default xml menu handler mappings if (status == SWITCH_STATUS_SUCCESS && xml_menu_ctx != NULL && *xml_menu_ctx != NULL) { - int iam_qty = (sizeof(iam) / sizeof(iam[0])); int i; - for (i = 0; i < iam_qty && status == SWITCH_STATUS_SUCCESS; i++) { + for (i = 0; iam[i].name && status == SWITCH_STATUS_SUCCESS; i++) { status = switch_ivr_menu_stack_xml_add(*xml_menu_ctx, iam[i].name, iam[i].action, NULL); } }

1 0