sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: doc: cfg_list: updated module list

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b58484d6297558a96514e456bfae0bb2aabd6057 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b58484d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 5 19:14:27 2010 +0100 doc: cfg_list: updated module list Added siputils, registrar(k) and ratelimit. --- doc/cfg_list/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/doc/cfg_list/Makefile b/doc/cfg_list/Makefile index 8d83fc3..950867e 100644 --- a/doc/cfg_list/Makefile +++ b/doc/cfg_list/Makefile @@ -18,7 +18,10 @@ docbook_output_dir=docbook files_list=$(COREPATH)/cfg_core.c:core $(COREPATH)/tcp_options.c:tcp \ $(COREPATH)/sctp_options.c:sctp \ $(COREPATH)/modules_s/maxfwd/maxfwd.c:maxfwd \ - $(COREPATH)/modules/tm/config.c:tm + $(COREPATH)/modules/tm/config.c:tm \ + $(COREPATH)/modules_k/siputils/config.c:siputils \ + $(COREPATH)/modules_k/registrar/config.c:registrar \ + $(COREPATH)/modules_k/ratelimit/config.c:ratelimit # list of excluded groups grp_exclude=pa

14 years, 11 months

git:master: doc: rpc_list: updated the module list

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 9f34472c4ea68271c5217cddb0ddeb232751087e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f34472… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 5 19:04:25 2010 +0100 doc: rpc_list: updated the module list Removed rls(s), pike(s) and pa(s) (obsolete) and add debugger htable, usrloc(k) and uac(k). Changed the name for usrloc(s) and usrloc(k) so that there won't be name conflicts. --- doc/rpc_list/Makefile | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/rpc_list/Makefile b/doc/rpc_list/Makefile index eb046cc..e3a2059 100644 --- a/doc/rpc_list/Makefile +++ b/doc/rpc_list/Makefile @@ -17,9 +17,7 @@ docbook_output_dir=docbook # make print-lst |sed -e 's!^ \?../..$.*$!$(COREPATH)\1 \\!' files_list= $(COREPATH)/core_cmd.c:core \ $(COREPATH)/modules_s/pdt/pdt.c:pdt \ - $(COREPATH)/modules_s/rls/rpc.c:rls \ $(COREPATH)/modules_s/pike/rpc.c:pike \ - $(COREPATH)/modules_s/tls/tls_rpc.c:tls \ $(COREPATH)/modules_s/presence_b2b/rpc.c:presence_b2b \ $(COREPATH)/modules_s/gflags/gflags.c:gflags \ $(COREPATH)/modules_s/dispatcher/ds_rpc.c:dispatcher \ @@ -27,22 +25,27 @@ files_list= $(COREPATH)/core_cmd.c:core \ $(COREPATH)/modules_s/domain/domain_rpc.c:domain \ $(COREPATH)/modules_s/cpl-c/cpl_rpc.c:cpl-c \ $(COREPATH)/modules_s/sl/sl_stats.c:sl \ - $(COREPATH)/modules_s/usrloc/ul_rpc.c:usrloc \ - $(COREPATH)/modules_s/pa/rpc.c:pa \ + $(COREPATH)/modules_s/usrloc/ul_rpc.c:usrloc_s \ $(COREPATH)/modules_s/ratelimit/ratelimit.c:ratelimit \ $(COREPATH)/modules/tm/tm.c:tm \ $(COREPATH)/modules/tls/tls_rpc.c:tls \ $(COREPATH)/modules/lcr/lcr_rpc.c:lcr \ + $(COREPATH)/modules/debugger/debugger_api.c:debugger \ $(COREPATH)/modules/ctl/ctl.c:ctl \ $(COREPATH)/modules/cfg_rpc/cfg_rpc.c:cfg_rpc \ $(COREPATH)/modules/db_flatstore/flat_rpc.c:db_flatstore \ - $(COREPATH)/modules/mi_rpc/mi_rpc_mod.c:mi_rpc + $(COREPATH)/modules/mi_rpc/mi_rpc_mod.c:mi_rpc \ + $(COREPATH)/modules_k/htable/htable.c:htable \ + $(COREPATH)/modules_k/usrloc/ul_rpc.c:usrloc_k \ + $(COREPATH)/modules_k/uac/uac_reg.c:uac # list of excluded groups grp_exclude=pa # list of file prefixes to exclude (full path needed) -file_exclude=$(COREPATH)/modules_s/tls/ +file_exclude=$(COREPATH)/modules_s/tls/ \ + $(COREPATH)/obsolete/pa/ \ + $(COREPATH)/obsolete/rls/ # special per file group overrides # format= grp_filename=... ,where filename does not contain the extension

