sr-dev October 2012

sr-dev@lists.kamailio.org

31 participants
241 discussions

git:master: pv: two new functions- typeof(...) and not_empty(...)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 007ca3c30b02e7a57cd229ea4b63573ef81f8c81 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=007ca3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Oct 6 09:52:37 2012 +0200 pv: two new functions- typeof(...) and not_empty(...) - typeof(pvar, vtype) - test the type of the pseudo-variable - not_empty(pvar) - test if the type is string and the value not empty --- modules_k/pv/README | 67 +++++++++++++++++++++++++++++++--------- modules_k/pv/doc/pv_admin.xml | 47 ++++++++++++++++++++++++++++- modules_k/pv/pv.c | 67 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 16 deletions(-) diff --git a/modules_k/pv/README b/modules_k/pv/README index a43da99..cbcb584 100644 --- a/modules_k/pv/README +++ b/modules_k/pv/README @@ -11,9 +11,9 @@ Daniel-Constantin Mierla <daniel(a)asipto.com> - Copyright © 2008-2011 Daniel-Constantin Mierla (asipto.com) + Copyright � 2008-2011 Daniel-Constantin Mierla (asipto.com) - Copyright © 2011 Juha Heinanen + Copyright � 2011 Juha Heinanen __________________________________________________________________ Table of Contents @@ -37,6 +37,8 @@ Daniel-Constantin Mierla 4.1. pv_isset(pvar) 4.2. pv_unset(pvar) 4.3. is_int(pvar) + 4.4. typeof(pvar, vtype) + 4.5. not_empty(pvar) 5. MI Commands @@ -51,8 +53,10 @@ Daniel-Constantin Mierla 1.4. pv_isset usage 1.5. pv_unset usage 1.6. is_int() usage - 1.7. shv_set usage - 1.8. shv_get usage + 1.7. typeof() usage + 1.8. not_empty() usage + 1.9. shv_set usage + 1.10. shv_get usage Chapter 1. Admin Guide @@ -75,6 +79,8 @@ Chapter 1. Admin Guide 4.1. pv_isset(pvar) 4.2. pv_unset(pvar) 4.3. is_int(pvar) + 4.4. typeof(pvar, vtype) + 4.5. not_empty(pvar) 5. MI Commands @@ -118,11 +124,11 @@ Chapter 1. Admin Guide _value_ * _name_: shared variable name * _type_: type of the value - + “i”: integer value - + “s”: string value + + "i": integer value + + "s": string value * _value_: value to be set - Default value is “NULL”. + Default value is "NULL". Example 1.1. shvset parameter usage ... @@ -139,11 +145,11 @@ modparam("pv", "shvset", "pstngw=s:sip:10.10.10.10") _value_ * _name_: shared variable name * _type_: type of the value - + “i”: integer value - + “s”: string value + + "i": integer value + + "s": string value * _value_: value to be set - Default value is “NULL”. + Default value is "NULL". Example 1.2. varset parameter usage ... @@ -167,6 +173,8 @@ modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") 4.1. pv_isset(pvar) 4.2. pv_unset(pvar) 4.3. is_int(pvar) + 4.4. typeof(pvar, vtype) + 4.5. not_empty(pvar) 4.1. pv_isset(pvar) @@ -199,7 +207,7 @@ if(pv_isset("$avp("s:x")")) pv_unset("$avp("s:x")"); ... -4.3. is_int(pvar) +4.3. is_int(pvar) Function checks if pvar argument contains integer value and returns 1 if it does and -1 otherwise. @@ -213,6 +221,35 @@ if (is_int("$var(foo)")) { } ... +4.4. typeof(pvar, vtype) + + Returns true if the type of pseudo-variable matches the second + parameter. The second parameter can be: 'int' - type is integer; 'str' + - type is string; 'null' - type is null. + + Function can be used from ANYROUTE. + + Example 1.7. typeof() usage +... +if (trypeof("$var(foo)", "str")) { + xdbg("variable foo is a string\n"); +} +... + +4.5. not_empty(pvar) + + Returns true if the pseudo-variables has the type string and is not + empty value. + + Function can be used from all kinds of routes. + + Example 1.8. not_empty() usage +... +if (not_empty("$var(foo)")) { + append_hf("X-Foo: $var(foo)\r\n"); +} +... + 5. MI Commands 5.1. shv_set @@ -225,8 +262,8 @@ if (is_int("$var(foo)")) { Parameters: * _name_: shared variable name * _type_: type of the value - + “int”: integer value - + “str”: string value + + "int": integer value + + "str": string value * _value_: value to be set MI FIFO Command Format: @@ -236,7 +273,7 @@ if (is_int("$var(foo)")) { _value_ _empty_line_ - Example 1.7. shv_set usage + Example 1.9. shv_set usage ... $ kamctl fifo shv_set debug int 0 ... @@ -254,7 +291,7 @@ $ kamctl fifo shv_set debug int 0 _name_ _empty_line_ - Example 1.8. shv_get usage + Example 1.10. shv_get usage ... $ kamctl fifo shv_get debug $ kamctl fifo shv_get diff --git a/modules_k/pv/doc/pv_admin.xml b/modules_k/pv/doc/pv_admin.xml index d826703..51f6c40 100644 --- a/modules_k/pv/doc/pv_admin.xml +++ b/modules_k/pv/doc/pv_admin.xml @@ -206,7 +206,7 @@ pv_unset("$avp("s:x")"); <para> Function checks if pvar argument contains integer value and returns 1 if it does and -1 otherwise. - </para> + </para> <para> Function can be used from all kinds of routes. </para> @@ -221,6 +221,51 @@ if (is_int("$var(foo)")) { </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">typeof(pvar, vtype)</function> + </title> + <para> + Returns true if the type of pseudo-variable matches the second + parameter. The second parameter can be: 'int' - type is integer; + 'str' - type is string; 'null' - type is null. + </para> + <para> + Function can be used from ANYROUTE. + </para> + <example> + <title><function>typeof()</function> usage</title> + <programlisting format="linespecific"> +... +if (trypeof("$var(foo)", "str")) { + xdbg("variable foo is a string\n"); +} +... + </programlisting> + </example> + </section> + <section> + <title> + <function moreinfo="none">not_empty(pvar)</function> + </title> + <para> + Returns true if the pseudo-variables has the type string and + is not empty value. + </para> + <para> + Function can be used from all kinds of routes. + </para> + <example> + <title><function>not_empty()</function> usage</title> + <programlisting format="linespecific"> +... +if (not_empty("$var(foo)")) { + append_hf("X-Foo: $var(foo)\r\n"); +} +... + </programlisting> + </example> + </section> </section> <section> diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 6bd0feb..41fcfa6 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -437,6 +437,8 @@ static void mod_destroy(void); static int pv_isset(struct sip_msg* msg, char* pvid, char *foo); static int pv_unset(struct sip_msg* msg, char* pvid, char *foo); static int is_int(struct sip_msg* msg, char* pvar, char* s2); +static int pv_typeof(sip_msg_t *msg, char *pv, char *t); +static int pv_not_empty(sip_msg_t *msg, char *pv, char *s2); static cmd_export_t cmds[]={ {"pv_isset", (cmd_function)pv_isset, 1, fixup_pvar_null, 0, @@ -449,6 +451,12 @@ static cmd_export_t cmds[]={ #endif {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, + {"typeof", (cmd_function)pv_typeof, 2, fixup_pvar_none, + fixup_free_pvar_none, + ANY_ROUTE}, + {"not_empty", (cmd_function)pv_not_empty, 1, fixup_pvar_null, + fixup_free_pvar_null, + ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -536,6 +544,65 @@ static int add_avp_aliases(modparam_t type, void* val) } /** + * match the type of the variable value + */ +static int pv_typeof(sip_msg_t *msg, char *pv, char *t) +{ + pv_value_t val; + + if (pv==NULL || t==NULL) + return -1; + if(pv_get_spec_value(msg, (pv_spec_t*)pv, &val) != 0) + return -1; + + switch(t[0]) { + case 'i': + case 'I': + if(val.flags & PV_TYPE_INT) + return 1; + return -1; + case 'n': + case 'N': + if(val.flags & PV_VAL_NULL) + return 1; + return -1; + case 's': + case 'S': + if(!(val.flags & PV_VAL_STR)) + return -1; + if(val.flags & PV_TYPE_INT) + return -1; + return 1; + default: + return -1; + } +} + +/** + * return true if the type is string and value not empty + */ +static int pv_not_empty(sip_msg_t *msg, char *pv, char *s2) +{ + pv_value_t val; + + if (pv==NULL) + return -1; + + if(pv_get_spec_value(msg, (pv_spec_t*)pv, &val) != 0) + return -1; + + if(!(val.flags & PV_VAL_STR)) + return -1; + if(val.flags & PV_TYPE_INT) + return -1; + + if(val.rs.len>0) + return 1; + + return -1; +} + +/** * Copyright (C) 2011 Juha Heinanen * * Checks if pvar argument contains int value

11 years, 7 months

git:master: core: added mod fix helper fixup_pvar_none(...)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 780decb3b0f8cf140ffdf522abc61e68388ee6a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=780decb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Oct 6 09:38:57 2012 +0200 core: added mod fix helper fixup_pvar_none(...) - first parameter is PV and the rest are not fixed up --- mod_fix.c | 17 +++++++++++++++++ mod_fix.h | 3 +++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index 9064442..dc04d2f 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -342,6 +342,23 @@ int fixup_free_pvar_null(void** param, int param_no) return fixup_free_pvar_all(param, param_no); } +int fixup_pvar_none(void** param, int param_no) +{ + if (param_no == 1) + return fixup_pvar_all(param, param_no); + return 0; +} + + + +int fixup_free_pvar_none(void** param, int param_no) +{ + if (param_no == 1) + return fixup_free_pvar_all(param, param_no); + return 0; +} + + /* must be written "by hand", see above (fixup_pvar_pvar). FIXUP_F2T(pvar_str, 1, 2, 1, FPARAM_PVS, FPARAM_STR) FIXUP_F2T(pvar_str_str, 1, 3, 1, FPARAM_PVS, FPARAM_STR) diff --git a/mod_fix.h b/mod_fix.h index 9c5863e..c7740d0 100644 --- a/mod_fix.h +++ b/mod_fix.h @@ -96,6 +96,9 @@ int fixup_regexpNL_none(void** param, int param_no); int fixup_pvar_null(void **param, int param_no); int fixup_free_pvar_null(void** param, int param_no); +int fixup_pvar_none(void** param, int param_no); +int fixup_free_pvar_none(void** param, int param_no); + int fixup_pvar_pvar(void **param, int param_no); int fixup_free_pvar_pvar(void** param, int param_no);

11 years, 7 months

git:master: pkg/gentoo: version bump, added ebuild for v3.3.1

by Claudio Furrer

Module: sip-router Branch: master Commit: 83e31eaadd549132103899a201cdf100ab669b6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83e31ea… Author: Claudio Furrer <elcaio(a)gmail.com> Committer: Claudio Furrer <elcaio(a)gmail.com> Date: Fri Oct 5 03:32:16 2012 -0300 pkg/gentoo: version bump, added ebuild for v3.3.1 --- pkg/ser/gentoo/ChangeLog | 16 ++ pkg/ser/gentoo/Manifest | 28 +- pkg/ser/gentoo/sip-router-3.1.3.ebuild | 250 -------------------- pkg/ser/gentoo/sip-router-3.1.4.ebuild | 250 -------------------- ...router-3.1.2.ebuild => sip-router-3.1.6.ebuild} | 5 +- ...router-3.2.2.ebuild => sip-router-3.2.4.ebuild} | 4 +- ...router-3.2.1.ebuild => sip-router-3.3.1.ebuild} | 24 +- 7 files changed, 49 insertions(+), 528 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=83e…

11 years, 7 months

git:3.3: tcp: fix _wbufq_insert bug

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 8732b63bf5371914ba0267a22f45aacefe062ad4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8732b63… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 1 11:55:16 2012 +0200 tcp: fix _wbufq_insert bug When _wbufq_insert was called on a connection that had already some data added to the write buffer (another process was faster and added some data before the process that created the connection had a chance to do it), a wrong size was used in a memmove. This could lead either to corrupted messages or even crashes (if the messages were big enough to cause a buffer overflow). Many thanks to Jijo for debugging it. Reported-by: Jijo (cherry picked from commit 745e30c92336bfc3f8682b2c23e02862db688d9e) --- tcp_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index d629647..cc78878 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -808,7 +808,7 @@ inline static int _wbufq_insert(struct tcp_connection* c, const char* data, } if ((q->first==q->last) && ((q->last->b_size-q->last_used)>=size)){ /* one block with enough space in it for size bytes */ - memmove(q->first->buf+size, q->first->buf, size); + memmove(q->first->buf+size, q->first->buf, q->last_used); memcpy(q->first->buf, data, size); q->last_used+=size; }else{

11 years, 7 months

git:3.3: nathelper(k): nicer handling of no sdp in sdp_1918(...)

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 7881d44ce92c953e77305545b8773d3e056ea80e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7881d44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 5 14:34:13 2012 +0200 nathelper(k): nicer handling of no sdp in sdp_1918(...) - don't print error message if there is no sdp body (cherry picked from commit 019bcdc56533e7ccd0e1cc7d45b1d2d8ebc868ae) --- modules_k/nathelper/nathelper.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index a7f20a4..7195054 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1191,12 +1191,15 @@ sdp_1918(struct sip_msg* msg) { str *ip; int pf; + int ret; int sdp_session_num, sdp_stream_num; sdp_session_cell_t* sdp_session; sdp_stream_cell_t* sdp_stream; - if(0 != parse_sdp(msg)) { - LM_ERR("Unable to parse sdp\n"); + ret = parse_sdp(msg); + if(ret != 0) { + if(ret < 0) + LM_ERR("Unable to parse sdp\n"); return 0; }

11 years, 7 months

git:master: nathelper(k): nicer handling of no sdp in sdp_1918(...)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 019bcdc56533e7ccd0e1cc7d45b1d2d8ebc868ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=019bcdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 5 14:34:13 2012 +0200 nathelper(k): nicer handling of no sdp in sdp_1918(...) - don't print error message if there is no sdp body --- modules_k/nathelper/nathelper.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 8ff80fe..c0ab7e8 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1375,12 +1375,15 @@ sdp_1918(struct sip_msg* msg) { str *ip; int pf; + int ret; int sdp_session_num, sdp_stream_num; sdp_session_cell_t* sdp_session; sdp_stream_cell_t* sdp_stream; - if(0 != parse_sdp(msg)) { - LM_ERR("Unable to parse sdp\n"); + ret = parse_sdp(msg); + if(ret != 0) { + if(ret < 0) + LM_ERR("Unable to parse sdp\n"); return 0; }

11 years, 7 months

git:claudiofurrer/gentoo: pkg/gentoo: version bump, added ebuild for v3.3.1

by Claudio Furrer

Module: sip-router Branch: claudiofurrer/gentoo Commit: eef280c0709298bb9c79ab00c5d2ca1fe1a9461e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eef280c… Author: Claudio Furrer <elcaio(a)gmail.com> Committer: Claudio Furrer <elcaio(a)gmail.com> Date: Fri Oct 5 03:32:16 2012 -0300 pkg/gentoo: version bump, added ebuild for v3.3.1 --- pkg/ser/gentoo/ChangeLog | 16 ++ pkg/ser/gentoo/Manifest | 28 +- pkg/ser/gentoo/sip-router-3.1.3.ebuild | 250 -------------------- pkg/ser/gentoo/sip-router-3.1.4.ebuild | 250 -------------------- ...router-3.1.2.ebuild => sip-router-3.1.6.ebuild} | 5 +- ...router-3.2.2.ebuild => sip-router-3.2.4.ebuild} | 4 +- ...router-3.2.1.ebuild => sip-router-3.3.1.ebuild} | 24 +- 7 files changed, 49 insertions(+), 528 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=eef…

