sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

git:master: * Database query result was not freed when there was error in getting

by Juha Heinanen

Module: sip-router Branch: master Commit: d777926f7abf3e1b723030d6371e46ea394c3dba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d777926… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Jun 6 13:02:42 2009 +0300 * Database query result was not freed when there was error in getting extra_hdrs pv value. --- modules_k/msilo/msilo.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index e5f0e9b..23f9cb7 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -1033,6 +1033,8 @@ static int m_dump(struct sip_msg* msg, char* owner, char* str2) if (ms_extra_hdrs != NULL) { if (fixup_get_svalue(msg, (gparam_p)*ms_extra_hdrs_sp, &extra_hdrs_str) != 0) { + if (msilo_dbf.free_result(db_con, db_res) < 0) + LM_ERR("failed to free the query result\n"); LM_ERR("unable to get extra_hdrs value\n"); goto error; }

14 years, 11 months

different mysql errors

by jh＠tutpro.com

i tried again to start twinkle and this time got: Jun 4 09:15:12 localhost /usr/sbin/sip-router[7304]: INFO: xlog [xlog.c:186]: INFO: REGISTER <sip:test@test.fi> by <test(a)test.fi> from <192.98.101.10> is authorized Jun 4 09:15:12 localhost /usr/sbin/sip-router[7269]: ERROR: db_mysql [km_dbase.c:117]: driver error on query: Commands out of sync; you can't run this command now Jun 4 09:15:12 localhost /usr/sbin/sip-router[7269]: ERROR: <core> [db_query.c:101]: error while submitting query by the way, how to get rid of "xlog [xlog.c:186]:" in xlog INFO output? -- juha

14 years, 11 months

importing kamailio tools

by Daniel-Constantin Mierla

Hello, kamailio tools (kamctl and kamdbctl) have not been imported yet. The usual place for them was 'scripts' folder but now there are overlapping names, related to the folders holding sql scripts. Shall we create a subfolder in scripts directory, e.g., scripts/kamctl? The xml definition of db tables were in db directory, which now is library srdb1(same for ser, are now in srdb2). Do we let them there or is another more suitable place for them as they are not dependent of DB api but of what DB structure to be used (some modules using db were moved in common folder already)? Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

14 years, 11 months

git:master: core: regex fixup fix for k modules

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 15d47d5cb04ef51d5050b7235b8a187bcd606d04 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15d47d5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jun 5 15:19:59 2009 +0200 core: regex fixup fix for k modules k modules that use the core regex fixup functions expect a pointer to a regex, but got instead a double pointer to a regex. --- sr_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sr_module.c b/sr_module.c index fc7671e..3641df3 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1083,7 +1083,7 @@ int fix_param(int type, void** param) ERR("Bad regular expression '%s'\n", (char*)*param); goto error; } - p->fixed = &p->v; + p->fixed = p->v.regex; break; case FPARAM_AVP: name.s = (char*)*param;

14 years, 11 months

[ openser-Bugs-2791122 ] fr_inv_timer_avp on amd64

by SourceForge.net

Bugs item #2791122, was opened at 2009-05-13 13:07 Message generated for change (Comment added) made by effeks You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2791122&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: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Tobias Lindgren (effeks) Assigned to: Nobody/Anonymous (nobody) Summary: fr_inv_timer_avp on amd64 Initial Comment: Hi! When we compile kamailio 1.5.1 trunk on Debian Linux amd64 the fr_inv_time_avp timer cannot altered (the value of the AVP-variable has no effect on the timer) and seem stuck on something like 15 seconds. Compiling the same code in a 32bit chroot works fine, aswell as on any other standard 32bit system, where the timer is set to the value of the AVP as expected. /effeks ---------------------------------------------------------------------- >Comment By: Tobias Lindgren (effeks) Date: 2009-06-05 13:23 Message: Any news? ---------------------------------------------------------------------- Comment By: Tobias Lindgren (effeks) Date: 2009-05-25 13:50 Message: The avp-value was a string, but changing it into an integer makes no difference. On 32bit it works regardless of int or str. ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-05-25 11:49 Message: Did you check my last message? Is the timer avp integer or string value? ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-05-25 11:47 Message: Any progress on this? ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-05-22 19:12 Message: Just saw in your last comment that you assign a string to the avp: $avp(i:10) = "25"; Should be: $avp(i:10) = 25; Can you doublecheck? ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-05-19 09:25 Message: OK, i am going to check the log. thanks. ---------------------------------------------------------------------- Comment By: Tobias Lindgren (effeks) Date: 2009-05-15 13:23 Message: Done, the config snippet looks something like this: modparam("tm", "fr_inv_timer_avp", "$avp(i:10)") $avp(i:10) = "25"; t_relay(); ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-05-15 12:07 Message: Can you run with debug=5 and attach the syslog output here? ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2791122&group_…

14 years, 11 months

invalid fr_timer AVP spec

by jh＠tutpro.com

after i got rid of syntax errors (except while(1) warning), i'm getting this when sr tries to start: Jun 1 18:38:38 localhost /usr/sbin/sip-router[9209]: : tm [t_funcs.c:388]: ERROR:tm:init_avp_params: invalid fr_timer AVP specs "$avp(i:705)" Jun 1 18:38:38 localhost /usr/sbin/sip-router[9209]: ERROR: tm [tm.c:772]: ERROR:tm:mod_init: failed to process AVP params it comes from line modparam("tm", "fr_timer_avp", "$avp(i:705)") i tried also "$avp(705)". the above used to work in k. how to make it work in sr? strange thing is that the previous line modparam("tm", "fr_inv_timer_avp", "$avp(i:704)") is accepted. -- juha

14 years, 11 months

git:master: tm: Document fr_timer_avp and fr_inv_timer_avp

by Jan Janak

Module: sip-router Branch: master Commit: 903503806eed8cbcc0ad0ade24446c876e2733a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9035038… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Jun 4 15:19:17 2009 +0200 tm: Document fr_timer_avp and fr_inv_timer_avp This patch adds docbook documentation for fr_timer_avp and fr_inv_timer_avp parameters of tm module and updates the module README. --- modules/tm/README | 190 +++++++++++++++++---------------------------- modules/tm/doc/params.xml | 58 ++++++++++++++ 2 files changed, 128 insertions(+), 120 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=903…

14 years, 11 months

git:master: Merge branch 'master' into script_callbacks

by Miklos Tirpak

Module: sip-router Branch: master Commit: 4b7ad0ea5dcc7c6621fd28b812fd27de5b523fde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b7ad0e… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Jun 4 09:35:00 2009 +0200 Merge branch 'master' into script_callbacks * master: route_type: branch and onsend route bugs corrected * Commented out warning about deprecated avp name syntax. I suggest to sl(k) - use load_tm_api() * modules_k/textops core: added km_parse_avp_spec() pv: parse K-style AVP aliases docbook: Generate TOC for root-level section elements make: required version is now 3.81 test: gcc version test scripts tm: doc - added note about tmx module pua: use load_tm_api() instead of find_export()/load_tm() kex: added K pv_printf() function kex: added K dst uri related functions makefile: fix last commit * modules_k/acc: included Makefile.radius makefile: gcc version detection fix Conflicts: onsend.h ---

14 years, 11 months

git:master: Merge branch 'master' of ssh://tirpi@git.sip-router.org/ sip-router

by Miklos Tirpak

Module: sip-router Branch: master Commit: ec78863207a3ecc3a081f43264fd041d88181663 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec78863… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Jun 4 09:46:59 2009 +0200 Merge branch 'master' of ssh://tirpi@git.sip-router.org/sip-router * 'master' of ssh://tirpi@git.sip-router.org/sip-router: core: added modulo operation * Improved presence database handling. * Introduced new function xcap_auth_status that is a standalone version pv: added new PV: $bs core: set 'fixed' shortcut to the value for fixup_uint... core: added shortcut to fixed value in fparam_t ---

14 years, 11 months

git:master: core: added modulo operation

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 333a3335217ece2e3d2f8089d854ba347f36b9af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=333a333… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 4 09:59:59 2009 +0300 core: added modulo operation - a mod b - return the modulo result --- cfg.lex | 2 ++ cfg.y | 5 ++++- rvalue.c | 33 +++++++++++++++++++++++++++++++++ rvalue.h | 1 + 4 files changed, 40 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index ab30135..ef89626 100644 --- a/cfg.lex +++ b/cfg.lex @@ -246,6 +246,7 @@ LOG_OR "or"|"||" BIN_OR "|" PLUS "+" MINUS "-" +MODULO "mod" STRLEN "strlen" STREMPTY "strempty" DEFINED "defined" @@ -780,6 +781,7 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{BIN_OR} { count(); return BIN_OR; } <INITIAL>{PLUS} { count(); return PLUS; } <INITIAL>{MINUS} { count(); return MINUS; } +<INITIAL>{MODULO} { count(); return MODULO; } <INITIAL>{STRLEN} { count(); return STRLEN; } <INITIAL>{STREMPTY} { count(); return STREMPTY; } <INITIAL>{DEFINED} { count(); return DEFINED; } diff --git a/cfg.y b/cfg.y index 4729d03..ade8aaa 100644 --- a/cfg.y +++ b/cfg.y @@ -492,7 +492,7 @@ static int case_check_default(struct case_stms* stms); %left EQUAL_T DIFF MATCH INTEQ INTDIFF STREQ STRDIFF %left GT LT GTE LTE %left PLUS MINUS -%left STAR SLASH +%left STAR SLASH MODULO %right NOT %right DEFINED %right INTCAST STRCAST @@ -2315,6 +2315,7 @@ rve_op: PLUS { $$=RVE_PLUS_OP; } | MINUS { $$=RVE_MINUS_OP; } | STAR { $$=RVE_MUL_OP; } | SLASH { $$=RVE_DIV_OP; } + | MODULO { $$=RVE_MOD_OP; } ; */ @@ -2331,6 +2332,7 @@ rval_expr: rval { $$=$1; | rval_expr MINUS rval_expr {$$=mk_rve2(RVE_MINUS_OP, $1, $3); } | rval_expr STAR rval_expr {$$=mk_rve2(RVE_MUL_OP, $1, $3); } | rval_expr SLASH rval_expr {$$=mk_rve2(RVE_DIV_OP, $1, $3); } + | rval_expr MODULO rval_expr {$$=mk_rve2(RVE_MOD_OP, $1, $3); } | rval_expr BIN_OR rval_expr {$$=mk_rve2(RVE_BOR_OP, $1, $3); } | rval_expr BIN_AND rval_expr {$$=mk_rve2(RVE_BAND_OP, $1, $3);} | rval_expr rve_cmpop %prec GT rval_expr { $$=mk_rve2( $2, $1, $3);} @@ -2349,6 +2351,7 @@ rval_expr: rval { $$=$1; | rval_expr MINUS error { $$=0; yyerror("bad expression"); } | rval_expr STAR error { $$=0; yyerror("bad expression"); } | rval_expr SLASH error { $$=0; yyerror("bad expression"); } + | rval_expr MODULO error { $$=0; yyerror("bad expression"); } | rval_expr BIN_OR error { $$=0; yyerror("bad expression"); } | rval_expr BIN_AND error { $$=0; yyerror("bad expression"); } | rval_expr rve_cmpop %prec GT error diff --git a/rvalue.c b/rvalue.c index 5bc7ca8..27ab268 100644 --- a/rvalue.c +++ b/rvalue.c @@ -462,6 +462,7 @@ enum rval_type rve_guess_type( struct rval_expr* rve) case RVE_MINUS_OP: case RVE_MUL_OP: case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_BOR_OP: case RVE_BAND_OP: case RVE_LAND_OP: @@ -531,6 +532,7 @@ int rve_is_constant(struct rval_expr* rve) case RVE_MINUS_OP: case RVE_MUL_OP: case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_BOR_OP: case RVE_BAND_OP: case RVE_LAND_OP: @@ -590,6 +592,7 @@ static int rve_op_unary(enum rval_expr_op op) case RVE_MINUS_OP: case RVE_MUL_OP: case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_BOR_OP: case RVE_BAND_OP: case RVE_LAND_OP: @@ -659,6 +662,7 @@ int rve_check_type(enum rval_type* type, struct rval_expr* rve, case RVE_MINUS_OP: case RVE_MUL_OP: case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_BOR_OP: case RVE_BAND_OP: case RVE_LAND_OP: @@ -1233,6 +1237,13 @@ inline static int int_intop2(int* res, enum rval_expr_op op, int v1, int v2) } *res=v1/v2; break; + case RVE_MOD_OP: + if (unlikely(v2==0)){ + ERR("rv mod by 0\n"); + return -1; + } + *res=v1%v2; + break; case RVE_BOR_OP: *res=v1|v2; break; @@ -1746,6 +1757,7 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, break; case RVE_MUL_OP: case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_MINUS_OP: case RVE_PLUS_OP: case RVE_IPLUS_OP: @@ -2018,6 +2030,7 @@ int rval_expr_eval_rvint( struct run_act_ctx* h, case RVE_MINUS_OP: case RVE_MUL_OP: case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_BOR_OP: case RVE_BAND_OP: case RVE_LAND_OP: @@ -2123,6 +2136,7 @@ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, case RVE_MINUS_OP: case RVE_MUL_OP: case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_BOR_OP: case RVE_BAND_OP: case RVE_LAND_OP: @@ -2389,6 +2403,7 @@ struct rval_expr* mk_rval_expr2(enum rval_expr_op op, struct rval_expr* rve1, switch(op){ case RVE_MUL_OP: case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_MINUS_OP: case RVE_BOR_OP: case RVE_BAND_OP: @@ -2443,6 +2458,7 @@ static int rve_op_is_assoc(enum rval_expr_op op) /* one operand expression => cannot be assoc. */ return 0; case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_MINUS_OP: return 0; case RVE_PLUS_OP: @@ -2493,6 +2509,7 @@ static int rve_op_is_commutative(enum rval_expr_op op) /* one operand expression => cannot be commut. */ return 0; case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_MINUS_OP: return 0; case RVE_PLUS_OP: @@ -2888,6 +2905,21 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) } } break; + case RVE_MOD_OP: + if (i==0){ + if (ct_rve==rve->left.rve){ + /* 0 % $v -> 0 */ + if (rve_replace_with_ct_rv(rve, rv)<0) + goto error; + ret=1; + }else{ + /* $v % 0 */ + ERR("RVE modulo by 0 at %d,%d\n", + ct_rve->fpos.s_line, ct_rve->fpos.s_col); + } + } + /* $v % 1 -> 0 ? */ + break; case RVE_MINUS_OP: if (i==0){ if (ct_rve==rve->right.rve){ @@ -3513,6 +3545,7 @@ int fix_rval_expr(void** p) break; case RVE_MUL_OP: case RVE_DIV_OP: + case RVE_MOD_OP: case RVE_MINUS_OP: case RVE_BOR_OP: case RVE_BAND_OP: diff --git a/rvalue.h b/rvalue.h index 652c902..f658c5e 100644 --- a/rvalue.h +++ b/rvalue.h @@ -53,6 +53,7 @@ enum rval_expr_op{ RVE_LNOT_OP, /* one member evaluate as bool. : (!val)*/ RVE_MUL_OP, /* 2 members, returns left * right */ RVE_DIV_OP, /* 2 members, returns left / right */ + RVE_MOD_OP, /* 2 members, returns left % right */ RVE_MINUS_OP, /* 2 members, returns left - right */ RVE_BAND_OP, /* 2 members, returns left | right */ RVE_BOR_OP, /* 2 members, returns left & right */

14 years, 11 months

← Newer
1
...
20
21
22
23
24
25
26
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009