14 years, 11 months

git:master: doc: select_list regenerated

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 4896b7a48dee41bb66bad1ff07d2b5f4d5972388 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4896b7a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 5 18:43:44 2010 +0100 doc: select_list regenerated --- doc/select_list/docbook/select_list.xml | 3 ++- doc/select_list/docbook/select_tm.xml | 12 ++++++++++++ doc/select_list/select_tm.txt | 28 ++++++++++++++++------------ 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/doc/select_list/docbook/select_list.xml b/doc/select_list/docbook/select_list.xml index 7e46b94..4be743c 100644 --- a/doc/select_list/docbook/select_list.xml +++ b/doc/select_list/docbook/select_list.xml @@ -5,12 +5,13 @@ <book id="select_list" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>Select List</title> <info><revhistory><revision> - <revnumber>sip-router git-725c50</revnumber> + <revnumber>sip-router git-21fb2e</revnumber> <revremark> Automatically generated by: make -C doc/select_list all </revremark> </revision></revhistory></info> + <xi:include href="intro.xml"/> <xi:include href="select_core.xml"/> <xi:include href="select_timer.xml"/> <xi:include href="select_nathelper.xml"/> diff --git a/doc/select_list/docbook/select_tm.xml b/doc/select_list/docbook/select_tm.xml index 006d6d2..499cf43 100644 --- a/doc/select_list/docbook/select_tm.xml +++ b/doc/select_list/docbook/select_tm.xml @@ -19,9 +19,15 @@ <listitem>@tm.uas.request </listitem> + <listitem>@tm.uas.request.neg_ack_retransmission + </listitem> + <listitem>@tm.uas.req </listitem> + <listitem>@tm.uas.req.neg_ack_retransmission + </listitem> + <listitem>@tm.uas.local_to_tag </listitem> @@ -37,6 +43,12 @@ <listitem>@tm.uac.relayed </listitem> + <listitem>@tm.uac.last_status + </listitem> + + <listitem>@tm.uac.response_retransmission + </listitem> + <listitem>@tm.uac[integer].status </listitem> diff --git a/doc/select_list/select_tm.txt b/doc/select_list/select_tm.txt index d165502..f12de7b 100644 --- a/doc/select_list/select_tm.txt +++ b/doc/select_list/select_tm.txt @@ -8,15 +8,19 @@ Selects for tm 2. @tm.method 3. @tm.uas.status 4. @tm.uas.request - 5. @tm.uas.req - 6. @tm.uas.local_to_tag - 7. @tm.uas.response - 8. @tm.uas.resp - 9. @tm.uac.count - 10. @tm.uac.relayed - 11. @tm.uac[integer].status - 12. @tm.uac[integer].uri - 13. @tm.uac[integer].response - 14. @tm.uac[integer].resp - 15. @tm.uac[integer].request - 16. @tm.uac[integer].req + 5. @tm.uas.request.neg_ack_retransmission + 6. @tm.uas.req + 7. @tm.uas.req.neg_ack_retransmission + 8. @tm.uas.local_to_tag + 9. @tm.uas.response + 10. @tm.uas.resp + 11. @tm.uac.count + 12. @tm.uac.relayed + 13. @tm.uac.last_status + 14. @tm.uac.response_retransmission + 15. @tm.uac[integer].status + 16. @tm.uac[integer].uri + 17. @tm.uac[integer].response + 18. @tm.uac[integer].resp + 19. @tm.uac[integer].request + 20. @tm.uac[integer].req

14 years, 11 months

git:master: doc: rpc_list regenerated

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d2924b30f4ee6398bcf9495f0a105653bb724029 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2924b3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 5 19:10:22 2010 +0100 doc: rpc_list regenerated --- doc/rpc_list/docbook/rpc_core.xml | 13 ++++++- doc/rpc_list/docbook/rpc_debugger.xml | 35 ++++++++++++++++++++ .../docbook/{rpc_rls.xml => rpc_htable.xml} | 8 ++-- doc/rpc_list/docbook/rpc_list.xml | 9 +++-- doc/rpc_list/docbook/{rpc_rls.xml => rpc_uac.xml} | 8 ++-- .../docbook/{rpc_rls.xml => rpc_usrloc_k.xml} | 8 ++-- .../docbook/{rpc_usrloc.xml => rpc_usrloc_s.xml} | 4 +- doc/rpc_list/rpc_core.txt | 12 ++++++- doc/rpc_list/rpc_debugger.txt | 15 ++++++++ doc/rpc_list/rpc_htable.txt | 9 +++++ doc/rpc_list/rpc_rls.txt | 9 ----- doc/rpc_list/rpc_uac.txt | 9 +++++ doc/rpc_list/rpc_usrloc_k.txt | 9 +++++ doc/rpc_list/{rpc_usrloc.txt => rpc_usrloc_s.txt} | 4 +- 14 files changed, 120 insertions(+), 32 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d29…

14 years, 11 months

git:master: Merge remote branch 'origin/andrei/cdefs2doc'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 21fb2e7f4ae677a425f3fb4b44a0db5cca9c818a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21fb2e7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 5 18:33:44 2010 +0100 Merge remote branch 'origin/andrei/cdefs2doc' * origin/andrei/cdefs2doc: (23 commits) doc: select_list: added intro & notations sections doc: select_list: generated docbook and txt lists doc: select_list: added makefiles for auto-gen. doc: {rpc,cfg}_list: fix makefile exclude list doc: dump_selects.pl: fix for incomplete initializers doc: dump_selects.pl: support for docbook output doc: cfg_list: generated docbook cfg vars lists doc: cfg_list: docbook output directory doc: cfg_list: support for generating docbook output doc: dump_cfg_defs.pl: support for docbook output doc: rpc_list: generated docbook rpc lists doc: rpc_list: docbook output directory doc: rpc_list: support for generating docbook output doc: dump_rpcs.pl: support for docbook output doc: select doc generator: more fixes & core selects support doc: select doc generator fix flags processing doc: generated rpc lists doc: generated cfg vars lists doc: added makefiles for auto-gen. rpc and cfg vars lists doc: script to generate select lists from C code ... ---

14 years, 11 months

10 years sip express router (ser)

by Daniel-Constantin Mierla

Hello, yesterday at CeBIT I've run into Fraunhofer booth and a banner attracted my attention, photo at: http://www.asipto.com/gallery/v/cebit2010/P3030721.JPG.html?g2_imageViewsIn… According to the middle right bubble, 2000 was the first year FhG presented SER at CeBIT. Given that, means the project should celebrate (at least) 10 years these days?!? I was among FhG staffers at CeBIT 2002, presenting latest SER at that time. According to CVS repository on BerliOS, files such as Makefile and main.c are dated 2001. Officially, SER was GPL-ed and open sourced in 2002 (year when ser project was registered to berlios.de software forge). Andrei, more insights from non-open-source era? I got into the project in January 2002, would be interesting to trace the birthday... Cheers, Daniel

14 years, 11 months

git:master: modules_k/ permisssions Fixed a bug that caused a segmentation fault if the mi_fifo subnet_dump was issued

by Marius Zbihlei

Module: sip-router Branch: master Commit: d5da961b7ac62037fb1fb24c6ce3484584f5f972 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5da961… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Mar 5 16:54:58 2010 +0200 modules_k/permisssions Fixed a bug that caused a segmentation fault if the mi_fifo subnet_dump was issued but the permissions module was not fully configured (no db url given) --- modules_k/permissions/mi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/permissions/mi.c b/modules_k/permissions/mi.c index 9b4594a..c2f900f 100644 --- a/modules_k/permissions/mi.c +++ b/modules_k/permissions/mi.c @@ -116,7 +116,7 @@ struct mi_root* mi_subnet_dump(struct mi_root *cmd_tree, void *param) rpl_tree = init_mi_tree( 200, MI_SSTR(MI_OK)); if (rpl_tree==NULL) return 0; - if(subnet_table_mi_print(*subnet_table, &rpl_tree->node) < 0) { + if(subnet_table && subnet_table_mi_print(*subnet_table, &rpl_tree->node) < 0) { LM_ERR("failed to add a node\n"); free_mi_tree(rpl_tree); return 0;

14 years, 11 months

git:master: modules_k/userblacklist : check_blacklist function uses globalblacklist_table as data source if no parameter is given .

by Marius Zbihlei

Module: sip-router Branch: master Commit: 9858546ec00532afa6aea36a5a770cb6a9255bf7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9858546… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Mar 5 16:32:49 2010 +0200 modules_k/userblacklist : check_blacklist function uses globalblacklist_table as data source if no parameter is given. Globalblacklist_table parameter was not used at all in the userblacklist module, the check_blacklist funtion always needing one parameters and the db table. This is not mandatory anymore, as the check_blacklist function with no parameters will use the globalblacklist_table --- modules_k/userblacklist/README | 35 +++++++------ .../userblacklist/doc/userblacklist_admin.xml | 5 +- modules_k/userblacklist/doc/userblacklist_db.xml | 3 +- modules_k/userblacklist/userblacklist.c | 52 ++++++++++++++++++-- 4 files changed, 69 insertions(+), 26 deletions(-) diff --git a/modules_k/userblacklist/README b/modules_k/userblacklist/README index 5e0c242..3627c5c 100644 --- a/modules_k/userblacklist/README +++ b/modules_k/userblacklist/README @@ -11,7 +11,7 @@ Henning Westerholt 1&1 Internet AG <henning.westerholt(a)1und1.de> - Copyright � 2008 1&1 Internet AG + Copyright © 2008 1&1 Internet AG Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -38,7 +38,7 @@ Henning Westerholt 4.2. check_user_whitelist (string user, string domain, string number, string table) - 4.3. check_blacklist (string table) + 4.3. check_blacklist ([string table]) 5. MI Commands @@ -107,7 +107,7 @@ Chapter 1. Admin Guide 4.2. check_user_whitelist (string user, string domain, string number, string table) - 4.3. check_blacklist (string table) + 4.3. check_blacklist ([string table]) 5. MI Commands @@ -170,7 +170,7 @@ Chapter 1. Admin Guide If set to non-zero value, the domain column in the userblacklist is used. - Default value is "0". + Default value is “0”. Example 1.1. Set use_domain parameter ... @@ -185,7 +185,7 @@ modparam("userblacklist", "use_domain", 0) 4.2. check_user_whitelist (string user, string domain, string number, string table) - 4.3. check_blacklist (string table) + 4.3. check_blacklist ([string table]) 4.1. check_user_blacklist (string user, string domain, string number, string table) @@ -229,11 +229,12 @@ if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) } ... -4.3. check_blacklist (string table) +4.3. check_blacklist ([string table]) Finds the longest prefix that matches the request URI for the given table. If a match is found and it is not set to whitelist, false is - returned. Otherwise, true is returned. + returned. Otherwise, true is returned. If no table is given, then + globalblacklist_table is used. Example 1.4. check_blacklist usage ... @@ -287,8 +288,8 @@ kamctl fifo reload_blacklist ... This table will setup a global blacklist for all numbers, only allowing - calls starting with "1". Numbers that starting with "123456" and - "123455787" are also blacklisted, because the longest prefix will be + calls starting with “1”. Numbers that starting with “123456” and + “123455787” are also blacklisted, because the longest prefix will be matched. Example 1.7. Example database content - userblacklist table @@ -307,10 +308,10 @@ kamctl fifo reload_blacklist ... This table will setup user specific blacklists for certain usernames. - For example for user "49721123456788" the prefix "1234" will be not - allowed, but the number "123456788" is allowed. Additionally a domain + For example for user “49721123456788” the prefix “1234” will be not + allowed, but the number “123456788” is allowed. Additionally a domain could be specified that is used for username matching if the - "use_domain" parameter is set. + “use_domain” parameter is set. Chapter 2. Module parameter for database access. @@ -333,7 +334,7 @@ Chapter 2. Module parameter for database access. URL to the database containing the data. - Default value is "mysql://openserro:openserro@localhost/openser". + Default value is “mysql://openserro:openserro@localhost/openser”. Example 2.1. Set db_url parameter ... @@ -345,7 +346,7 @@ modparam("userblacklist", "db_url", "dbdriver://username:password@dbhost/dbname" Name of the userblacklist table for the userblacklist module. - Default value is "userblacklist". + Default value is “userblacklist”. Example 2.2. Set userblacklist_table parameter ... @@ -400,10 +401,10 @@ modparam("userblacklist", "userblacklist_whitelist_col", "whitelist") 8. globalblacklist_table (String) Name of the globalblacklist table for the userblacklist module. Please - not that this table is currently ignored, the table needs to be given - as a parameter for the check_blacklist function. + note that this table is used when the check_blacklist function is + called with no parameters. - Default value is "globalblacklist". + Default value is “globalblacklist”. Example 2.8. Set globalblacklist_table parameter ... diff --git a/modules_k/userblacklist/doc/userblacklist_admin.xml b/modules_k/userblacklist/doc/userblacklist_admin.xml index a438741..367d298 100644 --- a/modules_k/userblacklist/doc/userblacklist_admin.xml +++ b/modules_k/userblacklist/doc/userblacklist_admin.xml @@ -152,12 +152,13 @@ if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) </section> <section> <title> - <function moreinfo="none">check_blacklist (string table)</function> + <function moreinfo="none">check_blacklist ([string table])</function> </title> <para> Finds the longest prefix that matches the request URI for the given table. If a match is found and it is not set to whitelist, - false is returned. Otherwise, true is returned. + false is returned. Otherwise, true is returned. If no table is given, + then globalblacklist_table is used. </para> <example> <title><function>check_blacklist</function> usage</title> diff --git a/modules_k/userblacklist/doc/userblacklist_db.xml b/modules_k/userblacklist/doc/userblacklist_db.xml index 5e8df9c..8739cbb 100644 --- a/modules_k/userblacklist/doc/userblacklist_db.xml +++ b/modules_k/userblacklist/doc/userblacklist_db.xml @@ -112,8 +112,7 @@ modparam("userblacklist", "userblacklist_whitelist_col", "whitelist") <section> <title><varname>globalblacklist_table</varname> (String)</title> <para>Name of the globalblacklist table for the userblacklist module. - Please not that this table is currently ignored, the table needs to be - given as a parameter for the check_blacklist function.</para> + Please note that this table is used when the check_blacklist function is called with no parameters.</para> <para> <emphasis>Default value is <quote>globalblacklist</quote>.</emphasis> </para> diff --git a/modules_k/userblacklist/userblacklist.c b/modules_k/userblacklist/userblacklist.c index 57b2b84..51cb4db 100644 --- a/modules_k/userblacklist/userblacklist.c +++ b/modules_k/userblacklist/userblacklist.c @@ -74,10 +74,12 @@ struct check_blacklist_fs_t { str userblacklist_db_url = str_init(DEFAULT_RODB_URL); static int use_domain = 0; +static struct dtrie_node_t *gnode = NULL; /* ---- fixup functions: */ static int check_blacklist_fixup(void** param, int param_no); static int check_user_blacklist_fixup(void** param, int param_no); +static int check_globalblacklist_fixup(void** param, int param_no); /* ---- exported commands: */ static int check_user_blacklist(struct sip_msg *msg, char* str1, char* str2, char* str3, char* str4); @@ -87,6 +89,8 @@ static int check_user_whitelist2(struct sip_msg *msg, char* str1, char* str2); static int check_user_blacklist3(struct sip_msg *msg, char* str1, char* str2, char* str3); static int check_user_whitelist3(struct sip_msg *msg, char* str1, char* str2, char* str3); static int check_blacklist(struct sip_msg *msg, struct check_blacklist_fs_t *arg1); +static int check_globalblacklist(struct sip_msg *msg); + /* ---- module init functions: */ static int mod_init(void); @@ -106,6 +110,7 @@ static cmd_export_t cmds[]={ { "check_user_blacklist", (cmd_function)check_user_blacklist, 4, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_user_whitelist", (cmd_function)check_user_whitelist, 4, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_blacklist", (cmd_function)check_blacklist, 1, check_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_blacklist", (cmd_function)check_globalblacklist, 0, check_globalblacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { 0, 0, 0, 0, 0, 0} }; @@ -401,6 +406,48 @@ static int add_source(const char *table) } +static int check_globalblacklist_fixup(void** param, int param_no) +{ + char * table = globalblacklist_table.s; + if(param_no > 0){ + LM_ERR("Wrong number of parameters\n"); + return -1; + } + + if (!table) { + LM_ERR("no table name\n"); + return -1; + } + /* try to add the table */ + if (add_source(table) != 0) { + LM_ERR("could not add table"); + return -1; + } + + gnode = table2dt(table); + if (!gnode) { + LM_ERR("invalid table '%s'\n", table); + return -1; + } + + return 0; +} + +static int check_globalblacklist(struct sip_msg* msg) +{ + static struct check_blacklist_fs_t* arg = NULL; + if(!arg){ + arg = pkg_malloc(sizeof(struct check_blacklist_fs_t)); + if (!arg) { + PKG_MEM_ERROR; + return -1; + } + memset(arg, 0, sizeof(struct check_blacklist_fs_t)); + arg->dtrie_root = gnode; + } + return check_blacklist(msg, arg); +} + static int check_blacklist_fixup(void **arg, int arg_no) { char *table = (char *)(*arg); @@ -454,11 +501,6 @@ static int check_blacklist(struct sip_msg *msg, struct check_blacklist_fs_t *arg return -1; } - if (parse_sip_msg_uri(msg) < 0) { - LM_ERR("cannot parse msg URI\n"); - return -1; - } - if ((parse_sip_msg_uri(msg) < 0) || (!msg->parsed_uri.user.s) || (msg->parsed_uri.user.len > MAXNUMBERLEN)) { LM_ERR("cannot parse msg URI\n"); return -1;

14 years, 11 months

git:master: modules/lcr: improved documentation related to defunct_gw function

by Juha Heinanen

Module: sip-router Branch: master Commit: 0c514703a6f9bf6e792011aad4e504ae3bd87786 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c51470… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Mar 5 06:44:03 2010 +0200 modules/lcr: improved documentation related to defunct_gw function (cherry picked from commit 98607744d233e03ba6e71f076ee4dd5e68d4407b) --- modules/lcr/README | 12 +++++------- modules/lcr/doc/lcr.xml | 2 +- modules/lcr/doc/lcr_admin.xml | 7 ++----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 02065f2..23a96fd 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -10,7 +10,7 @@ Juha Heinanen <jh(a)tutpro.com> - Copyright � 2005-2009 Juha Heinanen + Copyright � 2005-2010 Juha Heinanen Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -691,15 +691,13 @@ if (!next_gw()) { 4.3. defunct_gw(period) - Defuncts gateway selected by preceding next_gw() call for a period of - seconds given as argument. Argument must be a positive integer constant - or a pseudo variable with positive integer value. Value of defunct - column in database is not updated. + Defuncts gateway denoted by lcr_id_avp and defunct_gw_avp for a period + of seconds given as argument. Argument must be a positive integer + constant or a pseudo variable with positive integer value. Value of + defunct column in database is not updated. Returns 1 on success and -1 in case of error (see syslog). - Must be preceded by successful next_gw() call. - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. Example 1.32. defunct_gw usage diff --git a/modules/lcr/doc/lcr.xml b/modules/lcr/doc/lcr.xml index b9ac7c8..cd1c1bd 100644 --- a/modules/lcr/doc/lcr.xml +++ b/modules/lcr/doc/lcr.xml @@ -24,7 +24,7 @@ </editor> </authorgroup> <copyright> - <year>2005-2009</year> + <year>2005-2010</year> <holder>Juha Heinanen</holder> </copyright> <revhistory> diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 06ab9ea..998535f 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -828,8 +828,8 @@ if (!next_gw()) { <function moreinfo="none">defunct_gw(period)</function> </title> <para> - Defuncts gateway selected by preceding next_gw() call - for a period of seconds given as argument. Argument + Defuncts gateway denoted by lcr_id_avp and defunct_gw_avp + for a period of seconds given as argument. Argument must be a positive integer constant or a pseudo variable with positive integer value. Value of defunct column in database is not updated. @@ -838,9 +838,6 @@ if (!next_gw()) { Returns 1 on success and -1 in case of error (see syslog). </para> <para> - Must be preceded by successful next_gw() call. - </para> - <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. </para> <example>

14 years, 11 months

git:sr_3.0: modules/lcr: improved documentation related to defunct_gw function

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 98607744d233e03ba6e71f076ee4dd5e68d4407b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9860774… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Mar 5 06:44:03 2010 +0200 modules/lcr: improved documentation related to defunct_gw function --- modules/lcr/README | 12 +++++------- modules/lcr/doc/lcr.xml | 2 +- modules/lcr/doc/lcr_admin.xml | 7 ++----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 5f83052..c83a596 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -10,7 +10,7 @@ Juha Heinanen <jh(a)tutpro.com> - Copyright � 2005-2009 Juha Heinanen + Copyright � 2005-2010 Juha Heinanen Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -687,15 +687,13 @@ if (!next_gw()) { 4.3. defunct_gw(period) - Defuncts gateway selected by preceding next_gw() call for a period of - seconds given as argument. Argument must be a positive integer constant - or a pseudo variable with positive integer value. Value of defunct - column in database is not updated. + Defuncts gateway denoted by lcr_id_avp and defunct_gw_avp for a period + of seconds given as argument. Argument must be a positive integer + constant or a pseudo variable with positive integer value. Value of + defunct column in database is not updated. Returns 1 on success and -1 in case of error (see syslog). - Must be preceded by successful next_gw() call. - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. Example 1.32. defunct_gw usage diff --git a/modules/lcr/doc/lcr.xml b/modules/lcr/doc/lcr.xml index b9ac7c8..cd1c1bd 100644 --- a/modules/lcr/doc/lcr.xml +++ b/modules/lcr/doc/lcr.xml @@ -24,7 +24,7 @@ </editor> </authorgroup> <copyright> - <year>2005-2009</year> + <year>2005-2010</year> <holder>Juha Heinanen</holder> </copyright> <revhistory> diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 446fd4a..54cf186 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -822,8 +822,8 @@ if (!next_gw()) { <function moreinfo="none">defunct_gw(period)</function> </title> <para> - Defuncts gateway selected by preceding next_gw() call - for a period of seconds given as argument. Argument + Defuncts gateway denoted by lcr_id_avp and defunct_gw_avp + for a period of seconds given as argument. Argument must be a positive integer constant or a pseudo variable with positive integer value. Value of defunct column in database is not updated. @@ -832,9 +832,6 @@ if (!next_gw()) { Returns 1 on success and -1 in case of error (see syslog). </para> <para> - Must be preceded by successful next_gw() call. - </para> - <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. </para> <example>

14 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev