sr-dev April 2010

sr-dev@lists.kamailio.org

27 participants
495 discussions

git:master: modules/lcr: load_gws() return value tells if any matching gw was found

by Juha Heinanen

Module: sip-router Branch: master Commit: 3b94ad70957e560dfe1087469fd9e1dd3ea14f95 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b94ad7… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 23 13:34:25 2010 +0300 modules/lcr: load_gws() return value tells if any matching gw was found - load_gws() now returns 1 if at least one matching gateway was found, 2 if no matching gateways was found, and -1 on error. --- modules/lcr/README | 45 +++++++++++++++++++++-------------------- modules/lcr/doc/lcr_admin.xml | 3 +- modules/lcr/lcr_mod.c | 6 ++++- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 23a96fd..af90ac0 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -10,7 +10,7 @@ Juha Heinanen <jh(a)tutpro.com> - Copyright � 2005-2010 Juha Heinanen + Copyright © 2005-2010 Juha Heinanen Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -288,7 +288,7 @@ Chapter 1. Admin Guide URL of the database table to be used. - Default value is "mysql://openserro:openserro@localhost/openser". + Default value is “mysql://openserro:openserro@localhost/openser”. Example 1.1. Setting db_url module parameter ... @@ -299,7 +299,7 @@ modparam("lcr","db_url","dbdriver://username:password@dbhost/dbname") Name of the table holding gateways definitions. - Default value is "gw". + Default value is “gw”. Example 1.2. Setting gw_table module parameter ... @@ -311,7 +311,7 @@ modparam("lcr","gw_table","gw") Name of the column holding the identifier of an LCR instance. Common to both gw and lcr tables. - Default value is "lcr_id". + Default value is “lcr_id”. Example 1.3. Setting lcr_id_column module parameter ... @@ -322,7 +322,7 @@ modparam("lcr", "lcr_id_column", "lcr_identifier") Name of the column holding the gateway name. - Default value is "gw_name". + Default value is “gw_name”. Example 1.4. Setting gw_name_column module parameter ... @@ -334,7 +334,7 @@ modparam("lcr","gw_name_column","gw_name") Name of the column holding the group ID of gateway both in gw and lcr tables. - Default value is "grp_id". + Default value is “grp_id”. Example 1.5. Setting grp_id_column module parameter ... @@ -345,7 +345,7 @@ modparam("lcr","grp_id_column","grp_id") Name of the column holding the IP address of the gateway. - Default value is "ip_addr". + Default value is “ip_addr”. Example 1.6. Setting ip_addr_column module parameter ... @@ -359,7 +359,7 @@ modparam("lcr","ip_addr_column","ip_addr") not forwarded based on hostname, but based on gateway's IP address in destination URI. - Default value is "hostname". + Default value is “hostname”. Example 1.7. Setting hostname_column module parameter ... @@ -370,7 +370,7 @@ modparam("lcr", "hostname_column","hostname") Name of the column holding the port number of the gateway. - Default value is "port". + Default value is “port”. Example 1.8. Setting port_column module parameter ... @@ -381,7 +381,7 @@ modparam("lcr","port_column","port") Name of the column holding the uri scheme of the gateway. - Default value is "uri_scheme". + Default value is “uri_scheme”. Example 1.9. Setting uri_scheme_column module parameter ... @@ -393,7 +393,7 @@ modparam("lcr","uri_scheme_column","uri_scheme") Name of the column holding the transport type to be used for the gateway. - Default value is "transport". + Default value is “transport”. Example 1.10. Setting transport_column module parameter ... @@ -405,7 +405,7 @@ modparam("lcr","transport_column","transport") Name of the column holding the number of characters to be stripped from the front of Request URI user part before inserting tag. - Default value is "strip". + Default value is “strip”. Example 1.11. Setting strip_column module parameter ... @@ -416,7 +416,7 @@ modparam("lcr","strip_column","strip_count") Name of the column holding gateway specific tag string. - Default value is "tag". + Default value is “tag”. Example 1.12. Setting tag_column module parameter ... @@ -427,7 +427,7 @@ modparam("lcr","tag_column","gw_tag") Name of the column holding gateway's weight within its group. - Default value is "weight". + Default value is “weight”. Example 1.13. Setting weight_column module parameter ... @@ -438,7 +438,7 @@ modparam("lcr","weight_column","gw_weight") Name of the column holding gateway specific flag values. - Default value is "flags". + Default value is “flags”. Example 1.14. Setting flags_column module parameter ... @@ -450,7 +450,7 @@ modparam("lcr","flags_column","gw_flags") Name of the column holding UNIX timestamp telling the time until which the gw is considered as defunct. - Default value is "defunct". + Default value is “defunct”. Example 1.15. Setting defunct_column module parameter ... @@ -461,7 +461,7 @@ modparam("lcr","defunct_column","defunct_until") Name of the table holding the LCR rules. - Default value is "lcr". + Default value is “lcr”. Example 1.16. Setting lcr_table module parameter ... @@ -472,7 +472,7 @@ modparam("lcr","lcr_table","lcr") Name of the column holding prefix of Request URI user part. - Default value is "prefix". + Default value is “prefix”. Example 1.17. Setting prefix_column module parameter ... @@ -483,7 +483,7 @@ modparam("lcr","prefix_column","prefix") Name of the column holding the FROM (source) URI. - Default value is "from_uri". + Default value is “from_uri”. Example 1.18. Setting from_uri_column module parameter ... @@ -494,7 +494,7 @@ modparam("lcr","from_uri_column","from_uri") Name of the column holding the priority of the rule. - Default value is "priority". + Default value is “priority”. Example 1.19. Setting priority_column module parameter ... @@ -611,7 +611,7 @@ modparam("lcr", "lcr_hash_size", 1024) 3750. In order for this parameter to have effect, the database driver must support fetch_result() capability. - Default value is "2000". + Default value is “2000”. Example 1.28. Set fetch_rows parameter ... @@ -636,7 +636,8 @@ modparam("lcr", "fetch_rows", 3000) variable containing an integer value. Caller's URI is given by caller_uri argument, which must be a pseudo variable. - Returns 1 on success and -1 on error. + Returns 1 if at least one matching gateway was found, 2 if no matching + gateways was found, and -1 on error. Execution time of load_gws() function is O(N) * O(M), where N is number of different prefix lengths and M is number of collisions for matching diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 998535f..01b2b8f 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -743,7 +743,8 @@ modparam("lcr", "fetch_rows", 3000) must be a pseudo variable. </para> <para> - Returns 1 on success and -1 on error. + Returns 1 if at least one matching gateway was found, 2 + if no matching gateways was found, and -1 on error. </para> <para> Execution time of load_gws() function is O(N) * O(M), diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 8b03704..31ba73b 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1810,7 +1810,11 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) add_avp(lcr_id_avp_type, lcr_id_avp, val); } - return 1; + if (gw_index > 0) { + return 1; + } else { + return 2; + } }

