sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
230 discussions

git:master: lcr: added IPv6 support.
by Andreas Granig 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: d1ed60050d9c16b8b1b58559a5a1aea23f640b2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1ed600… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Wed Dec 21 16:19:31 2011 +0100 lcr: added IPv6 support. - Support both IPv4 and IPv6 addresses as ip_addr. --- modules/lcr/README | 2 +- modules/lcr/doc/lcr_admin.xml | 3 +- modules/lcr/hash.c | 2 +- modules/lcr/lcr_mod.c | 236 ++++++++++++++++++++++++++--------------- modules/lcr/lcr_mod.h | 3 +- modules/lcr/lcr_rpc.c | 23 +++- 6 files changed, 173 insertions(+), 96 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d1e…

1 0

git:master: modules: coherent naming of Statistics section in docbook
by Daniel-Constantin Mierla 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: d18996bee12699c3b627e6de1ab1086974df88a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d18996b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 00:44:35 2011 +0100 modules: coherent naming of Statistics section in docbook - it is easier to generate alphabetic indexes --- modules_k/dialog/doc/dialog_admin.xml | 2 +- modules_k/imc/doc/imc_admin.xml | 3 +-- modules_k/msilo/doc/msilo_admin.xml | 2 +- .../nat_traversal/doc/nat_traversal_admin.xml | 2 +- modules_k/qos/doc/qos_admin.xml | 2 +- modules_k/registrar/doc/registrar_admin.xml | 2 +- modules_k/sst/doc/sst_admin.xml | 2 +- modules_k/tmx/doc/tmx_admin.xml | 2 +- modules_k/usrloc/doc/usrloc_admin.xml | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 2fccc78..8e2baf2 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1572,7 +1572,7 @@ if(!uri == myself) { <section> - <title>Exported statistics</title> + <title>Statistics</title> <section> <title><varname>active_dialogs</varname></title> <para> diff --git a/modules_k/imc/doc/imc_admin.xml b/modules_k/imc/doc/imc_admin.xml index df59897..aeecfa4 100644 --- a/modules_k/imc/doc/imc_admin.xml +++ b/modules_k/imc/doc/imc_admin.xml @@ -300,7 +300,7 @@ if(is_method("MESSAGE) <section> - <title>Exported Statistics</title> + <title>Statistics</title> <section> <title> <function moreinfo="none">active_rooms</function> @@ -308,7 +308,6 @@ if(is_method("MESSAGE) <para> Number of active IM Conferencing rooms. </para> - </section> </section> diff --git a/modules_k/msilo/doc/msilo_admin.xml b/modules_k/msilo/doc/msilo_admin.xml index 3d02670..abb25ae 100644 --- a/modules_k/msilo/doc/msilo_admin.xml +++ b/modules_k/msilo/doc/msilo_admin.xml @@ -728,7 +728,7 @@ m_dump("$fu"); </section> <section> - <title>Exported Statistics</title> + <title>Statistics</title> <section> <title>stored_messages</title> <para> diff --git a/modules_k/nat_traversal/doc/nat_traversal_admin.xml b/modules_k/nat_traversal/doc/nat_traversal_admin.xml index efe9718..8d03189 100644 --- a/modules_k/nat_traversal/doc/nat_traversal_admin.xml +++ b/modules_k/nat_traversal/doc/nat_traversal_admin.xml @@ -618,7 +618,7 @@ if ((method=="REGISTER" || method=="SUBSCRIBE" || </section> <section> - <title>Exported statistics</title> + <title>Statistics</title> <section> <title><varname>keepalive_endpoints</varname></title> <para> diff --git a/modules_k/qos/doc/qos_admin.xml b/modules_k/qos/doc/qos_admin.xml index c4e0356..88d4dc8 100644 --- a/modules_k/qos/doc/qos_admin.xml +++ b/modules_k/qos/doc/qos_admin.xml @@ -159,7 +159,7 @@ route { </section> <section> - <title>Exported Statistics</title> + <title>Statistics</title> <para>There are no exported statistics for the qos module.</para> </section> diff --git a/modules_k/registrar/doc/registrar_admin.xml b/modules_k/registrar/doc/registrar_admin.xml index 3b4d6e5..bc6a976 100644 --- a/modules_k/registrar/doc/registrar_admin.xml +++ b/modules_k/registrar/doc/registrar_admin.xml @@ -986,7 +986,7 @@ reg_free_contacts("callee"); </section> <section> - <title>Exported Statistics</title> + <title>Statistics</title> <section> <title><varname>max_expires</varname></title> <para> diff --git a/modules_k/sst/doc/sst_admin.xml b/modules_k/sst/doc/sst_admin.xml index 3aec465..132678a 100644 --- a/modules_k/sst/doc/sst_admin.xml +++ b/modules_k/sst/doc/sst_admin.xml @@ -376,7 +376,7 @@ route { <section> - <title>Exported Statistics</title> + <title>Statistics</title> <section> <title><varname>expired_sst</varname></title> <para> diff --git a/modules_k/tmx/doc/tmx_admin.xml b/modules_k/tmx/doc/tmx_admin.xml index 52b4ac3..96d9a85 100644 --- a/modules_k/tmx/doc/tmx_admin.xml +++ b/modules_k/tmx/doc/tmx_admin.xml @@ -484,7 +484,7 @@ tcontinue('123', '456', 'MYROUTE'); <section> - <title>Exported statistics</title> + <title>Statistics</title> <para> Exported statistics are listed in the next sections. All statistics except <quote>inuse_transactions</quote> can be reset. diff --git a/modules_k/usrloc/doc/usrloc_admin.xml b/modules_k/usrloc/doc/usrloc_admin.xml index ec0131b..7edf15b 100644 --- a/modules_k/usrloc/doc/usrloc_admin.xml +++ b/modules_k/usrloc/doc/usrloc_admin.xml @@ -868,7 +868,7 @@ modparam("usrloc", "preload", "location") <section> - <title>Exported statistics</title> + <title>Statistics</title> <para> Exported statistics are listed in the next sections. </para>

1 0

git:master: modules: bunch of READMEs regenerated to be sync' ed with docbook
by Daniel-Constantin Mierla 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: 7defb42e5f4b42a69a409eb316d325fc0c8bad16 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7defb42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 00:46:25 2011 +0100 modules: bunch of READMEs regenerated to be sync'ed with docbook --- modules_k/cfgutils/README | 60 +++++----- modules_k/dialog/README | 13 +-- modules_k/dispatcher/README | 248 ++++++++++++++++++++-------------------- modules_k/imc/README | 18 ++-- modules_k/msilo/README | 202 ++++++++++++++++---------------- modules_k/nat_traversal/README | 24 ++-- modules_k/qos/README | 16 ++-- modules_k/registrar/README | 84 +++++++------- modules_k/sqlops/README | 28 +++--- modules_k/sst/README | 32 +++--- modules_k/tmx/README | 52 ++++---- modules_k/usrloc/README | 106 +++++++++--------- 12 files changed, 438 insertions(+), 445 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7de…

1 0

git:master: sl: documented exported statistics
by Daniel-Constantin Mierla 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: 2f3903e79c5ec1b5aa48e8ca17cce94b3e2e1668 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f3903e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 00:29:14 2011 +0100 sl: documented exported statistics --- modules/sl/doc/sl.xml | 1 + modules/sl/doc/stats.xml | 177 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+), 0 deletions(-) diff --git a/modules/sl/doc/sl.xml b/modules/sl/doc/sl.xml index 7c53efa..5be9974 100644 --- a/modules/sl/doc/sl.xml +++ b/modules/sl/doc/sl.xml @@ -68,5 +68,6 @@ <xi:include href="params.xml"/> <xi:include href="functions.xml"/> + <xi:include href="stats.xml"/> </section> diff --git a/modules/sl/doc/stats.xml b/modules/sl/doc/stats.xml new file mode 100644 index 0000000..d825303 --- /dev/null +++ b/modules/sl/doc/stats.xml @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<section id="sl.stats" xmlns:xi="http://www.w3.org/2001/XInclude"> + + <title>Statistics</title> + + <section id="sl.stats.1xx_replies"> + <title><varname>1xx_replies</varname></title> + <para> + Number of 1xx replies. + </para> + </section> + + <section id="sl.stats.200_replies"> + <title><varname>200_replies</varname></title> + <para> + Number of 201 replies. + </para> + </section> + + <section id="sl.stats.202_replies"> + <title><varname>202_replies</varname></title> + <para> + Number of 202 replies. + </para> + </section> + + <section id="sl.stats.2xx_replies"> + <title><varname>2xx_replies</varname></title> + <para> + Number of 2xx replies. + </para> + </section> + + <section id="sl.stats.300_replies"> + <title><varname>300_replies</varname></title> + <para> + Number of 300 replies. + </para> + </section> + + <section id="sl.stats.301_replies"> + <title><varname>301_replies</varname></title> + <para> + Number of 301 replies. + </para> + </section> + + <section id="sl.stats.302_replies"> + <title><varname>302_replies</varname></title> + <para> + Number of 302 replies. + </para> + </section> + + <section id="sl.stats.3xx_replies"> + <title><varname>3xx_replies</varname></title> + <para> + Number of 3xx replies. + </para> + </section> + + <section id="sl.stats.400_replies"> + <title><varname>400_replies</varname></title> + <para> + Number of 400 replies. + </para> + </section> + + <section id="sl.stats.401_replies"> + <title><varname>401_replies</varname></title> + <para> + Number of 401 replies. + </para> + </section> + + <section id="sl.stats.403_replies"> + <title><varname>403_replies</varname></title> + <para> + Number of 403 replies. + </para> + </section> + + <section id="sl.stats.404_replies"> + <title><varname>404_replies</varname></title> + <para> + Number of 404 replies. + </para> + </section> + + <section id="sl.stats.407_replies"> + <title><varname>407_replies</varname></title> + <para> + Number of 407 replies. + </para> + </section> + + <section id="sl.stats.408_replies"> + <title><varname>408_replies</varname></title> + <para> + Number of 408 replies. + </para> + </section> + + <section id="sl.stats.483_replies"> + <title><varname>483_replies</varname></title> + <para> + Number of 483 replies. + </para> + </section> + + <section id="sl.stats.4xx_replies"> + <title><varname>4xx_replies</varname></title> + <para> + Number of 4xx replies. + </para> + </section> + + <section id="sl.stats.500_replies"> + <title><varname>500_replies</varname></title> + <para> + Number of 500 replies. + </para> + </section> + + <section id="sl.stats.5xx_replies"> + <title><varname>5xx_replies</varname></title> + <para> + Number of 5xx replies. + </para> + </section> + + <section id="sl.stats.6xx_replies"> + <title><varname>6xx_replies</varname></title> + <para> + Number of 6xx replies. + </para> + </section> + + <section id="sl.stats.xxx_replies"> + <title><varname>xxx_replies</varname></title> + <para> + Number of replies whose code don't match any above. + </para> + </section> + + <section id="sl.stats.sent_replies"> + <title><varname>sent_replies</varname></title> + <para> + Number of all sent replies. + </para> + </section> + + <section id="sl.stats.sent_err_replies"> + <title><varname>sent_err_replies</varname></title> + <para> + Number of sent error replies. + </para> + </section> + + <section id="sl.stats.failures"> + <title><varname>failures</varname></title> + <para> + Number of failures. + </para> + </section> + + <section id="sl.stats.received_ACKs"> + <title><varname>received_ACKs</varname></title> + <para> + Number of received ACKs filtered by SL module. + </para> + </section> + +</section>

1 0

git:master: sl: regenerated the readme
by Daniel-Constantin Mierla 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: a3041af64b0f7e5c7de33a90148e070088c2416a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3041af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 00:29:50 2011 +0100 sl: regenerated the readme --- modules/sl/README | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 129 insertions(+), 4 deletions(-) diff --git a/modules/sl/README b/modules/sl/README index 277aeb8..19ae7b6 100644 --- a/modules/sl/README +++ b/modules/sl/README @@ -8,7 +8,7 @@ Daniel-Constantin Mierla asipto.com - Copyright © 2003 FhG FOKUS + Copyright � 2003 FhG FOKUS __________________________________________________________________ 1.1. Overview @@ -24,6 +24,33 @@ Daniel-Constantin Mierla 1.3.2. send_reply(code, reason) 1.3.3. sl_reply_error() + 1.4. Statistics + + 1.4.1. 1xx_replies + 1.4.2. 200_replies + 1.4.3. 202_replies + 1.4.4. 2xx_replies + 1.4.5. 300_replies + 1.4.6. 301_replies + 1.4.7. 302_replies + 1.4.8. 3xx_replies + 1.4.9. 400_replies + 1.4.10. 401_replies + 1.4.11. 403_replies + 1.4.12. 404_replies + 1.4.13. 407_replies + 1.4.14. 408_replies + 1.4.15. 483_replies + 1.4.16. 4xx_replies + 1.4.17. 500_replies + 1.4.18. 5xx_replies + 1.4.19. 6xx_replies + 1.4.20. xxx_replies + 1.4.21. sent_replies + 1.4.22. sent_err_replies + 1.4.23. failures + 1.4.24. received_ACKs + 1.1. Overview The SL module allows ser to act as a stateless UA server and generate @@ -88,7 +115,7 @@ modparam("sl", "bind_tm", 0) # feature disabled 1.3. Functions -1.3.1. sl_send_reply(code, reason) +1.3.1. sl_send_reply(code, reason) For the current request, a reply is sent back having the given code and text reason. The reply is sent stateless, totally independent of the @@ -103,7 +130,7 @@ modparam("sl", "bind_tm", 0) # feature disabled sl_send_reply("404", "Not found"); ... -1.3.2. send_reply(code, reason) +1.3.2. send_reply(code, reason) For the current request, a reply is sent back having the given code and text reason. The reply is sent stateful or stateless, depending of the @@ -124,7 +151,7 @@ send_reply("404", "Not found"); send_reply("403", "Invalid user - $fU"); ... -1.3.3. sl_reply_error() +1.3.3. sl_reply_error() Sends back an error reply describing the nature of the last internal error. Usually this function should be used after a script function @@ -134,3 +161,101 @@ send_reply("403", "Invalid user - $fU"); ... sl_reply_error(); ... + +1.4. Statistics + +1.4.1. 1xx_replies + + Number of 1xx replies. + +1.4.2. 200_replies + + Number of 201 replies. + +1.4.3. 202_replies + + Number of 202 replies. + +1.4.4. 2xx_replies + + Number of 2xx replies. + +1.4.5. 300_replies + + Number of 300 replies. + +1.4.6. 301_replies + + Number of 301 replies. + +1.4.7. 302_replies + + Number of 302 replies. + +1.4.8. 3xx_replies + + Number of 3xx replies. + +1.4.9. 400_replies + + Number of 400 replies. + +1.4.10. 401_replies + + Number of 401 replies. + +1.4.11. 403_replies + + Number of 403 replies. + +1.4.12. 404_replies + + Number of 404 replies. + +1.4.13. 407_replies + + Number of 407 replies. + +1.4.14. 408_replies + + Number of 408 replies. + +1.4.15. 483_replies + + Number of 483 replies. + +1.4.16. 4xx_replies + + Number of 4xx replies. + +1.4.17. 500_replies + + Number of 500 replies. + +1.4.18. 5xx_replies + + Number of 5xx replies. + +1.4.19. 6xx_replies + + Number of 6xx replies. + +1.4.20. xxx_replies + + Number of replies whose code don't match any above. + +1.4.21. sent_replies + + Number of all sent replies. + +1.4.22. sent_err_replies + + Number of sent error replies. + +1.4.23. failures + + Number of failures. + +1.4.24. received_ACKs + + Number of received ACKs filtered by SL module.

1 0

[tracker] Comment added: bad sotket after re-register in location table
by sip-router 20 Dec '11

20 Dec '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#191 - bad sotket after re-register in location table User who did this - Daniel-Constantin Mierla (miconda) ---------- Looks like some part of the code is writing '\0\0' in the place of ':5'. Can you share the actions in routing blocks that are executed for REGISTER requests? Do you have any substitution/replace commands done over sip request? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=191#comment473 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: pdt(k): MI commands can be disabled via define PDT_NO_MI
by Elena-Ramona Modroiu 20 Dec '11

20 Dec '11

Module: sip-router Branch: master Commit: 099852dfb53b922d74bccb17b3a81df012ad37f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=099852d… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Dec 20 21:39:05 2011 +0100 pdt(k): MI commands can be disabled via define PDT_NO_MI --- modules_k/pdt/pdt.c | 4 ++++ modules_k/pdt/pdt_mi.c | 3 +++ modules_k/pdt/pdtree.h | 5 ++++- 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/modules_k/pdt/pdt.c b/modules_k/pdt/pdt.c index 276ea16..2748ea2 100644 --- a/modules_k/pdt/pdt.c +++ b/modules_k/pdt/pdt.c @@ -151,11 +151,15 @@ struct module_exports exports = { */ static int mod_init(void) { + +#ifndef PDT_NO_MI if(pdt_init_mi(exports.name)<0) { LM_ERR("cannot register MI commands\n"); return -1; } +#endif + db_url.len = strlen(db_url.s); db_table.len = strlen(db_table.s); sdomain_column.len = strlen(sdomain_column.s); diff --git a/modules_k/pdt/pdt_mi.c b/modules_k/pdt/pdt_mi.c index deca4de..29d877b 100644 --- a/modules_k/pdt/pdt_mi.c +++ b/modules_k/pdt/pdt_mi.c @@ -23,6 +23,8 @@ * */ +#ifndef PDT_NO_MI + #include <stdio.h> #include <unistd.h> #include <stdlib.h> @@ -281,3 +283,4 @@ error: return 0; } +#endif diff --git a/modules_k/pdt/pdtree.h b/modules_k/pdt/pdtree.h index 610a14d..03055c2 100644 --- a/modules_k/pdt/pdtree.h +++ b/modules_k/pdt/pdtree.h @@ -66,10 +66,13 @@ int pdt_check_pd(pdt_tree_t *pt, str* sdomain, str *sp, str *sd); int pdt_init_db(void); int pdt_load_db(void); -int pdt_init_mi(char *mod); str *pdt_get_char_list(void); pdt_tree_t **pdt_get_ptree(void); +#ifndef PDT_NO_MI +int pdt_init_mi(char *mod); +#endif + #endif

1 0

git:master: pdt(k): added rpc command pdt.reload
by Elena-Ramona Modroiu 20 Dec '11

20 Dec '11

Module: sip-router Branch: master Commit: 29ac2f12f5b475993c5e2be806ecc4c98696e270 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29ac2f1… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Dec 20 21:49:36 2011 +0100 pdt(k): added rpc command pdt.reload - reload database records to pdt cache --- modules_k/pdt/pdt.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/modules_k/pdt/pdt.c b/modules_k/pdt/pdt.c index 2748ea2..fba5f21 100644 --- a/modules_k/pdt/pdt.c +++ b/modules_k/pdt/pdt.c @@ -54,6 +54,8 @@ #include "../../action.h" #include "../../mod_fix.h" #include "../../parser/parse_from.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" #include "pdtree.h" @@ -98,10 +100,11 @@ static void mod_destroy(void); static int child_init(int rank); static int pd_translate(sip_msg_t *msg, str *sdomain, int rmode, int fmode); -static int w_pd_translate(struct sip_msg* msg, char* str1, char* str2); +static int w_pd_translate(struct sip_msg* msg, char* str1, char* str2); static int fixup_translate(void** param, int param_no); static int update_new_uri(struct sip_msg *msg, int plen, str *d, int mode); +static int pdt_init_rpc(void); static cmd_export_t cmds[]={ {"prefix2domain", (cmd_function)w_prefix2domain, 0, 0, @@ -160,6 +163,12 @@ static int mod_init(void) } #endif + if(pdt_init_rpc()<0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + db_url.len = strlen(db_url.s); db_table.len = strlen(db_table.s); sdomain_column.len = strlen(sdomain_column.s); @@ -703,3 +712,46 @@ pdt_tree_t **pdt_get_ptree(void) { return _ptree; } + + +/*** RPC commands implementation ***/ + +static const char* pdt_rpc_reload_doc[2] = { + "Reload PDT database records", + 0 +}; + + +/* + * RPC command to reload pdt db records + */ +static void pdt_rpc_reload(rpc_t* rpc, void* ctx) +{ + if(pdt_load_db()<0) { + LM_ERR("cannot re-load pdt records from database\n"); + rpc->fault(ctx, 500, "Reload Failed"); + return; + } + return; +} + + +rpc_export_t pdt_rpc_cmds[] = { + {"pdt.reload", pdt_rpc_reload, + pdt_rpc_reload_doc, 0}, + {0, 0, 0, 0} +}; + + +/** + * register RPC commands + */ +static int pdt_init_rpc(void) +{ + if (rpc_register_array(pdt_rpc_cmds)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +}

1 0

git:master: pdt(k): updates to documentation
by Elena-Ramona Modroiu 20 Dec '11

20 Dec '11

Module: sip-router Branch: master Commit: fd494bceb1e60e6bb15b5da6820cca4fcd030222 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd494bc… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Dec 20 18:09:49 2011 +0100 pdt(k): updates to documentation - new function pd_translate(dsomain, rmode) --- modules_k/pdt/README | 34 ++++++++++++++++++++++++ modules_k/pdt/doc/pdt_admin.xml | 54 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 1 deletions(-) diff --git a/modules_k/pdt/README b/modules_k/pdt/README index cc2768f..d884b6c 100644 --- a/modules_k/pdt/README +++ b/modules_k/pdt/README @@ -45,6 +45,7 @@ Elena-Ramona Modroiu 4.1. prefix2domain(rewrite_mode, multidomain_mode) 4.2. prefix2domain(rewrite_mode) 4.3. prefix2domain() + 4.4. pd_translate(sdomain, rewrite_mode) 5. MI Commands @@ -66,6 +67,7 @@ Elena-Ramona Modroiu 1.9. Set char_list parameter 1.10. Set check_domain parameter 1.11. prefix2domain usage + 1.12. pd_translate usage Chapter 1. Admin Guide @@ -94,6 +96,7 @@ Chapter 1. Admin Guide 4.1. prefix2domain(rewrite_mode, multidomain_mode) 4.2. prefix2domain(rewrite_mode) 4.3. prefix2domain() + 4.4. pd_translate(sdomain, rewrite_mode) 5. MI Commands @@ -283,6 +286,7 @@ modparam("pdt", "check_domain", 0) 4.1. prefix2domain(rewrite_mode, multidomain_mode) 4.2. prefix2domain(rewrite_mode) 4.3. prefix2domain() + 4.4. pd_translate(sdomain, rewrite_mode) 4.1. prefix2domain(rewrite_mode, multidomain_mode) @@ -344,6 +348,36 @@ prefix2domain("2"); prefix2domain(); ... +4.4. pd_translate(sdomain, rewrite_mode) + + Translate R-URI based on source domain and longest prefix matching. + Returns 1 when the translation was made or there was nothing to + translate. Returns -1 in error cases. + + The translation is done based on lookup up for an entry in the database + where the sdomain parameter equals the sdomain in database table. + + The “sdomain” parameter specifies the source domain to be used to match + the longest prefix. Can be a static string or dynamic parameter with + variables inside. + + The “rewrite_mode” parameter specifies whether to strip or not the + prefix from user part. The possible values are: + * 0: the prefix is removed along with the leading prefix. + * 1: only the leading prefix is removed. + * 2: the user part of the URI is not changed. + * $PV : any PV holding one of the above values. + + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE or + BRANCH_ROUTE. + + Example 1.12. pd_translate usage +... +pd_translate("$fd", "2"); +... +pd_translate("*", "$var(a)"); +... + 5. MI Commands 5.1. pdt_list diff --git a/modules_k/pdt/doc/pdt_admin.xml b/modules_k/pdt/doc/pdt_admin.xml index 8183887..a43e934 100644 --- a/modules_k/pdt/doc/pdt_admin.xml +++ b/modules_k/pdt/doc/pdt_admin.xml @@ -411,9 +411,61 @@ prefix2domain(); </programlisting> </section> + <section> + <title> + <function moreinfo="none">pd_translate(sdomain, rewrite_mode)</function> + </title> + <para> + Translate R-URI based on source domain and longest prefix matching. + Returns 1 when the translation was made or there was nothing to translate. + Returns -1 in error cases. + </para> + <para> + The translation is done based on lookup up for an entry in the database + where the sdomain parameter equals the sdomain in database table. + </para> + <para> + The <quote>sdomain</quote> parameter specifies the source domain to be + used to match the longest prefix. Can be a static string or dynamic parameter + with variables inside. + </para> + <para> + The <quote>rewrite_mode</quote> parameter specifies whether to strip or not + the prefix from user part. The possible values are: + </para> + <itemizedlist> + <listitem> + <para>0: the prefix is removed along with the leading prefix.</para> + </listitem> + <listitem> + <para>1: only the leading prefix is removed.</para> + </listitem> + <listitem> + <para>2: the user part of the URI is not changed.</para> + </listitem> + <listitem> + <para>$PV : any PV holding one of the above values.</para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE or + BRANCH_ROUTE. + </para> + <example> + <title><function>pd_translate</function> usage</title> + <programlisting format="linespecific"> +... +pd_translate("$fd", "2"); +... +pd_translate("*", "$var(a)"); +... +</programlisting> + </example> + </section> + </section> - <section> + <section> <title>MI Commands</title> <para> The database is loaded by &kamailio; at start up time.

1 0

git:master: pdt: refactored prefix-domain translation
by Elena-Ramona Modroiu 20 Dec '11

20 Dec '11

Module: sip-router Branch: master Commit: eaa899bc5ca5b0331e83a849b7ce0abf214eb364 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eaa899b… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Dec 20 17:58:42 2011 +0100 pdt: refactored prefix-domain translation - use internally a function that can take the source domain as parameter - new function to config pd_translate(sdomain, flags) to allow source domain to be given from config file --- modules_k/pdt/Makefile | 1 + modules_k/pdt/pdt.c | 218 +++++++++++++++++++++++++---------------------- 2 files changed, 117 insertions(+), 102 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=eaa…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2011