11 years, 7 months

git:pd/outbound: pkg/kamailio/fedora/16: Fixed typos in .spec

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 7b31e989487c3c728fcbf8daf73feb228f807706 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b31e98… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Oct 4 14:38:47 2012 +0100 pkg/kamailio/fedora/16: Fixed typos in .spec --- pkg/kamailio/fedora/16/kamailio.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 596123a..75c0bf4 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -943,8 +943,8 @@ fi %files outbound %defattr(-,root,root) -%doc %{_docdir}/kamailio/modules/README.outbound -%{_libdir}/kamailio/modules/outbound.so +%doc %{_docdir}/kamailio/modules_k/README.outbound +%{_libdir}/kamailio/modules_k/outbound.so %if 0%{?fedora}

11 years, 7 months

git:master: auth: new function pv_auth_check(...)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8de2a607b99b51d4f4030518ebd08613f187e953 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8de2a60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 3 20:25:52 2012 +0200 auth: new function pv_auth_check(...) - equivalent of auth_check(...) from auth_db, but taking the password from a PV -- combines pv_proxy_authenticate() and pv_www_authenticate() - new module parameter use_domain that controls whether the domain part of URIs should be used or not to make the identity checks upon authentication with pv_auth_check(...) --- modules/auth/README | 57 +++++++++++++--- modules/auth/api.h | 5 ++ modules/auth/auth_mod.c | 147 +++++++++++++++++++++++++++++++++++++++- modules/auth/doc/functions.xml | 37 ++++++++++ modules/auth/doc/params.xml | 18 +++++ 5 files changed, 253 insertions(+), 11 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8de…

11 years, 7 months

git:master: auth_db(k): moved the authorization checks flags to auth api

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 490df85a12a49f440ac6eb8b35be5f4c954b7b1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=490df85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 3 20:25:15 2012 +0200 auth_db(k): moved the authorization checks flags to auth api --- modules_k/auth_db/authorize.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules_k/auth_db/authorize.c b/modules_k/auth_db/authorize.c index 1252687..f79c70c 100644 --- a/modules_k/auth_db/authorize.c +++ b/modules_k/auth_db/authorize.c @@ -311,8 +311,6 @@ int www_authenticate(struct sip_msg* _m, char* _realm, char* _table) /* * Authenticate using WWW/Proxy-Authorize header field */ -#define AUTH_CHECK_ID_F 1<<0 - int auth_check(struct sip_msg* _m, char* _realm, char* _table, char *_flags) { str srealm;

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2012