sr-dev

sr-dev@lists.kamailio.org

13 participants
44204 discussions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: ad2df476fc2010c30a18a35551caebf87bba1c08 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad2df47… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Wed Jul 15 10:45:37 2009 +0000 - more -h messages --- .../iptrtpproxy/examples/clean_rtpproxy_attrs | 24 +++++++++++++++----- 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs b/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs index 5c93078..e034d5f 100755 --- a/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs +++ b/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs @@ -15,10 +15,14 @@ my $defConfigFile = "/etc/iptrtpproxy.cfg"; my $configFile = $defConfigFile; my $verbose = 0; -my $mysqlhost = 'localhost'; -my $mysqldb = 'ser'; -my $mysqluser = 'ser'; -my $mysqlpassword = 'heslo'; +my $defmysqlhost = 'localhost'; +my $mysqlhost = $defmysqlhost; +my $defmysqldb = 'ser'; +my $mysqldb = $defmysqldb; +my $defmysqluser = 'ser'; +my $mysqluser = $defmysqluser; +my $defmysqlpassword = 'heslo'; +my $mysqlpassword = $defmysqlpassword; use Config::IniFiles; @@ -77,8 +81,16 @@ $scriptName =~ s!^.*/!!; sub printUsage { print "$scriptName, Version: $version\n"; - print "usage: $scriptName [-f <config>] [-v] [-h] [-H <db_host>] [-D <database_name>] [-u <user>] [-p <password>]\n"; - + print "usage: $scriptName [-f <iptrtpproxy_config>] [-v] [-h] [-H <db_host>] [-D <db_name>] [-u <db_user>] [-p <db_password>]\n"; + print " iptrtpproxy_config .. iptrtpproxy_helper config, default: $defConfigFile\n"; + print " db_host .. database MYSQL host, default: $defmysqlhost\n"; + print " db_name .. database name, default: $defmysqldb\n"; + print " db_user .. database user, default: $defmysqluser\n"; + $_ = substr $defmysqlpassword, 1, length($defmysqlpassword)-2; + s/./\*/g; + my $psw = substr($defmysqlpassword, 0, 1) . $_ . substr($defmysqlpassword, length($defmysqlpassword)-1, 1); + print " db_password .. database password, default: $psw\n"; + print " -v .. verbose\n"; } my $command = '';

15 years, 5 months

git:ser_modules: - minor ERR message improvment

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: c13d686fb4b289968c707a1f45fc648f9773eaee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c13d686… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Tue Jul 14 16:56:23 2009 +0000 - minor ERR message improvment - new clean_rtpproxy_attrs script --- .../iptrtpproxy/examples/clean_rtpproxy_attrs | 217 ++++++++++++++++++++ modules_s/iptrtpproxy/iptrtpproxy.c | 19 +- 2 files changed, 226 insertions(+), 10 deletions(-) diff --git a/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs b/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs new file mode 100755 index 0000000..5c93078 --- /dev/null +++ b/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs @@ -0,0 +1,217 @@ +#!/usr/bin/env perl + +# $Id$ + +# The script cleans up orphaned RTP proxy attributes from rtpproxy_attrs. +# The orphaned attribute is the attribute having none of its sessions. +# in iptrtpproxy session list. + +use warnings; +#use strict; +use DBI; + +my $version = "0.1"; +my $defConfigFile = "/etc/iptrtpproxy.cfg"; +my $configFile = $defConfigFile; +my $verbose = 0; + +my $mysqlhost = 'localhost'; +my $mysqldb = 'ser'; +my $mysqluser = 'ser'; +my $mysqlpassword = 'heslo'; + +use Config::IniFiles; + +sub dbg { + if ($verbose) { + print STDERR "DBG: $_[0]\n"; + } +} + +sub myexit ($$) +{ + my ($msg, $exitcode ) = @_; + print "# ERROR: $msg\n"; + DBI->disconnect_all(); + exit $exitcode; +} + + +sub do_exec($) +{ + my $cmd = $_[0]; + dbg "Exec: $cmd"; + my @res = `$cmd`; + dbg "Exit code: $?"; + @res; +} + + +# parse config file to $cfg +sub parseConfigFile($) +{ + my $fileName = $_[0]; + dbg "Parsing config file '$fileName'\n" if $verbose; + my %switchboards = (); + goto ret unless -e $configFile; + my $cfg = Config::IniFiles->new( -file => $configFile, -default => "<default>" ); + + for my $section ($cfg->Sections) { + if ($section =~ /^[a-zA-Z_]+$/) { + print STDERR "Parsing section '$section'\n" if $verbose; + for my $param ('addr-a', 'addr-b', 'port-a', 'port-b') { + my $val = $cfg->val($section, $param); + if ($val) { + $switchboards{$section}{$param} = $val; + } + } + } + + } +ret: + return %switchboards; +} + +my $scriptName = $0; +$scriptName =~ s!^.*/!!; + +sub printUsage { + print "$scriptName, Version: $version\n"; + print "usage: $scriptName [-f <config>] [-v] [-h] [-H <db_host>] [-D <database_name>] [-u <user>] [-p <password>]\n"; + +} + +my $command = ''; +my $arg; + +while ($#ARGV >= 0) { + $arg = shift(@ARGV); + if ($arg eq '-f') { + if ($#ARGV < 0) { + print STDERR "ERROR: config file name required\n"; + &printUsage(); + exit(1); + } else { + $configFile = shift(@ARGV); + } + } elsif ($arg eq '-D') { + if ($#ARGV < 0) { + print STDERR "ERROR: database name required\n"; + &printUsage(); + exit(1); + } else { + $mysqldb = shift(@ARGV); + } + } elsif ($arg eq '-u') { + if ($#ARGV < 0) { + print STDERR "ERROR: user name required\n"; + &printUsage(); + exit(1); + } else { + $mysqluser = shift(@ARGV); + } + } elsif ($arg eq '-p') { + if ($#ARGV < 0) { + print STDERR "ERROR: password required\n"; + &printUsage(); + exit(1); + } else { + $mysqlpassword = shift(@ARGV); + } + } elsif ($arg eq '-H') { + if ($#ARGV < 0) { + print STDERR "ERROR: hostname required\n"; + &printUsage(); + exit(1); + } else { + $mysqlhost = shift(@ARGV); + } + } elsif ($arg eq '-v') { + $verbose++; + } elsif ($arg eq '-h') { + &printUsage(); + exit(0); + } else { + print STDERR "ERROR: unknown argument '$arg'\n"; + &printUsage(); + exit(1); + } +} + +dbg "Verbose: $verbose"; + +dbg "Connecting: mysql://$mysqluser\@$mysqlhost/$mysqldb"; +myexit("Cannot connect database", 2) unless my $dbh = DBI->connect("dbi:mysql:database=$mysqldb;host=$mysqlhost", $mysqluser, $mysqlpassword); + +dbg "Reading rtpproxy_attrs"; +my %attrs = (); +# copy rtpproxy_attrs to memory, we need snapshot of table +$sth = $dbh->prepare("SELECT * FROM rtpproxy_attrs"); +$sth->execute(); +my $i = 0; +while (my $href = $sth->fetchrow_hashref()) { + + if ($href->{'name'} eq 'dlg_sess_ids') { + $attrs{$href->{'id'}} = $href->{'value'}; + $i++; + } +} +$sth->finish(); +dbg "rtpproxy_attrs records: $i"; + +my %cfgSwitchboards = &parseConfigFile($configFile); + +my %switchboards = (); +for my $id (keys %cfgSwitchboards) { + dbg "Switchboard: $id"; + $cmd = "iptrtpproxy list --addr-a $cfgSwitchboards{$id}{'addr-a'} --port-a $cfgSwitchboards{$id}{'port-a'} --addr-b $cfgSwitchboards{$id}{'addr-b'} --port-b $cfgSwitchboards{$id}{'port-b'} --force-switchboard-audit --format tab"; + my @lines = &do_exec($cmd); + my @l = split(/\t/, $lines[0]); + my $sess_id = -1; + my $tick = -1; + for my $i (0..$#l) { + if ($l[$i] eq 'sess-id') { + $sess_id = $i; + } elsif ($l[$i] eq 'created/tick') { + $tick = $i; + } + } + dbg "Lines: $#lines, Columns: sess-id: $sess_id, tick: $tick"; + for my $i (1..$#lines) { + my @l = split(/\t/, $lines[$i]); + $switchboards{$id}{$l[$sess_id]} = $l[$tick]; + } +} + +dbg "Clean rtpproxy_attrs"; +# get iptrtpproxy switchboards +my $delCnt = 0; +$sth = $dbh->prepare("DELETE FROM rtpproxy_attrs WHERE id=?"); +loop: for my $id (keys %attrs) { + # format name:session_id/stamp (, session_id/stamp)*] + my $found = 0; + my ($name, $s) = split( /:/, $attrs{$id}); + if (!defined $s) { + goto del; + } + my @ss = split( /,/, $s); + for $i (0..$#ss) { + my ($sess_id, $tick) = split ( /\//, $ss[$i]); + if ($sess_id eq "" || !defined $tick || $tick eq "") { + next; + } + if ($switchboards{$name}{$sess_id} && $switchboards{$name}{$sess_id} eq $tick) { + dbg "Leave: $id=$attrs{$id}"; + next loop; + } + } +del: + dbg "Delete: $id=$attrs{$id}"; + $sth->execute($id); + $delCnt++; +} +dbg "Deleted: $delCnt records"; + +exit(0); + + diff --git a/modules_s/iptrtpproxy/iptrtpproxy.c b/modules_s/iptrtpproxy/iptrtpproxy.c index d8c2bc2..32cfdf6 100644 --- a/modules_s/iptrtpproxy/iptrtpproxy.c +++ b/modules_s/iptrtpproxy/iptrtpproxy.c @@ -329,10 +329,10 @@ static int parse_sdp_content(struct sip_msg* msg, struct sdp_session *sess) { } break; invalidate: - if (sess_fl == 2) { - sess->media[sess->media_count-1].active = 0; - } - break; + if (sess_fl == 2) { + sess->media[sess->media_count-1].active = 0; + } + break; case 'm': /* Media Announcements: m=<media> <port>[/<number of ports>] <transport> <fmt list>, eg. m=audio 49170 RTP/AVP 0 */ switch (sess_fl) { @@ -492,17 +492,17 @@ static int unserialize_ipt_session(str* session_ids, struct ipt_session* sess) { s.len = p-s.s; sess->switchboard = find_switchboard(&s); if (!sess->switchboard) { - ERR(MODULE_NAME": unserialize_ipt_session: switchboard '%.*s' not found\n", s.len, s.s); + ERR(MODULE_NAME": unserialize_ipt_session: '%.*s', switchboard '%.*s' not found\n", session_ids->len, session_ids->s, s.len, s.s); return -1; } if (p == pend) return 0; if (*p != ':') { - ERR(MODULE_NAME": unserialize_ipt_session: colon expected near '%.*s'\n", pend-p, p); + ERR(MODULE_NAME": unserialize_ipt_session: '%.*s', colon expected near '%.*s'\n", session_ids->len, session_ids->s, pend-p, p); return -1; } do { if (sess->stream_count >= MAX_MEDIA_NUMBER) { - ERR(MODULE_NAME": unserialize_ipt_session: max.media number (%d) exceeded\n", MAX_MEDIA_NUMBER); + ERR(MODULE_NAME": unserialize_ipt_session: '%.*s', max.media number (%d) exceeded\n", session_ids->len, session_ids->s, MAX_MEDIA_NUMBER); return -1; } p++; @@ -512,7 +512,7 @@ static int unserialize_ipt_session(str* session_ids, struct ipt_session* sess) { s.s = p; while (p < pend && (*p >= '0' && *p <= '9')) p++; if (p != pend && *p != '/') { - ERR(MODULE_NAME": unserialize_ipt_session: '/' expected near '%.*s'\n", pend-p, p); + ERR(MODULE_NAME": unserialize_ipt_session: '%.*s', '/' expected near '%.*s'\n", session_ids->len, session_ids->s, pend-p, p); return -1; } s.len = p-s.s; @@ -527,7 +527,7 @@ static int unserialize_ipt_session(str* session_ids, struct ipt_session* sess) { while (p < pend && (*p >= '0' && *p <= '9')) p++; if (p != pend && *p != ',') { sess->streams[sess->stream_count-1].sess_id = -1; - ERR(MODULE_NAME": unserialize_ipt_session: comma expected near '%.*s'\n", pend-p, p); + ERR(MODULE_NAME": unserialize_ipt_session: '%.*s', comma expected near '%.*s'\n", session_ids->len, session_ids->s, pend-p, p); return -1; } s.len = p-s.s; @@ -732,7 +732,6 @@ static int rtpproxy_update(struct sip_msg* msg, char* _flags, char* _session_ids } } } -serialize_ipt_session(&ipt_sess, &session_ids); if (update_sdp_content(msg, GATE_A_TO_B(flags), &sdp_sess, &ipt_sess) < 0) { /* delete all sessions ? */ return -1;

15 years, 5 months

git:ser_modules: presence_b2b: fix from & to header access

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: ee6eee271dceec6e1d4d581edd389687697ccdc7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee6eee2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 14 07:36:51 2009 +0000 presence_b2b: fix from & to header access Access the parsed part of a From or To header only if non-zero and/or parse_from_header() returned success. --- modules_s/presence_b2b/euac_funcs.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules_s/presence_b2b/euac_funcs.c b/modules_s/presence_b2b/euac_funcs.c index 04313c9..b147ffa 100644 --- a/modules_s/presence_b2b/euac_funcs.c +++ b/modules_s/presence_b2b/euac_funcs.c @@ -34,8 +34,10 @@ events_uac_t *find_euac_nolock(struct sip_msg *m) parse_from_header(m); memset(&id, 0, sizeof(id)); - if (m->to) id.loc_tag = ((struct to_body*)m->to->parsed)->tag_value; - if (m->from) id.rem_tag = ((struct to_body*)m->from->parsed)->tag_value; + if (m->to && m->to->parsed) + id.loc_tag = ((struct to_body*)m->to->parsed)->tag_value; + if (parse_from_header(m)==0 && m->from->parsed) + id.rem_tag = ((struct to_body*)m->from->parsed)->tag_value; if (m->callid) id.call_id = m->callid->body; uac = (events_uac_t*)ht_find(&euac_internals->ht_confirmed, &id);

15 years, 5 months

git:ser_modules: rr: fix from header access

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: 6fcd5e9fd6944e8e8ddac718c8f9ad51dcb46b7b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fcd5e9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 14 07:36:19 2009 +0000 rr: fix from header access get_from() can be used _only_ if parse_from_header() returned success or if msg->from!=0. --- modules_s/rr/loose.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_s/rr/loose.c b/modules_s/rr/loose.c index da1e7df..25ebb07 100644 --- a/modules_s/rr/loose.c +++ b/modules_s/rr/loose.c @@ -420,8 +420,8 @@ static int get_direction(struct sip_msg* _m, str* _params) { ftag.len = s.s+i - ftag.s; if (ftag.len) { - parse_from_header(_m); - if (get_from(_m)) { /* compare if from.tag == ftag */ + if ((parse_from_header(_m)==0) && get_from(_m)) { + /* compare if from.tag == ftag */ if (ftag.len!=get_from(_m)->tag_value.len || strncmp(ftag.s, get_from(_m)->tag_value.s, ftag.len)) return 1; } }

15 years, 5 months

git:master: core: expr =~ fixup order fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: dba9e85e137cc3818a01cccb2930e7580564ecd1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dba9e85… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 17 17:10:07 2009 +0200 core: expr =~ fixup order fix The fixup for built-in expressions were in the wrong order: first RE and then RVE/RVALs, but a RVE/RVALs could be optimized away to a string => because of the wrong order at runtime the match operator might end up being used with a normal string instead of a RE. Now the order is RVE/RVALs fixup & optimisations, string fixups (len) and then RE fixups (so that by the time the RE fixup is run we know the final type of its operand). Reported-by: Nils Ohlmeier nils at iptel org --- route.c | 66 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 35 insertions(+), 31 deletions(-) diff --git a/route.c b/route.c index e22820d..effb608 100644 --- a/route.c +++ b/route.c @@ -525,6 +525,41 @@ int fix_expr(struct expr* exp) exp->op); } }else if (exp->type==ELEM_T){ + /* first fix & optimize rve/rvals (they might be optimized + to non-rvals, e.g. string, avp a.s.o) */ + if (exp->l_type==RVEXP_O){ + if ((ret=fix_rval_expr(&exp->l.param))<0){ + ERR("Unable to fix left rval expression\n"); + return ret; + } + if (scr_opt_lev>=2) + exp_optimize_left(exp); + } + if (exp->r_type==RVE_ST){ + if ((ret=fix_rval_expr(&exp->r.param))<0){ + ERR("Unable to fix right rval expression\n"); + return ret; + } + if (scr_opt_lev>=2) + exp_optimize_right(exp); + } + + /* Calculate lengths of strings */ + if (exp->l_type==STRING_ST) { + int len; + if (exp->l.string) len = strlen(exp->l.string); + else len = 0; + exp->l.str.s = exp->l.string; + exp->l.str.len = len; + } + if (exp->r_type==STRING_ST) { + int len; + if (exp->r.string) len = strlen(exp->r.string); + else len = 0; + exp->r.str.s = exp->r.string; + exp->r.str.len = len; + } + if (exp->op==MATCH_OP){ /* right side either has to be string, in which case * we turn it into regular expression, or it is regular @@ -562,21 +597,6 @@ int fix_expr(struct expr* exp) return ret; } } - /* Calculate lengths of strings */ - if (exp->l_type==STRING_ST) { - int len; - if (exp->l.string) len = strlen(exp->l.string); - else len = 0; - exp->l.str.s = exp->l.string; - exp->l.str.len = len; - } - if (exp->r_type==STRING_ST) { - int len; - if (exp->r.string) len = strlen(exp->r.string); - else len = 0; - exp->r.str.s = exp->r.string; - exp->r.str.len = len; - } if (exp->l_type==SELECT_O) { if ((ret=resolve_select(exp->l.select)) < 0) { BUG("Unable to resolve select\n"); @@ -591,22 +611,6 @@ int fix_expr(struct expr* exp) return ret; } } - if (exp->l_type==RVEXP_O){ - if ((ret=fix_rval_expr(&exp->l.param))<0){ - ERR("Unable to fix left rval expression\n"); - return ret; - } - if (scr_opt_lev>=2) - exp_optimize_left(exp); - } - if (exp->r_type==RVE_ST){ - if ((ret=fix_rval_expr(&exp->r.param))<0){ - ERR("Unable to fix right rval expression\n"); - return ret; - } - if (scr_opt_lev>=2) - exp_optimize_right(exp); - } /* PVAR don't need fixing */ ret=0; }

15 years, 5 months

CVS:commitlog: sip_router cfg.lex cfg.y

by Andrei Pelinescu-Onciul

andrei 2009/07/17 15:37:11 CEST SER CVS Repository Modified files: . cfg.lex cfg.y Log: core: config parser listen if names fix If no quotes were used in listen=x, it was assumed that x was an ip or a valid hostname (each domain part starts with a letter, numbers and '_' are not allowed as first chars). However this assumption failed when interface names were used, e.g. eth0.1 is a valid interface name, but listen=eth0.1 resulted in error (it worked only if quotes were used, e.g. listen="eth0.1"). Revision Changes Path 1.126 +30 -13 sip_router/cfg.lex http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg.lex.diff?r1=1.… 1.184 +36 -4 sip_router/cfg.y http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg.y.diff?r1=1.18…

15 years, 6 months

CVS:commitlog: sip_router cfg.y

by Andrei Pelinescu-Onciul

andrei 2009/07/17 15:37:02 CEST SER CVS Repository Modified files: . cfg.y Log: core: config parser listen fix - do not crash when the listen=host line contains an invalid host (e.g. foo.1) - more null checks Reported-by: Cristian Constantin cristian.constantin at iptel org Revision Changes Path 1.183 +45 -32 sip_router/cfg.y http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg.y.diff?r1=1.18…

15 years, 6 months

git:master: domain: API framework to be used by other modules

by Jan Janak

Module: sip-router Branch: master Commit: dd5490500f006f86e520958c5ca2646a1e3a96b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd54905… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Jul 17 00:15:39 2009 +0200 domain: API framework to be used by other modules Add a new data structure and function bind_domain that can be used by other modules to gain access to internal functions of domain module. Implement inline function load_domain_api that does everything that is necessary to make the API of the domain module available to the caller. --- modules_s/domain/domain_api.c | 35 ++++++++++++++++++++++++++ modules_s/domain/domain_api.h | 54 +++++++++++++++++++++++++++++++++++++++++ modules_s/domain/domain_mod.c | 2 + 3 files changed, 91 insertions(+), 0 deletions(-) diff --git a/modules_s/domain/domain_api.c b/modules_s/domain/domain_api.c new file mode 100644 index 0000000..c88e5c8 --- /dev/null +++ b/modules_s/domain/domain_api.c @@ -0,0 +1,35 @@ +/* + * Domain module internal API + * + * Copyright (C) 2002-2003 Juha Heinanen + * + * This file is part of sip-router, a free SIP server. + * + * sip-router is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version + * + * sip-router is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "domain_api.h" +#include "../../dprint.h" +#include "domain.h" + + +int bind_domain(domain_api_t* api) +{ + if (api == NULL) { + ERR("Invalid parameter value\n"); + return -1; + } + return 0; +} diff --git a/modules_s/domain/domain_api.h b/modules_s/domain/domain_api.h new file mode 100644 index 0000000..16ddd1f --- /dev/null +++ b/modules_s/domain/domain_api.h @@ -0,0 +1,54 @@ +/* + * Domain module internal API + * + * Copyright (C) 2002-2003 Juha Heinanen + * + * This file is part of sip-router, a free SIP server. + * + * sip-router is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version + * + * sip-router is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _DOMAIN_API_H +#define _DOMAIN_API_H + +#include "../../sr_module.h" +#include "../../dprint.h" + +typedef struct domain_api { + +} domain_api_t; + +typedef int (*bind_domain_f)(domain_api_t* api); +int bind_domain(domain_api_t* api); + +static inline int load_domain_api(domain_api_t* api) +{ + bind_domain_f bind_domain; + + bind_domain = (bind_domain_f)find_export("bind_domain", 0, 0); + + if (bind_domain == NULL) { + ERR("Cannot import bind_domain function from domain module\n"); + return -1; + } + + if (bind_domain(api) == -1) { + return -1; + } + return 0; +} + + +#endif /* _DOMAIN_API_H */ diff --git a/modules_s/domain/domain_mod.c b/modules_s/domain/domain_mod.c index 957973f..c7e0515 100644 --- a/modules_s/domain/domain_mod.c +++ b/modules_s/domain/domain_mod.c @@ -38,6 +38,7 @@ #include "../../parser/parse_from.h" #include "../../parser/parse_uri.h" #include "../../usr_avp.h" +#include "domain_api.h" #include "domain_rpc.h" #include "hash.h" #include "domain.h" @@ -124,6 +125,7 @@ static cmd_export_t cmds[] = { {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, REQUEST_ROUTE|FAILURE_ROUTE }, {"get_did", (cmd_function)get_did, 0, 0, 0}, + {"bind_domain", (cmd_function)bind_domain, 0, 0, 0}, {0, 0, 0, 0, 0} };

15 years, 6 months

git:master: domain: Documentation of internal API

by Jan Janak

Module: sip-router Branch: master Commit: c4dbb39571c5e8d801956d8afc5134387de1a59a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4dbb39… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Jul 17 11:34:24 2009 +0200 domain: Documentation of internal API Add docbook documentation for the internal API of domain module. --- modules_s/domain/doc/domain.xml | 1 + modules_s/domain/doc/domain_api.xml | 47 +++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/modules_s/domain/doc/domain.xml b/modules_s/domain/doc/domain.xml index 0e4879f..9c8aa57 100644 --- a/modules_s/domain/doc/domain.xml +++ b/modules_s/domain/doc/domain.xml @@ -241,5 +241,6 @@ iptel <xi:include href="params.xml"/> <xi:include href="functions.xml"/> <xi:include href="fifo.xml"/> + <xi:include href="domain_api.xml"/> </section> diff --git a/modules_s/domain/doc/domain_api.xml b/modules_s/domain/doc/domain_api.xml new file mode 100644 index 0000000..27c2c10 --- /dev/null +++ b/modules_s/domain/doc/domain_api.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<section id="domain.api" xmlns:xi="http://www.w3.org/2001/XInclude"> + <title>Internal API</title> + <para>The domain module has an internal API which can be used to access + additional functions of the module (i.e. functions that are normally not + available from the routing script). Currently the API exports only the + function <function>is_domain_local</function>. That function can be used + to determine whether a given domain name is on the list of locally + configured domain names.</para> + + <para>If you want to use the internal API of domain module from your + module then you need to include the header file + <filename>domain_api.h</filename> and call + <function>load_domain_api</function> first.</para> + + <example> + <title>Calling <function>load_domain_api</function></title> + <programlisting> +#include "../domain/domain_api.h" + +domain_api_t dom_api; + +if (load_domain_api(&dom_api) != 0) { + /* error */ +} +</programlisting> + </example> + + <para>After that you can call function + <function>is_domain_local</function> whose pointer is stored in the + initialized data structure:</para> + + <programlisting> +str tmp = STR_STATIC_INIT("mydomain.com"); + +if (dom_api.is_domain_local(&tmp) == 1) { + /* Domain is local */ +} else { + /* Domain is not local or an error was encountered */ +} + </programlisting> +</section> + + \ No newline at end of file

15 years, 6 months

git:master: domain: Add internal function is_domain_local

by Jan Janak

Module: sip-router Branch: master Commit: d8fdebf9c589516185d5c6a4ff9453148f1b76f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8fdebf… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Jul 17 11:10:51 2009 +0200 domain: Add internal function is_domain_local Add internal function is_domain_local that can be used to determine if the domain name given in parameter is on the list of local domains. The comparison of the domain name is always case insensitive. There already is is_local function that does something similar, so we can reuse the code from that function. is_domain_local takes a pointer to str as parameter and this function is then called by is_local which takes all the usual parameters that function which can be called from the script take. Finally, is_domain_local is exported through the internal API of the domain module. Function is_domain_local is now located in file domain.c and because of db_get_did was also moved to file domain.c --- modules_s/domain/domain.c | 104 +++++++++++++++++++++++++++++++++++++++++ modules_s/domain/domain.h | 17 +++++++ modules_s/domain/domain_api.c | 1 + modules_s/domain/domain_api.h | 3 +- modules_s/domain/domain_mod.c | 91 +----------------------------------- 5 files changed, 126 insertions(+), 90 deletions(-) diff --git a/modules_s/domain/domain.c b/modules_s/domain/domain.c index cd347bf..cb5cb32 100644 --- a/modules_s/domain/domain.c +++ b/modules_s/domain/domain.c @@ -22,6 +22,7 @@ #include <string.h> #include "domain_mod.h" +#include "hash.h" #include "../../dprint.h" #include "../../mem/shm_mem.h" #include "../../lib/srdb2/db.h" @@ -308,3 +309,106 @@ int load_domains(domain_t** dest) free_domain_list(list); return 1; } + + +/* Retrieve did directly from database, without using memory cache. Use 0 as + * the value of first parameter if you only want to know whether the entry is + * in the database. The function returns 1 if there is such entry, 0 if not, + * and -1 on error. The result is allocated using pkg_malloc and must be + * freed. + */ +int db_get_did(str* did, str* domain) +{ + db_res_t* res = NULL; + db_rec_t* rec; + + if (!domain) { + ERR("BUG:Invalid parameter value\n"); + goto err; + } + + get_did_cmd->match[0].v.lstr = *domain; + + if (db_exec(&res, get_did_cmd) < 0) { + ERR("Error in database query\n"); + goto err; + } + + rec = db_first(res); + if (rec) { + /* Test flags first, we are only interested in rows + * that are not disabled + */ + if (rec->fld[1].flags & DB_NULL || (rec->fld[1].v.bitmap & + SRDB_DISABLED)) { + db_res_free(res); + return 0; + } + + if (did) { + if (rec->fld[0].flags & DB_NULL) { + did->len = 0; + did->s = 0; + WARN("Domain '%.*s' has NULL did\n", + domain->len, ZSW(domain->s)); + } else { + did->s = pkg_malloc(rec->fld[0].v.lstr.len); + if (!did->s) { + ERR("No memory left\n"); + goto err; + } + memcpy(did->s, rec->fld[0].v.lstr.s, rec->fld[0].v.lstr.len); + did->len = rec->fld[0].v.lstr.len; + } + } + + db_res_free(res); + return 1; + } else { + db_res_free(res); + return 0; + } + + err: + if (res) db_res_free(res); + return -1; +} + + +/* Check if the domain name given in the parameter is one + * of the locally configured domain names. + * Returns 1 if yes and -1 otherwise + */ +int is_domain_local(str* domain) +{ + str tmp; + + /* Make a temporary copy, domain name comparisons are always + * case insensitive + */ + tmp.s = pkg_malloc(domain->len); + if (!tmp.s) { + ERR("No memory left\n"); + return -1; + } + memcpy(tmp.s, domain->s, domain->len); + tmp.len = domain->len; + strlower(&tmp); + + if (!db_mode) { + switch(db_get_did(0, &tmp)) { + case 1: goto found; + default: goto not_found; + } + } else { + if (hash_lookup(0, *active_hash, &tmp) == 1) goto found; + else goto not_found; + } + + found: + pkg_free(tmp.s); + return 1; + not_found: + pkg_free(tmp.s); + return -1; +} diff --git a/modules_s/domain/domain.h b/modules_s/domain/domain.h index d79a593..e0d0d37 100644 --- a/modules_s/domain/domain.h +++ b/modules_s/domain/domain.h @@ -72,4 +72,21 @@ void free_domain_list(domain_t* list); typedef int (*domain_get_did_t)(str* did, str* domain); + +/* Retrieve did directly from database, without using memory cache. Use 0 as + * the value of first parameter if you only want to know whether the entry is + * in the database. The function returns 1 if there is such entry, 0 if not, + * and -1 on error. The result is allocated using pkg_malloc and must be + * freed. + */ +int db_get_did(str* did, str* domain); + +/* Check if the domain name given in the parameter is one + * of the locally configured domain names. + * Returns 1 if yes and -1 otherwise + */ +typedef int (*is_domain_local_f)(str* domain); +int is_domain_local(str* domain); + + #endif /* _DOMAIN_H */ diff --git a/modules_s/domain/domain_api.c b/modules_s/domain/domain_api.c index c88e5c8..0996c67 100644 --- a/modules_s/domain/domain_api.c +++ b/modules_s/domain/domain_api.c @@ -31,5 +31,6 @@ int bind_domain(domain_api_t* api) ERR("Invalid parameter value\n"); return -1; } + api->is_domain_local = is_domain_local; return 0; } diff --git a/modules_s/domain/domain_api.h b/modules_s/domain/domain_api.h index 16ddd1f..2882332 100644 --- a/modules_s/domain/domain_api.h +++ b/modules_s/domain/domain_api.h @@ -25,9 +25,10 @@ #include "../../sr_module.h" #include "../../dprint.h" +#include "domain.h" typedef struct domain_api { - + is_domain_local_f is_domain_local; } domain_api_t; typedef int (*bind_domain_f)(domain_api_t* api); diff --git a/modules_s/domain/domain_mod.c b/modules_s/domain/domain_mod.c index c7e0515..e5d5cb0 100644 --- a/modules_s/domain/domain_mod.c +++ b/modules_s/domain/domain_mod.c @@ -381,107 +381,20 @@ static void destroy(void) } -/* Retrieve did directly from database, without using memory cache. Use 0 as - * the value of first parameter if you only want to know whether the entry is - * in the database. The function returns 1 if there is such entry, 0 if not, - * and -1 on error. The result is allocated using pkg_malloc and must be - * freed. - */ -static int db_get_did(str* did, str* domain) -{ - db_res_t* res = NULL; - db_rec_t* rec; - - if (!domain) { - ERR("BUG:Invalid parameter value\n"); - goto err; - } - - get_did_cmd->match[0].v.lstr = *domain; - - if (db_exec(&res, get_did_cmd) < 0) { - ERR("Error in database query\n"); - goto err; - } - - rec = db_first(res); - if (rec) { - /* Test flags first, we are only interested in rows - * that are not disabled - */ - if (rec->fld[1].flags & DB_NULL || (rec->fld[1].v.bitmap & - SRDB_DISABLED)) { - db_res_free(res); - return 0; - } - - if (did) { - if (rec->fld[0].flags & DB_NULL) { - did->len = 0; - did->s = 0; - WARN("Domain '%.*s' has NULL did\n", - domain->len, ZSW(domain->s)); - } else { - did->s = pkg_malloc(rec->fld[0].v.lstr.len); - if (!did->s) { - ERR("No memory left\n"); - goto err; - } - memcpy(did->s, rec->fld[0].v.lstr.s, rec->fld[0].v.lstr.len); - did->len = rec->fld[0].v.lstr.len; - } - } - - db_res_free(res); - return 1; - } else { - db_res_free(res); - return 0; - } - - err: - if (res) db_res_free(res); - return -1; -} - /* * Check if domain is local */ static int is_local(struct sip_msg* msg, char* fp, char* s2) { - str domain, tmp; + str domain; if (get_str_fparam(&domain, msg, (fparam_t*)fp) != 0) { ERR("Unable to get domain to check\n"); return -1; } - tmp.s = pkg_malloc(domain.len); - if (!tmp.s) { - ERR("No memory left\n"); - return -1; - } - memcpy(tmp.s, domain.s, domain.len); - tmp.len = domain.len; - strlower(&tmp); - - if (!db_mode) { - switch(db_get_did(0, &tmp)) { - case 1: goto found; - default: goto not_found; - } - } else { - if (hash_lookup(0, *active_hash, &tmp) == 1) goto found; - else goto not_found; - } - - found: - pkg_free(tmp.s); - return 1; - not_found: - pkg_free(tmp.s); - return -1; + return is_domain_local(&domain); }

15 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev