sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

git:master: avpops: doc fixes
by Henning Westerholt 18 Oct '10

18 Oct '10

Module: sip-router Branch: master Commit: 741521e4dfc236934eb5f28454e49ab574f0a494 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=741521e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 18 17:53:06 2010 +0200 avpops: doc fixes - remove obselete TM reference, rephrase text a bit - reported from Andrew Pogrebennyk, andrew dot pogrebennyk at portaone dot com --- modules/avpops/README | 57 ++++++++++++++++------------------- modules/avpops/doc/avpops_admin.xml | 11 +----- 2 files changed, 28 insertions(+), 40 deletions(-) diff --git a/modules/avpops/README b/modules/avpops/README index 35a36cb..a12fd2b 100644 --- a/modules/avpops/README +++ b/modules/avpops/README @@ -10,7 +10,7 @@ Ramona-Elena Modroiu <ramona(a)rosdev.ro> - Copyright � 2004, 2005 voice-system.ro + Copyright © 2004, 2005 voice-system.ro Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -136,14 +136,9 @@ Chapter 1. Admin Guide an AVP. AVPs are persistent per SIP transaction, being available in "route", - "branch_route" and "failure_route". To make them available in - "onreply_route" armed via TM module, set "onreply_avp_mode" parameter - of TM module (note that in the default "onreply_route", the AVPs of the - transaction are not available). - - An up-to-date tutorial providing more information (detailed - explanations and commented examples) can be found on the SIP-router web - site. + "branch_route" and "failure_route". A tutorial providing more + information (detailed explanations and commented examples) can be found + on the SIP-router web site. 2. Dependencies @@ -246,7 +241,7 @@ modparam("avpops","use_domain",1) Name of column containing the uuid (unique user id). - Default value is "uuid". + Default value is “uuid”. Example 1.5. Set uuid_column parameter ... @@ -257,7 +252,7 @@ modparam("avpops","uuid_column","uuid") Name of column containing the username. - Default value is "username". + Default value is “username”. Example 1.6. Set username_column parameter ... @@ -268,7 +263,7 @@ modparam("avpops","username_column","username") Name of column containing the domain name. - Default value is "domain". + Default value is “domain”. Example 1.7. Set domain_column parameter ... @@ -279,7 +274,7 @@ modparam("avpops","domain_column","domain") Name of column containing the attribute name (AVP name). - Default value is "attribute". + Default value is “attribute”. Example 1.8. Set attribute_column parameter ... @@ -290,7 +285,7 @@ modparam("avpops","attribute_column","attribute") Name of column containing the AVP value. - Default value is "value". + Default value is “value”. Example 1.9. Set value_column parameter ... @@ -301,7 +296,7 @@ modparam("avpops","value_column","value") Name of integer column containing the AVP type. - Default value is "type". + Default value is “type”. Possible column values are * 0 - AVP with string name and string value @@ -329,7 +324,7 @@ modparam("avpops","type_column","type") + 'value_type='('integer'|'string') + 'table='string - Default value is "NULL". + Default value is “NULL”. Example 1.11. Set db_scheme parameter ... @@ -353,7 +348,7 @@ modparam("avpops","db_scheme", 5.12. is_avp_set(name) 5.13. avp_print() -5.1. avp_db_load(source,name) +5.1. avp_db_load(source,name) Loads from DB into memory the AVPs corresponding to the given source. If given, it sets the script flags for loaded AVPs. It returns true if @@ -391,7 +386,7 @@ avp_db_load("$uuid","$avp(s:404fwd)/fwd_table"); avp_db_load("$ru","$avp(i1:123)/$some_scheme"); ... -5.2. avp_db_store(source,name) +5.2. avp_db_store(source,name) Stores to DB the AVPs corresponding to the given source. @@ -407,7 +402,7 @@ avp_db_store("$tu","$avp(i:678)"); avp_db_store("$ru/username","$avp(email)"); ... -5.3. avp_db_delete(source,name) +5.3. avp_db_delete(source,name) Deletes from DB the AVPs corresponding to the given source. @@ -424,7 +419,7 @@ avp_db_delete("$ru/username","$avp(email)"); avp_db_delete("$uuid","$avp(s:404fwd)/fwd_table"); ... -5.4. avp_db_query(query[,dest]) +5.4. avp_db_query(query[,dest]) Make a database query and store the result in AVPs. @@ -438,8 +433,8 @@ avp_db_delete("$uuid","$avp(s:404fwd)/fwd_table"); used in the query makes you vulnerable to SQL injection, e.g. make it possible for an outside attacker to alter your database content. * dest - a list with AVP names where to store the result. The format - is "$avp(name1);$avp(name2);...". If this parameter is ommited, the - result is stored in "$avp(i:1);$avp(i:2);...". If the result gives + is “$avp(name1);$avp(name2);...”. If this parameter is ommited, the + result is stored in “$avp(i:1);$avp(i:2);...”. If the result gives many rows, then multiple AVPs with corresponding name will be added. The value type of the AVP (string or integer) will be derived from the type of the columns. Please note that only this @@ -462,7 +457,7 @@ avp_db_query("select password, ha1 from subscriber where username='$tu'", avp_db_query("delete from subscriber"); ... -5.5. avp_delete(name) +5.5. avp_delete(name) Deletes from memory the AVPs with name or, if empty, all AVPs. @@ -483,7 +478,7 @@ avp_delete("i"); avp_delete("a3"); ... -5.6. avp_pushto(destination,name) +5.6. avp_pushto(destination,name) Pushes the value of AVP(s) into the SIP message. @@ -513,7 +508,7 @@ avp_pushto("$du","$avp(i:679)"); avp_pushto("$br","$avp(i:680)"); ... -5.7. avp_check(name,op_value) +5.7. avp_check(name,op_value) Checks the value of the AVP(s) against an operator and value. @@ -555,7 +550,7 @@ avp_check("$avp(s:foo)","re/sip:.*@bar.net/g"); avp_check("$avp(s:foo)","fm/$avp(fm_avp)/g"); ... -5.8. avp_copy(old_name,new_name) +5.8. avp_copy(old_name,new_name) Copy / move an avp under a new name. @@ -576,7 +571,7 @@ avp_copy("$avp(i:678)", "$avp(s:345)/g"); avp_copy("$avp(old)","$avp(new)/gd"); ... -5.9. avp_printf(dest, format) +5.9. avp_printf(dest, format) NOTE: since Kamailio 1.3.0 the function has been moved to core and it is an alias to pv_printf(). @@ -600,7 +595,7 @@ avp_copy("$avp(old)","$avp(new)/gd"); avp_printf("$avp(i:20)", "This is a $rm request with call-id $hdr(call-id)"); ... -5.10. avp_subst(avps, subst) +5.10. avp_subst(avps, subst) Perl/sed-like subst applied to AVPs having string value. @@ -642,7 +637,7 @@ avp_subst("$avp(i:678)/$avp(i:679)/g", "/(.*)@(.*)/\1@$rd/"); after the first src_avp is processed, it will be added in avp list and next processing will use it. -5.11. avp_op(name,op_value) +5.11. avp_op(name,op_value) Different integer operations with avps. @@ -674,7 +669,7 @@ avp_op("$avp(i:678)", "add/i:345/g"); avp_op("$avp(number)","sub/$avp(number2)/d"); ... -5.12. is_avp_set(name) +5.12. is_avp_set(name) Check if any AVP with name is set. @@ -693,7 +688,7 @@ if(is_avp_set("$avp(i:678)")) log("AVP with integer id 678 exists\n"); ... -5.13. avp_print() +5.13. avp_print() Prints the list with all the AVPs from memory. This is only a helper/debug function. diff --git a/modules/avpops/doc/avpops_admin.xml b/modules/avpops/doc/avpops_admin.xml index e4cee52..9b60cc9 100644 --- a/modules/avpops/doc/avpops_admin.xml +++ b/modules/avpops/doc/avpops_admin.xml @@ -30,15 +30,8 @@ </para> <para> AVPs are persistent per SIP transaction, being available in "route", - "branch_route" and "failure_route". To make them available in - "onreply_route" armed via TM module, set "onreply_avp_mode" parameter - of TM module (note that in the default "onreply_route", the AVPs of - the transaction are not available). - </para> - <para> - An up-to-date tutorial providing more information (detailed - explanations and commented examples) can be found on the SIP-router - web site. + "branch_route" and "failure_route". A tutorial providing more information (detailed + explanations and commented examples) can be found on the SIP-router web site. </para> </section> <section>

1 0

changes on sr wiki page
by Juha Heinanen 17 Oct '10

17 Oct '10

i added Docbook documentation line for 3.1 branch on page http://sip-router.org/wiki/start#cookbooks i was not able to do the same regarding Cookbooks, where only master version seems to be available. perhaps 3.0 and 3.1 versions are somewhere, but i didn't find them. -- juha

1 0

[tracker] Task changed: warn about implicit type conversions
by sip-router 16 Oct '10

16 Oct '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#93 - warn about implicit type conversions User who did this: Juha Heinanen (jh) Task Type: Bug Report -> Improvement More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=93 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: warn about implicit type conversions
by sip-router 16 Oct '10

16 Oct '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - warn about implicit type conversions Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - add core parameter, such as "implicit_type_conversion_warnings", that, if set, causes a warning to be printed to syslog when implicit type conversion happens during script execution. useful for detecting config bugs. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=93 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Assignee added: warn about implicit type conversions
by sip-router 16 Oct '10

16 Oct '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#93 - warn about implicit type conversions User who did this - Juha Heinanen (jh) http://sip-router.org/tracker/index.php?do=details&task_id=93 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task closed: is_int() function
by sip-router 16 Oct '10

16 Oct '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#92 - is_int() function User who did this - Juha Heinanen (jh) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=92 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] User took ownership: is_int() function
by sip-router 16 Oct '10

16 Oct '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Juha Heinanen has taken ownership of the following task: FS#92 - is_int() function More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=92 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: modules/utils: added is_int() function
by Juha Heinanen 16 Oct '10

16 Oct '10

Module: sip-router Branch: master Commit: c437c250b34ad052ffd9fa289e1480bdc04f8585 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c437c25… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Oct 16 16:42:44 2010 +0300 modules/utils: added is_int() function - added is_int() function that checks if its pvar argument contains integer value. better place would be core, but that is out of my reach. --- modules/utils/README | 52 +++++++++++++++++++++++++------------ modules/utils/doc/utils_admin.xml | 22 +++++++++++++++ modules/utils/functions.c | 18 +++++++++++++ modules/utils/functions.h | 5 +++ modules/utils/utils.c | 2 + 5 files changed, 82 insertions(+), 17 deletions(-) diff --git a/modules/utils/README b/modules/utils/README index d818238..aaf7d35 100644 --- a/modules/utils/README +++ b/modules/utils/README @@ -4,7 +4,7 @@ Juha Heinanen TutPro Inc. - Copyright � 2008 Juha Heinanen + Copyright © 2008-2009 Juha Heinanen __________________________________________________________________ Table of Contents @@ -28,6 +28,7 @@ Juha Heinanen 4.1. http_query(url, result) 4.2. xcap_auth_status(watcher_uri, presentity_uri) + 4.3. is_int(pvar) 5. MI Commands @@ -46,10 +47,11 @@ Juha Heinanen 1.4. Set xcap_table parameter 1.5. http_query() usage 1.6. xcap_auth_status() usage - 1.7. forward_list usage - 1.8. forward_switch usage - 1.9. forward_filter usage - 1.10. forward_proxy usage + 1.7. is_int() usage + 1.8. forward_list usage + 1.9. forward_switch usage + 1.10. forward_filter usage + 1.11. forward_proxy usage Chapter 1. Admin Guide @@ -72,6 +74,7 @@ Chapter 1. Admin Guide 4.1. http_query(url, result) 4.2. xcap_auth_status(watcher_uri, presentity_uri) + 4.3. is_int(pvar) 5. MI Commands @@ -98,7 +101,7 @@ Chapter 1. Admin Guide deactivated. Function xcap_auth_status can be used to check from presence server - database, if watcher is authorized to subscribe event "presence" of + database, if watcher is authorized to subscribe event “presence” of presentity. 2. Dependencies @@ -109,7 +112,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules The following modules must be loaded before this module: - * None. + * a database module if xcap_auth_status function is enabled. 2.2. External Libraries or Applications @@ -128,7 +131,7 @@ Chapter 1. Admin Guide Defines in seconds how long Kamailio waits response from HTTP server. - Default value is "4". + Default value is null, i.e., xcap_auth_status function is disabled. Example 1.1. Set http_query_timeout parameter ... @@ -139,7 +142,7 @@ modparam("utils", "http_query_timeout", 2) Defines if the forwarding callback should be installed. - Default value is "0". + Default value is “0”. Example 1.2. Set forward_active parameter ... @@ -162,7 +165,7 @@ modparam("utils", "pres_db_url", "mysql://foo:secret@localhost/pres") Defines name of xcap table in presence server database. - Default value is "xcap". + Default value is “xcap”. Example 1.4. Set xcap_table parameter ... @@ -173,14 +176,15 @@ modparam("utils", "xcap_table", "pres_xcap") 4.1. http_query(url, result) 4.2. xcap_auth_status(watcher_uri, presentity_uri) + 4.3. is_int(pvar) 4.1. http_query(url, result) - Sends HTTP GET request according to URL given in "url" parameter, which + Sends HTTP GET request according to URL given in “url” parameter, which is a string that may contain pseudo variables. If HTTP server returns a class 2xx or 3xx reply, first line of reply's - body (if any) is stored in "result" parameter, which must be a writable + body (if any) is stored in “result” parameter, which must be a writable pseudo variable. Function returns reply code of HTTP reply or -1 if something went @@ -202,7 +206,7 @@ switch ($retcode) { 4.2. xcap_auth_status(watcher_uri, presentity_uri) Function checks from presence server database if watcher is authorized - to subscribe event "presence" of presentity. Sphere checking is not + to subscribe event “presence” of presentity. Sphere checking is not included. Both watcher_uri and presentity_uri are pseudo variables. Function @@ -225,6 +229,20 @@ if (method=="MESSAGE") { } ... +4.3. is_int(pvar) + + Function checks if pvar argument contains integer value and returns 1 + if it does and -1 otherwise. + + Function can be used from all kinds of routes. + + Example 1.7. is_int() usage +... +if (is_int("$var(foo)")) { + xlog("L_INFO", "variable foo contains integer value\n"); +} +... + 5. MI Commands 5.1. forward_list @@ -238,7 +256,7 @@ if (method=="MESSAGE") { No parameters. - Example 1.7. forward_list usage + Example 1.8. forward_list usage ... kamctl fifo forward_list id switch filter proxy @@ -251,7 +269,7 @@ id switch filter proxy The syntax of this configuration string is described in 1.6. (switch_setting_list). - Example 1.8. forward_switch usage + Example 1.9. forward_switch usage ... kamctl fifo sp_forward_switch 0=on ... @@ -270,7 +288,7 @@ kamctl fifo sp_forward_switch 0=on The syntax of this configuration string is described in 1.6. (filter_setting_list). - Example 1.9. forward_filter usage + Example 1.10. forward_filter usage ... kamctl fifo sp_forward_filter 0=REGISTER:INVITE ... @@ -283,7 +301,7 @@ kamctl fifo sp_forward_filter 0=REGISTER:INVITE switch). The syntax of this configuration string is described in 1.6. (proxy_setting_list). - Example 1.10. forward_proxy usage + Example 1.11. forward_proxy usage ... kamctl fifo sp_forward_proxy 0=host-c.domain-c:5060 ... diff --git a/modules/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml index f683f51..23527d0 100644 --- a/modules/utils/doc/utils_admin.xml +++ b/modules/utils/doc/utils_admin.xml @@ -229,6 +229,28 @@ if (method=="MESSAGE") { </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">is_int(pvar)</function> + </title> + <para> + Function checks if pvar argument contains integer value + and returns 1 if it does and -1 otherwise. + </para> + <para> + Function can be used from all kinds of routes. + </para> + <example> + <title><function>is_int()</function> usage</title> + <programlisting format="linespecific"> +... +if (is_int("$var(foo)")) { + xlog("L_INFO", "variable foo contains integer value\n"); +} +... + </programlisting> + </example> + </section> </section> <section> diff --git a/modules/utils/functions.c b/modules/utils/functions.c index aadfdd5..878073a 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -139,3 +139,21 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst) return stat; } + + +/* + * Checks if pvar argument contains int value + */ +int is_int(struct sip_msg* _m, char* _pvar, char* _s2) +{ + pv_spec_t *pvar_sp; + pv_value_t pv_val; + + pvar_sp = (pv_spec_t *)_pvar; + + if (pvar_sp && (pv_get_spec_value(_m, pvar_sp, &pv_val) == 0)) { + return (pv_val.flags & PV_VAL_INT)?1:-1; + } + + return -1; +} diff --git a/modules/utils/functions.h b/modules/utils/functions.h index 5e666f9..df34211 100644 --- a/modules/utils/functions.h +++ b/modules/utils/functions.h @@ -42,4 +42,9 @@ int http_query(struct sip_msg* _m, char* _page, char* _params, char* _dst); +/* + * Checks if pvar argument contains int value + */ +int is_int(struct sip_msg* _m, char* _pvar, char* _s2); + #endif /* UTILS_FUNCTIONS_H */ diff --git a/modules/utils/utils.c b/modules/utils/utils.c index 86f71ea..b5fa5b1 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -101,6 +101,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"xcap_auth_status", (cmd_function)xcap_auth_status, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE}, + {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

call for assistance
by Meftah Tayeb 16 Oct '10

16 Oct '10

hi folk, could you join irc irc.freenode.net #switchfin to start porting SR to BF? not exactly porting but integrating if you get there we will organise a conf call hosted by me i could provide SIP and evean PSTN access thank you -- Meftah Tayeb inum: +883510001288000 mobile: +213660347746

2 2

[tracker] Task opened: is_int() function
by sip-router 15 Oct '10

15 Oct '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - is_int() function Task Type - Feature Request Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - implement is_int(arg) function that returns 1 if value of pseudo variable argument is integer and -1 if not. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=92 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2010