14 years, 7 months

typo on kamdbctl man page

by Juha Heinanen

kamdbctl(8) Kamailio kamdbctl(8) NAME kamdbctl - Kamailio database control tool SYNOPSIS kamctl command [ parameters ] DESCRIPTION kamdbctl is a script to maintain the database needed by some Kamalio modules.

14 years, 7 months

Problems with str comparison in ut.h

by marius zbihlei

Hello The str_strcmp function does not do a correct lexicographic comparison between the received strings: <verbatim> /** * \brief Compare two str's case sensitive * \param str1 first str * \param str2 second str * \return 0 if both are equal, positive if str1 is greater, negative if str2 is greater, -2 on errors */ static inline int str_strcmp(const str *str1, const str *str2) { if(str1==NULL || str2==NULL || str1->s ==NULL || str2->s==NULL || str1->len<0 || str2->len<0) { LM_ERR("bad parameters\n"); return -2; } if (str1->len < str2->len) return -1; else if (str1->len > str2->len) return 1; else return strncmp(str1->s, str2->s, str1->len); } </verbatim> in this case str1={"z",1} will be "smaller" then str2={"aa", 2} because it's length is smaller . Method is used is various tree implementations... (same from str_casestrcmp()) Is this "normal" ? Marius

14 years, 7 months

Problems with str comparison in ut.h

by marius zbihlei

14 years, 7 months

Problems with str comparison in ut.h

by marius zbihlei

14 years, 7 months

How to convert to integer the string value of an AVP

by Iñaki Baz Castillo

Hi, I want to improve the regex module by allowing that the function pcre_match_group() accepts a pseudo variable as second argument, to get something like this: $avp(i:11) = 111; if pcre_match_group("$rU","$avp(i:11)") ... So I'm modifying regex_mod.c: - Before: { "pcre_match_group", (cmd_function)w_pcre_match_group, 2, fixup_spve_uint, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE } - Now: { "pcre_match_group", (cmd_function)w_pcre_match_group, 2, fixup_spve_spve, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE } Then in the function code I do (just the additions): ------------------------------------------------------------------------- static int w_pcre_match_group(struct sip_msg* _msg, char* _s1, char* _s2) { str group; if (_s2 == NULL) { num_pcre = 0; } else { if (fixup_get_svalue(_msg, (gparam_p)_s2, &group)) { LM_ERR("cannot print the format for second param\n"); return -5; } num_pcre = (int)(long)group.s; LM_INFO("***debugging*** group.s = <%s> - group.len = <%i> - num_pcre = <%i>\n", group.s, group.len, num_pcre); } ------------------------------------------------------------------------ With the above example: $avp(i:11) = 111; if pcre_match_group("$rU","$avp(i:11)") I get the following wrong outpu (num_pcre should be 111): INFO:regex:w_pcre_match_group: ***debugging*** group.s = <111> - group.len = <3> - num_pcre = <7198368> So, how to convert group.s into an integer? Thanks a lot for any help. PS: I'm coding it in Kamailio 1.5. -- Iñaki Baz Castillo <ibc(a)aliax.net>

14 years, 7 months

SF.net SVN: openser:[6002] branches/1.5/modules/dialog/dlg_handlers.c

by Inaki Baz Castillo

Revision: 6002 http://openser.svn.sourceforge.net/openser/?rev=6002&view=rev Author: ibc_sf Date: 2010-04-22 11:42:24 +0000 (Thu, 22 Apr 2010) Log Message: ----------- dialog(k): populate bind addr before any error - backport from sip-router master branch (commit d68980dc6f3de03a432f478c124852c23a1d1b2) - setting bind addr attribute in populate_leg_info() takes place before any parsing error may occur, to be sure it is set, avoiding extra check for null value when updating db - reported by Kelvin Chua - credits to Timo Reimann for troubleshooting Modified Paths: -------------- branches/1.5/modules/dialog/dlg_handlers.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 7 months

SF.net SVN: openser:[6001] trunk/modules/dialog/dlg_handlers.c

by Inaki Baz Castillo

Revision: 6001 http://openser.svn.sourceforge.net/openser/?rev=6001&view=rev Author: ibc_sf Date: 2010-04-22 11:35:47 +0000 (Thu, 22 Apr 2010) Log Message: ----------- dialog(k): populate bind addr before any error - backport from sip-router master branch (commit d68980dc6f3de03a432f478c124852c23a1d1b2) - setting bind addr attribute in populate_leg_info() takes place before any parsing error may occur, to be sure it is set, avoiding extra check for null value when updating db - reported by Kelvin Chua - credits to Timo Reimann for troubleshooting Modified Paths: -------------- trunk/modules/dialog/dlg_handlers.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 7 months

new features: write access to branch attributes

by Daniel-Constantin Mierla

Hello, yesterday I committed to git new feature that allow write access to branch attributes. It is about branches kept in core before TM takes over and creates the branches for transaction. These branches are filled when you do location lookup, alias db lookup or append_branch in route block. You can update the attributes: - r-uri - outbound proxy address (dst uri) - path - q value - local socket to be used for sending - branch flags More at: http://sip-router.org/wiki/cookbooks/pseudo-variables/devel#branch_attribut… The access can be done with index, 0 is the first. Negative value of index starts counting from the last, therefore index -1 is the last branch. If the index is missing, then first branch is used. Adding a new branch can be done with km_append_branch(...) of kex module or append_branch() functions. Dropping a branch is by assigning $null to uri attribute of branch. Among benefits: - drop invalid branches before creating the transaction - you can lookup the aor from branches in location table, avoiding a loopback of a branch (e.g., for alias db case) Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/ * http://twitter.com/miconda * http://www.linkedin.com/in/danielconstantinmierla

14 years, 7 months

git:kamailio_3.0: dialog(k): populate bind addr before any error

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 9223d7a189c64b6a3dbe8c66edf08ddc16f3fd4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9223d7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 22 10:35:33 2010 +0200 dialog(k): populate bind addr before any error - setting bind addr attribute in populate_leg_info() takes place before any parsing error may occur, to be sure it is set, avoiding extra check for null value when updating db - reported by Kelvin Chua - credits to Timo Reimann for troubleshooting (cherry picked from commit fd68980dc6f3de03a432f478c124852c23a1d1b2) --- modules_k/dialog/dlg_handlers.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 1091777..3b671ab 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -200,6 +200,8 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, str contact; str rr_set; + dlg->bind_addr[leg] = msg->rcv.bind_address; + /* extract the cseq number as string */ if (leg==DLG_CALLER_LEG) { if((!msg->cseq && (parse_headers(msg,HDR_CSEQ_F,0)<0 || !msg->cseq)) @@ -269,7 +271,6 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, goto error0; } - dlg->bind_addr[leg] = msg->rcv.bind_address; if (rr_set.s) pkg_free(rr_set.s); return 0;

14 years, 7 months

← Newer
1
...
31
32
33
34
35
36
37
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2010