sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: modules/lcr: new feature added and old one removed

by Juha Heinanen

Module: sip-router Branch: master Commit: 70d2b098822efd0240dc61bd33edd583086fe83c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70d2b09… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Apr 25 10:35:59 2010 +0300 modules/lcr: new feature added and old one removed - Gateway ip_addr can now be NULL if hostname is given. If ip_addr of one or more gateways in an LCR instance is NULL, all test functions fail on that LCR instance, because for performance reasons, no DNS queries are done by the test functions. - Removed support for MI functions. --- lib/srdb1/schema/gw.xml | 4 +- modules/lcr/Makefile | 1 - modules/lcr/README | 159 +++++----------- modules/lcr/doc/lcr_admin.xml | 135 ++++---------- modules/lcr/lcr_mod.c | 426 +++++++++++++---------------------------- modules/lcr/lcr_rpc.c | 9 +- modules/lcr/mi.c | 100 ---------- modules/lcr/mi.h | 51 ----- 8 files changed, 221 insertions(+), 664 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=70d…

14 years, 9 months

dropping mi functions from lcr module

by Juha Heinanen

is it ok to drop mi functions from lcr module (master version), since it already has the corresponding rpc functions? -- juha

14 years, 9 months

git:master: utils/kamctl: cleaned up lcr commands

by Juha Heinanen

Module: sip-router Branch: master Commit: 108029460df18324f3186e3d3a8369946370e0d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1080294… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 23 21:39:28 2010 +0300 utils/kamctl: cleaned up lcr commands - Does not work yet, because $RPCCMD has not been defined yet and I don't know where it should be defined. --- utils/kamctl/kamctl | 155 ++++------------------------------------------ utils/kamctl/kamctl.base | 20 ++----- 2 files changed, 17 insertions(+), 158 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index faff5eb..afb7a46 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1077,155 +1077,24 @@ lcr() { require_dbengine require_ctlengine case $1 in - show) - mecho "lcr routes" - QUERY="select * FROM $LCR_TABLE ORDER BY $LCR_PREFIX_COLUMN; " - $DBROCMD "$QUERY" + show_gws) mecho "lcr gateways" - QUERY="select $LCR_GW_GWNAME_COLUMN, $LCR_GW_IP_COLUMN,\ - $LCR_GW_HOSTNAME_COLUMN, $LCR_GW_PORT_COLUMN, $LCR_GW_URIS_COLUMN, $LCR_GW_PROTO_COLUMN,\ -$LCR_GW_GRPID_COLUMN, $LCR_GW_STRIP_COLUMN, $LCR_GW_TAG_COLUMN, \ -$LCR_GW_FLAGS_COLUMN, $LCR_GW_WEIGHT_COLUMN, $LCR_GW_PING_COLUMN FROM $GW_TABLE ORDER BY $LCR_GW_GRPID_COLUMN; " + QUERY="select * FROM $GW_TABLE ORDER BY $LCR_ID_COLUMN, $LCR_GW_GRPID_COLUMN; " $DBROCMD "$QUERY" ;; - reload) - $CTLCMD lcr_reload - ;; - dump) - $CTLCMD lcr_gw_dump - $CTLCMD lcr_lcr_dump - ;; - addroute) - shift - if [ $# -ne 4 ] ; then - merr "lcr - too few parameters" - usage_lcr - exit 1 - fi - QUERY="insert into $LCR_TABLE \ - ($LCR_PREFIX_COLUMN, $LCR_FROMURI_COLUMN, \ - $LCR_GRPID_COLUMN, $LCR_PRIO_COLUMN) \ - VALUES ('$1', '$2', $3, $4);" - $DBCMD "$QUERY" - if [ $? -ne 0 ] ; then - merr "lcr - SQL Error" - exit 1 - fi - $CTLCMD lcr_reload + show_routes) + mecho "lcr routes" + QUERY="select * FROM $LCR_TABLE ORDER BY $LCR_ID_COLUMN, $LCR_PREFIX_COLUMN; " + $DBROCMD "$QUERY" ;; - rmroute) - shift - if [ $# -ne 4 ] ; then - merr "too few parameters" - usage_lcr - exit 1 - fi - QUERY="delete from $LCR_TABLE where $LCR_PREFIX_COLUMN='$1' AND \ - $LCR_FROMURI_COLUMN='$2' AND $LCR_GRPID_COLUMN=$3 AND \ - $LCR_PRIO_COLUMN=$4;" - $DBCMD "$QUERY" - if [ $? -ne 0 ] ; then - merr "lcr - SQL Error" - exit 1 - fi - $CTLCMD lcr_reload + reload) + $RPCCMD lcr.reload ;; - addgw) - shift - if [ $# -lt 6 ] ; then - merr "lcr - too few parameters" - usage_lcr - exit 1 - fi - if [ $# -gt 6 ] ; then - GW_FLAGS=$7 - if [ $# -gt 7 ] ; then - GW_TAG=$8 - else - GW_TAG="" - GW_STRIP=0 - fi - if [ $# -gt 8 ] ; then - STRIP=$9 - else - STRIP=0 - fi - if [ $# -gt 9 ] ; then - GW_WEIGHT=${10} - else - GW_WEIGHT=1 - fi - if [ $# -gt 10 ] ; then - GW_HOSTNAME=${10} - else - GW_HOSTNAME="" - fi - if [ $# -gt 11 ] ; then - GW_PING=${11} - else - GW_PING=0 - fi - if [ $# -gt 12 ] ; then - merr "lcr - too many parameters" - usage_lcr - exit 1 - fi - else - GW_FLAGS=0 - GW_TAG="" - STRIP=0 - GW_WEIGHT=1 - GW_HOSTNAME="" - GW_PING=0 - fi - GW_NAME=$1 - GW_IP=$2 - GW_PORT=$3 - GW_URI_SCHEME=$4 - if [ $GW_URI_SCHEME = 'sip' ]; then - GW_URI_SCHEME=1 - elif [ $GW_URI_SCHEME = 'sips' ]; then - GW_URI_SCHEME=2 - fi - GW_TRANSPORT=$5 - if [ $GW_TRANSPORT = 'udp' ]; then - GW_TRANSPORT=1 - elif [ $GW_TRANSPORT = 'tcp' ]; then - GW_TRANSPORT=2 - elif [ $GW_TRANSPORT = 'tls' ]; then - GW_TRANSPORT=3 - elif [ $GW_TRANSPORT = 'sctp' ]; then - GW_TRANSPORT=4 - fi - GW_GRP_ID=$6 - QUERY="insert into $GW_TABLE \ - ($LCR_GW_GWNAME_COLUMN, $LCR_GW_GRPID_COLUMN,\ - $LCR_GW_IP_COLUMN,$LCR_GW_PORT_COLUMN,$LCR_GW_URIS_COLUMN,\ - $LCR_GW_PROTO_COLUMN,$LCR_GW_STRIP_COLUMN,\ - $LCR_GW_TAG_COLUMN,$LCR_GW_FLAGS_COLUMN,$LCR_GW_WEIGHT_COLUMN, $LCR_GW_PING_COLUMN, $LCR_GW_HOSTNAME_COLUMN) \ - VALUES ('$GW_NAME', $GW_GRP_ID,\ - '$GW_IP', $GW_PORT, $GW_URI_SCHEME,\ - $GW_TRANSPORT, $STRIP, '$GW_TAG', $GW_FLAGS, $GW_WEIGHT, $GW_PING, '$GW_HOSTNAME');" - $DBCMD "$QUERY" - if [ $? -ne 0 ] ; then - merr "lcr - SQL Error" - exit 1 - fi - $CTLCMD lcr_reload + dump_gws) + $RPCCMD lcr.dump_gws ;; - rmgw) - shift - if [ $# -ne 1 ] ; then - merr "missing gateway to be removed" - exit 1 - fi - QUERY="delete from $GW_TABLE where $LCR_GW_GWNAME_COLUMN='$1';" - $DBCMD "$QUERY" - if [ $? -ne 0 ] ; then - merr "lcr - SQL Error" - exit 1 - fi - $CTLCMD lcr_reload + dump_routes) + $RPCCMD lcr.dump_lcrs ;; *) usage_lcr diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 79025c2..1949711 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -189,27 +189,14 @@ fi if [ -z "$LCR_TABLE" ] ; then LCR_TABLE=lcr fi +LCR_ID_COLUMN=lcr_id LCR_PREFIX_COLUMN=prefix -LCR_FROMURI_COLUMN=from_uri LCR_GRPID_COLUMN=grp_id -LCR_PRIO_COLUMN=priority # gw table if [ -z "$GW_TABLE" ] ; then GW_TABLE=gw fi -LCR_GW_GWNAME_COLUMN=gw_name -LCR_GW_GRPID_COLUMN=grp_id -LCR_GW_IP_COLUMN=ip_addr -LCR_GW_HOSTNAME_COLUMN=hostname -LCR_GW_PORT_COLUMN=port -LCR_GW_URIS_COLUMN=uri_scheme -LCR_GW_PROTO_COLUMN=transport -LCR_GW_STRIP_COLUMN=strip -LCR_GW_TAG_COLUMN=tag -LCR_GW_FLAGS_COLUMN=flags -LCR_GW_WEIGHT_COLUMN=weight -LCR_GW_PING_COLUMN=ping # carrier_name table if [ -z "$CARRIER_NAME_TABLE" ] ; then @@ -362,7 +349,10 @@ usage_lcr() { mecho " -- command 'lcr' - manage least cost routes (lcr)" echo cat <<EOF - lcr dump .......... show in memory gateways and routes tables + lcr show_gws....... show database gateways + lcr show_routes.... show database routes + lcr dump_gws....... show in memory gateways + lcr dump_routes.... show in memory routes lcr reload ........ reload lcr gateways and routes EOF }

14 years, 9 months

git:master: modules/lcr: added URI parameters gateway attribute

by Juha Heinanen

Module: sip-router Branch: master Commit: f26fde383ccb90d36c70123772eaf10aed250152 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f26fde3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 23 20:14:57 2010 +0300 modules/lcr: added URI parameters gateway attribute --- lib/srdb1/schema/gw.xml | 10 +- modules/lcr/README | 337 ++++++++++++++++++++++------------------- modules/lcr/doc/lcr_admin.xml | 70 +++++++--- modules/lcr/lcr_mod.c | 89 +++++++++-- modules/lcr/lcr_mod.h | 3 + modules/lcr/lcr_rpc.c | 5 +- 6 files changed, 318 insertions(+), 196 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f26…

14 years, 9 months

textops module comparison

by jh＠tutpro.com

in the irc meeting, i promised to study, if/how textops modules could be merged. below is a comparison. if ? appears as arg, it means that the function has not been documented in README. perhaps the easiest thing to do would be to extract the selects from modules_s/textops to a new modules/sel. comments? -- juha ------------------------------------------------------------------------- s k search(re) x x search_body(re) x search_append(re, txt) x x search_append_body(re, txt) x replace(re, txt) x x replace_body(re, txt) x replace_all(re, txt) x x replace_body_all(re, txt) x replace_body_atonce(re, txt) x subst('/re/repl/flags') x x subst_uri('/re/repl/flags') x x subst_user('/re/repl/flags') x x subst_body('/re/repl/flags') x set_body(txt,content_type) x set_reply_body(txt,content_type) x filter_body(content_type) x append_to_reply(txt) x x append_hf(txt) x x append_hf(txt, hdr) x append_hf_value(?, ?) x insert_hf(txt) x insert_hf(txt, hdr) x insert_hf_value(?, ?) x remove_hf(hname) x x remove_hf_re(re) x x remove_hf_value(?) x remove_hf_value2(?) x assign_hf_value(?, ?) x assign_hf_value2(?, ?) x include_hf_value(?, ?) x exclude_hf_value(?, ?) x hf_value_exists(?, ?) append_urihf(prefix, suffix) x x is_present_hf(hf_name) x x is_present_hf_re(hf_name_re) x append_time() x x is_method(name) x has_body(), has_body(mime) x is_privacy(privacy_type) x cmp_str(str1, str2) x cmp_istr(str1, str2) x starts_with(str1, str2) x msg_apply_changes() x selects x

14 years, 9 months

git:master: fix typo in man page, reported from Juha

by Henning Westerholt

Module: sip-router Branch: master Commit: 681628683649e254b0f06c3938b468c67d70e76e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6816286… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Apr 23 17:38:50 2010 +0200 fix typo in man page, reported from Juha --- utils/kamctl/kamdbctl.8 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/kamdbctl.8 b/utils/kamctl/kamdbctl.8 index 9c0d252..4c283ef 100644 --- a/utils/kamctl/kamdbctl.8 +++ b/utils/kamctl/kamdbctl.8 @@ -3,7 +3,7 @@ .SH NAME kamdbctl \- Kamailio database control tool .SH SYNOPSIS -.B kamctl +.B kamdbctl .BI command [ .BI parameters

14 years, 9 months

git:kamailio_3.0: core - tm: improved log messages

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 51a49282b60ce7a65a86d839a3e004eab7f3540f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51a4928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 23 16:44:49 2010 +0200 core - tm: improved log messages - udp_send() prints outgoing buffer len as unsigned - build_uac_req() prints the size of attempted memory chunk allocation (cherry picked from commit 839c9509013abf77a446e1c35620a9fcd4223740) --- modules/tm/t_msgbuilder.c | 2 +- udp_server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index b76c659..049386b 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1368,7 +1368,7 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra buf = shm_malloc(*len + 1); if (!buf) { - LOG(L_ERR, "build_uac_req(): no shmem\n"); + LOG(L_ERR, "build_uac_req(): no shmem (%d)\n", *len); goto error; } diff --git a/udp_server.c b/udp_server.c index 11d6635..cc75699 100644 --- a/udp_server.c +++ b/udp_server.c @@ -561,7 +561,7 @@ again: #endif if (n==-1){ su2ip_addr(&ip, &dst->to); - LOG(L_ERR, "ERROR: udp_send: sendto(sock,%p,%d,0,%s:%d,%d): %s(%d)\n", + LOG(L_ERR, "ERROR: udp_send: sendto(sock,%p,%u,0,%s:%d,%d): %s(%d)\n", buf,len, ip_addr2a(&ip), su_getport(&dst->to), tolen, strerror(errno),errno); if (errno==EINTR) goto again;

14 years, 9 months

git:master: core - tm: improved log messages

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 839c9509013abf77a446e1c35620a9fcd4223740 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=839c950… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 23 16:44:49 2010 +0200 core - tm: improved log messages - udp_send() prints outgoing buffer len as unsigned - build_uac_req() prints the size of attempted memory chunk allocation --- modules/tm/t_msgbuilder.c | 2 +- udp_server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index b76c659..049386b 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1368,7 +1368,7 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra buf = shm_malloc(*len + 1); if (!buf) { - LOG(L_ERR, "build_uac_req(): no shmem\n"); + LOG(L_ERR, "build_uac_req(): no shmem (%d)\n", *len); goto error; } diff --git a/udp_server.c b/udp_server.c index 052f6b2..a54a4fe 100644 --- a/udp_server.c +++ b/udp_server.c @@ -568,7 +568,7 @@ again: #endif if (n==-1){ su2ip_addr(&ip, &dst->to); - LOG(L_ERR, "ERROR: udp_send: sendto(sock,%p,%d,0,%s:%d,%d): %s(%d)\n", + LOG(L_ERR, "ERROR: udp_send: sendto(sock,%p,%u,0,%s:%d,%d): %s(%d)\n", buf,len, ip_addr2a(&ip), su_getport(&dst->to), tolen, strerror(errno),errno); if (errno==EINTR) goto again;

14 years, 9 months

git:master: utils/kamctl/kamctl.8: removed obsolete text

by Juha Heinanen

Module: sip-router Branch: master Commit: 0e119dbcbb253ef4e9d5e4dcbc5946e285f36b87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e119db… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 23 13:51:21 2010 +0300 utils/kamctl/kamctl.8: removed obsolete text --- utils/kamctl/kamctl.8 | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/utils/kamctl/kamctl.8 b/utils/kamctl/kamctl.8 index 96c8787..61fc55f 100644 --- a/utils/kamctl/kamctl.8 +++ b/utils/kamctl/kamctl.8 @@ -190,18 +190,6 @@ Send raw FIFO command .PP Commands labeled with (*) will prompt for a MySQL password. If the environment variable PW is set, the password will not be prompted. -.PP -IP addresses must be entered in dotted quad format e.g. 1.2.3.4 -<uri_scheme> and <transport> must be entered in integer or text, -e.g. transport '2' is identical to transport 'tcp'. -.br -scheme: 1=sip, 2=sips; transport: 1=udp, 2=tcp, 3=tls -.br -Examples: -.br -lcr addgw level3 1.2.3.4 5080 sip tcp 1 -.br -lcr addroute +1 '' 1 1 .SH AUTHORS

14 years, 9 months

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, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev