sr-dev July 2009

sr-dev@lists.kamailio.org

35 participants
328 discussions

git:ser_core_cvs: cfg framework: fix the group handles in the main process

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: c0f12714391fa6b359cceaed22ed238ba5387457 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0f1271… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jul 13 15:13:12 2009 +0000 cfg framework: fix the group handles in the main process (backport from GIT) The main process does not have a local configuration, it has access only to the config values that were set before forking. As a result, the group handles cannot ponint to the shared memory address because the shared memory block may be freed later by one of the child processes. This problem resulted sometimes in a core dump after the processes were killed when the main process tried to access a variable from shared mem which was no longer available. --- cfg/cfg_script.c | 1 - cfg/cfg_struct.c | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cfg/cfg_script.c b/cfg/cfg_script.c index 39a4068..8804e40 100644 --- a/cfg/cfg_script.c +++ b/cfg/cfg_script.c @@ -143,7 +143,6 @@ error: /* fix-up the dynamically declared group: * - allocate memory for the arrays * - set the values within the memory block - * - notify the drivers about the new group */ int cfg_script_fixup(cfg_group_t *group, unsigned char *block) { diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index fe7d8d6..966443e 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -194,21 +194,23 @@ int cfg_shmize(void) /* clone the strings to shm mem */ if (cfg_shmize_strings(group)) goto error; - /* copy the values to the new block, - and update the module's handle */ + /* copy the values to the new block */ memcpy(block->vars+group->offset, group->vars, group->size); - *(group->handle) = block->vars+group->offset; } else { /* The group was declared with NULL values, * we have to fix it up. * The fixup function takes care about the values, * it fills up the block */ if (cfg_script_fixup(group, block->vars+group->offset)) goto error; - *(group->handle) = block->vars+group->offset; - /* notify the drivers about the new config definition */ + /* Notify the drivers about the new config definition. + * Temporary set the group handle so that the drivers have a chance to + * overwrite the default values. The handle must be reset after this + * because the main process does not have a local configuration. */ + *(group->handle) = block->vars+group->offset; cfg_notify_drivers(group->name, group->name_len, group->mapping->def); + *(group->handle) = NULL; } } /* try to fixup the selects that failed to be fixed-up previously */

14 years, 10 months

git:ser_modules: - socket support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: 36e77b35c20518c84f169a4092ca34c4908e81da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36e77b3… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Wed Jul 15 23:02:15 2009 +0000 - socket support --- .../iptrtpproxy/examples/clean_rtpproxy_attrs | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs b/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs index e034d5f..bd755a5 100755 --- a/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs +++ b/modules_s/iptrtpproxy/examples/clean_rtpproxy_attrs @@ -23,6 +23,8 @@ my $defmysqluser = 'ser'; my $mysqluser = $defmysqluser; my $defmysqlpassword = 'heslo'; my $mysqlpassword = $defmysqlpassword; +my $defmysqlsock = ""; +my $mysqlsock = $defmysqlsock; use Config::IniFiles; @@ -81,9 +83,10 @@ $scriptName =~ s!^.*/!!; sub printUsage { print "$scriptName, Version: $version\n"; - print "usage: $scriptName [-f <iptrtpproxy_config>] [-v] [-h] [-H <db_host>] [-D <db_name>] [-u <db_user>] [-p <db_password>]\n"; + print "usage: $scriptName [-f <iptrtpproxy_config>] [-v] [-h] [-H <db_host>] [-S <db_sock>] [-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_sock .. MYSQL socket, default: $defmysqlsock\n"; print " db_name .. database name, default: $defmysqldb\n"; print " db_user .. database user, default: $defmysqluser\n"; $_ = substr $defmysqlpassword, 1, length($defmysqlpassword)-2; @@ -138,6 +141,14 @@ while ($#ARGV >= 0) { } else { $mysqlhost = shift(@ARGV); } + } elsif ($arg eq '-S') { + if ($#ARGV < 0) { + print STDERR "ERROR: socket required\n"; + &printUsage(); + exit(1); + } else { + $mysqlsock = shift(@ARGV); + } } elsif ($arg eq '-v') { $verbose++; } elsif ($arg eq '-h') { @@ -153,7 +164,10 @@ while ($#ARGV >= 0) { 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); +myexit("Cannot connect database", 2) unless my $dbh = DBI->connect("dbi:mysql:database=$mysqldb". + ($mysqlhost?";host=$mysqlhost":''). + ($mysqlsock?";mysql_socket=$mysqlsock":'') + , $mysqluser, $mysqlpassword); dbg "Reading rtpproxy_attrs"; my %attrs = ();

14 years, 10 months

git:ser_modules: Merge branch 'cvs-head' of ssh://git.sip-router.org/ ser_modules into ser_modules

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_modules Commit: 8e1f906e8dee090025f82e5c76355b75f7919d66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8e1f906… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 17 17:37:32 2009 +0200 Merge branch 'cvs-head' of ssh://git.sip-router.org/ser_modules into ser_modules * 'cvs-head' of ssh://git.sip-router.org/ser_modules: - socket support - more -h messages - minor ERR message improvment presence_b2b: fix from & to header access rr: fix from header access ---

14 years, 10 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; } }

14 years, 10 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);

14 years, 10 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;

14 years, 10 months

git:ser_modules: - more -h messages

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 = '';

14 years, 10 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; }

14 years, 10 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…

14 years, 10 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…

14 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2009