sr-dev July 2009

sr-dev@lists.kamailio.org

35 participants
328 discussions

git:master: core: pvars support in ser *var fixups
by Andrei Pelinescu-Onciul 06 Jul '09

06 Jul '09

Module: sip-router Branch: master Commit: b25e31aaab556941d4f3057d7f6b106b2ed749bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b25e31a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 6 12:26:19 2009 +0200 core: pvars support in ser *var fixups - all ser generic fixups (fixup_var_{int,str}_*) work with pvars (e.g. the fallback order for str is: pvar->avp->select->str). - fixed FPARAM_* definitions to allow better fallback for fix_param_types (int->select->pvar->avp->str) - fix_param() does not print anymore error messages for invalid pvars or avps, to allow fallback --- sr_module.c | 34 +++++++++++++++++++--------------- sr_module.h | 26 +++++++++++++++----------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/sr_module.c b/sr_module.c index 3641df3..5414529 100644 --- a/sr_module.c +++ b/sr_module.c @@ -54,6 +54,7 @@ #include "trim.h" #include "globals.h" #include "rpc_lookup.h" +#include "sr_compat.h" #include <sys/stat.h> #include <regex.h> @@ -1052,7 +1053,7 @@ int fix_param(int type, void** param) goto error; case FPARAM_STRING: p->v.asciiz = *param; - + /* no break */ case FPARAM_STR: p->v.str.s = (char*)*param; p->v.str.len = strlen(p->v.str.s); @@ -1080,8 +1081,8 @@ int fix_param(int type, void** param) REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { pkg_free(p->v.regex); p->v.regex=0; - ERR("Bad regular expression '%s'\n", (char*)*param); - goto error; + /* not a valid regex */ + goto no_match; } p->fixed = p->v.regex; break; @@ -1091,14 +1092,13 @@ int fix_param(int type, void** param) trim(&name); if (!name.len || name.s[0] != '$') { /* Not an AVP identifier */ - pkg_free(p); - return 1; + goto no_match; } name.s++; name.len--; if (parse_avp_ident(&name, &p->v.avp) < 0) { - ERR("Error while parsing attribute name\n"); - goto error; + /* invalid avp identifier (=> no match) */ + goto no_match; } p->fixed = &p->v; break; @@ -1108,8 +1108,7 @@ int fix_param(int type, void** param) trim(&name); if (!name.len || name.s[0] != '@') { /* Not a select identifier */ - pkg_free(p); - return 1; + goto no_match; } if (parse_select(&name.s, &p->v.select) < 0) { ERR("Error while parsing select identifier\n"); @@ -1133,20 +1132,18 @@ int fix_param(int type, void** param) trim(&name); if (!name.len || name.s[0] != '$'){ /* not a pvs identifier */ - pkg_free(p); - return 1; + goto no_match; } p->v.pvs=pkg_malloc(sizeof(pv_spec_t)); if (p->v.pvs==0){ ERR("out of memory while parsing pv_spec_t\n"); goto error; } - if (pv_parse_spec(&name, p->v.pvs)==0){ - ERR("unsupported user field indentifier \"%.*s\"\n", - name.len, name.s); + if (pv_parse_spec2(&name, p->v.pvs, 1)==0){ + /* not a valid pvs identifier (but it might be an avp) */ pkg_free(p->v.pvs); p->v.pvs=0; - goto error; + goto no_match; } p->fixed = p->v.pvs; break; @@ -1165,6 +1162,9 @@ int fix_param(int type, void** param) *param = (void*)p; return 0; +no_match: + pkg_free(p); + return 1; error: pkg_free(p); return E_UNSPEC; @@ -1261,6 +1261,8 @@ int fix_param_types(int types, void** param) int fixup_var_str_12(void** param, int param_no) { int ret; + if ((sr_cfg_compat!=SR_COMPAT_SER) && + ((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret; if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_STR, param)) <= 0) return ret; @@ -1296,6 +1298,8 @@ int fixup_var_str_2(void** param, int param_no) int fixup_var_int_12(void** param, int param_no) { int ret; + if ((sr_cfg_compat!=SR_COMPAT_SER) && + ((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret; if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_INT, param)) <= 0) return ret; diff --git a/sr_module.h b/sr_module.h index 0b1d74b..426729c 100644 --- a/sr_module.h +++ b/sr_module.h @@ -231,21 +231,25 @@ struct param_export_ { /** allowed parameter types. - * the types that cannot be deduced from the string, should - * be at the end (e.g. FPARAM_STR), to allow fallback - * (e.g. fix_param_types(FPARAM_AVP|FPARAM_SELECT|FPARAM_STR, param)) + * the types _must_ be in "fallback" order, + * e.g. FPARAM_STR should be the last to allow fallback to it, + * F_PARAM_PVS should be in front of F_PARAM_AVP (so that + * for fix_param_types(FPARAM_AVP|FPARAM_PVS|FPARAM_STR, param) and $foo + * the pvars will be checked first and only if no pvar is found the + * param will be resolved to an avp) */ enum { FPARAM_UNSPEC = 0, FPARAM_INT = (1 << 0), - FPARAM_REGEX = (1 << 1), - FPARAM_AVP = (1 << 2), - FPARAM_SELECT = (1 << 3), - FPARAM_SUBST = (1 << 4), - FPARAM_PVS = (1 << 5), - FPARAM_PVE = (1 << 6), - FPARAM_STRING = (1 << 7), - FPARAM_STR = (1 << 8) + FPARAM_SELECT = (1 << 1), + FPARAM_PVS = (1 << 2), + FPARAM_AVP = (1 << 3), + FPARAM_STRING = (1 << 4), + FPARAM_STR = (1 << 5), + /* special types: no fallback between them possible */ + FPARAM_REGEX = (1 << 6), + FPARAM_SUBST = (1 << 7), + FPARAM_PVE = (1 << 8) }; /*

2 1

git:master: tm: t_reply() first param. can be any var. type
by Andrei Pelinescu-Onciul 06 Jul '09

06 Jul '09

Module: sip-router Branch: master Commit: ed6838004eef2734a1a9667bbe56526de1463bf2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed68380… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 6 12:36:22 2009 +0200 tm: t_reply() first param. can be any var. type Switched first param. fixup to fixup_var_int_12(), thus allowing it to be a pvar. --- modules/tm/tm.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index e769b75..034b8c7 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -508,12 +508,8 @@ static int fixup_routes(char* r_type, struct route_list* rt, void** param) static int fixup_t_reply(void** param, int param_no) { - int ret; - if (param_no == 1) { - ret = fix_param(FPARAM_AVP, param); - if (ret <= 0) return ret; - if (fix_param(FPARAM_INT, param) != 0) return -1; + if (fixup_var_int_12(param, 1) != 0) return -1; } else if (param_no == 2) { return fixup_var_str_12(param, 2); }

1 0

git:master: modules_s/domain: log message level changes
by Juha Heinanen 06 Jul '09

06 Jul '09

Module: sip-router Branch: master Commit: 537fbbea7382d6a47d41e6789dd84428f9b1e1ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=537fbbe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Jul 6 13:06:35 2009 +0300 modules_s/domain: log message level changes - Made module less noisy by turning INFOs to DBGs. - Print error instead of debug message if domain name to be looked for cannot be accessed. --- modules_s/domain/domain_mod.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_s/domain/domain_mod.c b/modules_s/domain/domain_mod.c index 3cb24b7..30766da 100644 --- a/modules_s/domain/domain_mod.c +++ b/modules_s/domain/domain_mod.c @@ -208,14 +208,14 @@ static int init_db(void) if (db_add_db(db, db_url.s) < 0) return -1; if (db_connect(db) < 0) return -1; - INFO("prepare load_domains_cmd\n"); + DBG("prepare load_domains_cmd\n"); load_domains_cmd = db_cmd(DB_GET, db, domain_table.s, load_domains_columns, NULL, NULL); if (load_domains_cmd == NULL) { ERR("Error while preparing load_domains database command\n"); return -1; } - INFO("prepare get_did_cmd\n"); + DBG("prepare get_did_cmd\n"); get_did_cmd = db_cmd(DB_GET, db, domain_table.s, get_did_columns, get_did_match, NULL); if (get_did_cmd == NULL) { ERR("Error while preparing get_did database command\n"); @@ -223,7 +223,7 @@ static int init_db(void) } if (load_domain_attrs) { - INFO("prepare load_attrs_cmd\n"); + DBG("prepare load_attrs_cmd\n"); load_attrs_cmd = db_cmd(DB_GET, db, domattr_table.s, load_attrs_columns, load_attrs_match, NULL); if (load_attrs_cmd == NULL) { ERR("Error while preparing load_attrs database command\n"); @@ -528,7 +528,7 @@ static int lookup_domain(struct sip_msg* msg, char* flags, char* fp) track = 0; if (get_str_fparam(&domain, msg, (fparam_t*)fp) != 0) { - DBG("Cannot get domain name to lookup\n"); + ERR("Cannot get domain name to lookup\n"); return -1; } @@ -540,7 +540,7 @@ static int lookup_domain(struct sip_msg* msg, char* flags, char* fp) memcpy(tmp.s, domain.s, domain.len); tmp.len = domain.len; strlower(&tmp); - + if (db_mode) { if (hash_lookup(&d, *active_hash, &tmp) == 1) { set_avp_list((unsigned long)flags, &d->attrs);

1 0

version of s tables
by jh＠tutpro.com 06 Jul '09

06 Jul '09

in scripts/mysql/my_create.sql there is no version table. does it mean that s ser database tables don't have any version number? if so, they have to be added in order to allow easy db table upgrade. -- juha

3 9

[ openser-Bugs-2817317 ] Kamailio crash completly when receiving empty Record-Route
by SourceForge.net 06 Jul '09

06 Jul '09

Bugs item #2817317, was opened at 2009-07-06 10:46 Message generated for change (Comment added) made by ibc_sf You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2817317&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. >Category: modules Group: ver 1.5.x >Status: Closed >Resolution: Duplicate Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: Kamailio crash completly when receiving empty Record-Route Initial Comment: Hello! I found a serious bug: Our Kamailio 1.5.1 crashes, when it receives an empty Record-Route-Field. In my situation a SNOM-M3 with Firmware 2.2 produces this bug. I attached a File where you can see the INVITE which produces the cash. The field "Record-Route" contains only a space. ---------------------------------------------------------------------- >Comment By: Iñaki Baz Castillo (ibc_sf) Date: 2009-07-06 10:54 Message: This is already reported and supposed to be fixed (I reported it but I've tested the commited patch yet): https://sourceforge.net/tracker/?func=detail&aid=2798154&group_id=139143&at… Please try upgrading to the trunk version since I think the patch was commited just for trunk version. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-06 10:54 Message: I forgot: I am using the following modules: loadmodule "/usr/local/lib/kamailio/modules/pv.so" loadmodule "/usr/local/lib/kamailio/modules/sl.so" loadmodule "/usr/local/lib/kamailio/modules/tm.so" loadmodule "/usr/local/lib/kamailio/modules/rr.so" loadmodule "/usr/local/lib/kamailio/modules/db_mysql.so" loadmodule "/usr/local/lib/kamailio/modules/maxfwd.so" loadmodule "/usr/local/lib/kamailio/modules/usrloc.so" loadmodule "/usr/local/lib/kamailio/modules/registrar.so" loadmodule "/usr/local/lib/kamailio/modules/auth.so" loadmodule "/usr/local/lib/kamailio/modules/auth_db.so" loadmodule "/usr/local/lib/kamailio/modules/siputils.so" loadmodule "/usr/local/lib/kamailio/modules/uri_db.so" loadmodule "/usr/local/lib/kamailio/modules/acc.so" loadmodule "/usr/local/lib/kamailio/modules/textops.so" loadmodule "/usr/local/lib/kamailio/modules/avpops.so" loadmodule "/usr/local/lib/kamailio/modules/xlog.so" loadmodule "/usr/local/lib/kamailio/modules/uac.so" loadmodule "/usr/local/lib/kamailio/modules/alias_db.so" loadmodule "/usr/local/lib/kamailio/modules/dialog.so" loadmodule "/usr/local/lib/kamailio/modules/nathelper.so" If you need more information please post what you need. Thank you! ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2817317&group_…

1 0

[ openser-Bugs-2817317 ] Kamailio crash completly when receiving empty Record-Route
by SourceForge.net 06 Jul '09

06 Jul '09

Bugs item #2817317, was opened at 2009-07-06 08:46 Message generated for change (Comment added) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2817317&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: core Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: Kamailio crash completly when receiving empty Record-Route Initial Comment: Hello! I found a serious bug: Our Kamailio 1.5.1 crashes, when it receives an empty Record-Route-Field. In my situation a SNOM-M3 with Firmware 2.2 produces this bug. I attached a File where you can see the INVITE which produces the cash. The field "Record-Route" contains only a space. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-06 08:54 Message: I forgot: I am using the following modules: loadmodule "/usr/local/lib/kamailio/modules/pv.so" loadmodule "/usr/local/lib/kamailio/modules/sl.so" loadmodule "/usr/local/lib/kamailio/modules/tm.so" loadmodule "/usr/local/lib/kamailio/modules/rr.so" loadmodule "/usr/local/lib/kamailio/modules/db_mysql.so" loadmodule "/usr/local/lib/kamailio/modules/maxfwd.so" loadmodule "/usr/local/lib/kamailio/modules/usrloc.so" loadmodule "/usr/local/lib/kamailio/modules/registrar.so" loadmodule "/usr/local/lib/kamailio/modules/auth.so" loadmodule "/usr/local/lib/kamailio/modules/auth_db.so" loadmodule "/usr/local/lib/kamailio/modules/siputils.so" loadmodule "/usr/local/lib/kamailio/modules/uri_db.so" loadmodule "/usr/local/lib/kamailio/modules/acc.so" loadmodule "/usr/local/lib/kamailio/modules/textops.so" loadmodule "/usr/local/lib/kamailio/modules/avpops.so" loadmodule "/usr/local/lib/kamailio/modules/xlog.so" loadmodule "/usr/local/lib/kamailio/modules/uac.so" loadmodule "/usr/local/lib/kamailio/modules/alias_db.so" loadmodule "/usr/local/lib/kamailio/modules/dialog.so" loadmodule "/usr/local/lib/kamailio/modules/nathelper.so" If you need more information please post what you need. Thank you! ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2817317&group_…

1 0

[ openser-Bugs-2817317 ] Kamailio crash completly when receiving empty Record-Route
by SourceForge.net 06 Jul '09

06 Jul '09

Bugs item #2817317, was opened at 2009-07-06 08:46 Message generated for change (Tracker Item Submitted) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2817317&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: core Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: Kamailio crash completly when receiving empty Record-Route Initial Comment: Hello! I found a serious bug: Our Kamailio 1.5.1 crashes, when it receives an empty Record-Route-Field. In my situation a SNOM-M3 with Firmware 2.2 produces this bug. I attached a File where you can see the INVITE which produces the cash. The field "Record-Route" contains only a space. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2817317&group_…

1 0

git:master: scripts/mysql: updated 'gw' and 'lcr' table definitions
by Juha Heinanen 05 Jul '09

05 Jul '09

Module: sip-router Branch: master Commit: 2d14c2a6cf212743b49ed07e76241ea5d3186c55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d14c2a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Jul 5 10:55:48 2009 +0300 scripts/mysql: updated 'gw' and 'lcr' table definitions - Updated 'gw' and 'lcr' MySQL table definitions. - No idea if a schema exists somewhere where sr tables are auto-generated. - The tables are assumed to have versions 10 and 3, respectively although there is no 'version' table in sr database. --- scripts/mysql/my_create.sql | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/scripts/mysql/my_create.sql b/scripts/mysql/my_create.sql index 45f38e7..fc27798 100644 --- a/scripts/mysql/my_create.sql +++ b/scripts/mysql/my_create.sql @@ -204,31 +204,31 @@ CREATE TABLE phonebook ( ); CREATE TABLE gw ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + lcr_id SMALLINT UNSIGNED NOT NULL DEFAULT 1, gw_name VARCHAR(128) NOT NULL, - ip_addr INT UNSIGNED NOT NULL, + grp_id INT UNSIGNED NOT NULL, + ip_addr VARCHAR(15) NOT NULL, + hostname VARCHAR(64), port SMALLINT UNSIGNED, uri_scheme TINYINT UNSIGNED, - transport SMALLINT UNSIGNED, - prefix VARCHAR(16) NOT NULL, - grp_id INT NOT NULL, - UNIQUE KEY gw_idx1 (gw_name), - KEY gw_idx2 (grp_id) -); - -CREATE TABLE gw_grp ( - grp_id INT AUTO_INCREMENT NOT NULL, - grp_name VARCHAR(64) NOT NULL, - UNIQUE KEY gwgrp_idx (grp_id) + transport TINYINT UNSIGNED, + strip TINYINT UNSIGNED, + tag VARCHAR(16) DEFAULT NULL, + weight INT UNSIGNED, + flags INT UNSIGNED DEFAULT 0 NOT NULL, + defunct INT UNSIGNED DEFAULT NULL, + CONSTRAINT lcr_id_gw_name_idx UNIQUE (lcr_id, gw_name) ); CREATE TABLE lcr ( - prefix VARCHAR(16) NOT NULL, - from_uri VARCHAR(255) NOT NULL DEFAULT '%', - grp_id INT, - priority INT, - KEY lcr_idx1 (prefix), - KEY lcr_idx2 (from_uri), - KEY lcr_idx3 (grp_id) + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + lcr_id SMALLINT UNSIGNED NOT NULL DEFAULT 1, + prefix VARCHAR(16) DEFAULT NULL, + from_uri VARCHAR(64) DEFAULT NULL, + grp_id INT UNSIGNED NOT NULL, + priority TINYINT UNSIGNED NOT NULL, + INDEX lcr_id_idx (lcr_id) ); CREATE TABLE grp (

1 0

git:master: modules/lcr: added 'defunct' column to 'gw' table
by Juha Heinanen 05 Jul '09

05 Jul '09

Module: sip-router Branch: master Commit: cd18b51a0676abcd0732acb25495b322bb76df40 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd18b51… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Jul 5 10:52:47 2009 +0300 modules/lcr: added 'defunct' column to 'gw' table - Added 'defunct' column to 'gw' table that can be used to defunct a gateway until the given time. --- modules/lcr/README | 232 ++++++++++++++++++++++------------------- modules/lcr/doc/lcr_admin.xml | 27 +++++- modules/lcr/lcr_mod.c | 47 ++++++--- 3 files changed, 181 insertions(+), 125 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cd1…

1 0

xmlrpc module requires s sl module
by jh＠tutpro.com 04 Jul '09

04 Jul '09

i tried to play with s xmlrpc module, but got this erroe message on startup: Jul 4 15:33:33 localhost /usr/sbin/sip-router[8664]: ERROR: xmlrpc [xmlrpc.c:1989]: This module requires sl module i do have k sl module loaded, because i use function send_reply that does not exist in s version of the module. also, i use stats provided dby k sl module. is it possible to change xmlrpc module so that it accepts either s or k version of sl module? -- juha

2 5

← Newer
1
...
21
22
23
24
25
26
27
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2009