sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
420 discussions

git:master:e2f50d83: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: e2f50d830e9bbec55965fec6c35d30d73e81ccdd URL: https://github.com/kamailio/kamailio/commit/e2f50d830e9bbec55965fec6c35d30d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-01T14:01:19+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/e2f50d830e9bbec55965fec6c35d30d… Patch: https://github.com/kamailio/kamailio/commit/e2f50d830e9bbec55965fec6c35d30d… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index 7dfba63f13..b9a701d5c6 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -55,9 +55,10 @@ Daniel-Constantin Mierla 4.15. sbranch_append() 4.16. sbranch_reset() 4.17. pv_xavp_print() - 4.18. pv_var_to_xavp(varname, xname) - 4.19. pv_xavp_to_var(xname) - 4.20. pv_evalx(dst, fmt) + 4.18. pv_xavu_print() + 4.19. pv_var_to_xavp(varname, xname) + 4.20. pv_xavp_to_var(xname) + 4.21. pv_evalx(dst, fmt) 5. RPC Commands @@ -86,11 +87,12 @@ Daniel-Constantin Mierla 1.18. sbranch_append() usage 1.19. sbranch_append() usage 1.20. pv_xavp_print() usage - 1.21. pv_var_to_xavp() usage - 1.22. pv_xavp_to_var() usage + 1.21. pv_xavu_print() usage + 1.22. pv_var_to_xavp() usage 1.23. pv_xavp_to_var() usage - 1.24. pv.shvSet usage - 1.25. pv.shvGet usage + 1.24. pv_xavp_to_var() usage + 1.25. pv.shvSet usage + 1.26. pv.shvGet usage Chapter 1. Admin Guide @@ -129,9 +131,10 @@ Chapter 1. Admin Guide 4.15. sbranch_append() 4.16. sbranch_reset() 4.17. pv_xavp_print() - 4.18. pv_var_to_xavp(varname, xname) - 4.19. pv_xavp_to_var(xname) - 4.20. pv_evalx(dst, fmt) + 4.18. pv_xavu_print() + 4.19. pv_var_to_xavp(varname, xname) + 4.20. pv_xavp_to_var(xname) + 4.21. pv_evalx(dst, fmt) 5. RPC Commands @@ -240,9 +243,10 @@ modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") 4.15. sbranch_append() 4.16. sbranch_reset() 4.17. pv_xavp_print() - 4.18. pv_var_to_xavp(varname, xname) - 4.19. pv_xavp_to_var(xname) - 4.20. pv_evalx(dst, fmt) + 4.18. pv_xavu_print() + 4.19. pv_var_to_xavp(varname, xname) + 4.20. pv_xavp_to_var(xname) + 4.21. pv_evalx(dst, fmt) 4.1. pv_isset(pvar) @@ -562,7 +566,18 @@ sbranch_reset(); pv_xavp_print(); ... -4.18. pv_var_to_xavp(varname, xname) +4.18. pv_xavu_print() + + Print all XAVUs to the syslog using INFO log level. + + Function can be used from ANY_ROUTE. + + Example 1.21. pv_xavu_print() usage +... +pv_xavu_print(); +... + +4.19. pv_var_to_xavp(varname, xname) Copy the script variable value into an xavp. @@ -574,7 +589,7 @@ pv_xavp_print(); Function can be used from ANY_ROUTE. - Example 1.21. pv_var_to_xavp() usage + Example 1.22. pv_var_to_xavp() usage ... $var("temp") = 3; $var("foo") = "foo indeed"; @@ -588,7 +603,7 @@ $xavp("ok[0]=>temp") now is 3 $xavp("ok[0]=>foo") now is "foo indeed" ... -4.19. pv_xavp_to_var(xname) +4.20. pv_xavp_to_var(xname) Copy xavp values into vars. Reverse of pv_var_to_xavp(). @@ -596,7 +611,7 @@ $xavp("ok[0]=>foo") now is "foo indeed" Function can be used from ANY_ROUTE. - Example 1.22. pv_xavp_to_var() usage + Example 1.23. pv_xavp_to_var() usage ... $xavp("bar=>temp") = 3; $xavp("bar[0]=>foo") = "foo indeed"; @@ -606,7 +621,7 @@ $var("temp") now is 3 $var("foo") now is "foo indeed" ... -4.20. pv_evalx(dst, fmt) +4.21. pv_evalx(dst, fmt) The fmt string is evaluated twice for exiting variables, the result is stored in dst variable. The dst must be the name of a writable @@ -615,7 +630,7 @@ $var("foo") now is "foo indeed" Function can be used from ANY_ROUTE. - Example 1.23. pv_xavp_to_var() usage + Example 1.24. pv_xavp_to_var() usage ... $var(x) = "test"; $var(y) = "$var(x)" @@ -640,7 +655,7 @@ pv_evalx("$var(z)", "$var(y) one"); + “str”: string value * _value_: value to be set - Example 1.24. pv.shvSet usage + Example 1.25. pv.shvSet usage ... $ kamcmd pv.shvSet debug int 3 ... @@ -654,7 +669,7 @@ $ kamcmd pv.shvSet debug int 3 If no name is given, all shared variables are listed. - Example 1.25. pv.shvGet usage + Example 1.26. pv.shvGet usage ... $ kamcmd pv.shvGet debug ...

1 0

git:master:3a744fc6: pv: docs for pv_xavu_print() function
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: 3a744fc65501d3cc21ebf020fdf821f2a1b2614f URL: https://github.com/kamailio/kamailio/commit/3a744fc65501d3cc21ebf020fdf821f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T13:48:43+02:00 pv: docs for pv_xavu_print() function --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3a744fc65501d3cc21ebf020fdf821f… Patch: https://github.com/kamailio/kamailio/commit/3a744fc65501d3cc21ebf020fdf821f… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 86186e02fe..88ca172eda 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -613,6 +613,25 @@ sbranch_reset(); <programlisting format="linespecific"> ... pv_xavp_print(); +... + </programlisting> + </example> + </section> + <section id="pv.f.pv_xavu_print"> + <title> + <function moreinfo="none">pv_xavu_print()</function> + </title> + <para> + Print all XAVUs to the syslog using INFO log level. + </para> + <para> + Function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pv_xavu_print()</function> usage</title> + <programlisting format="linespecific"> +... +pv_xavu_print(); ... </programlisting> </example>

1 0

git:master:bd1ca183: pv: config and kemi functions to print xavu vars
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: bd1ca1839ac0d70c70bbbe3a98e5845129cb2567 URL: https://github.com/kamailio/kamailio/commit/bd1ca1839ac0d70c70bbbe3a98e5845… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T13:47:21+02:00 pv: config and kemi functions to print xavu vars --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/bd1ca1839ac0d70c70bbbe3a98e5845… Patch: https://github.com/kamailio/kamailio/commit/bd1ca1839ac0d70c70bbbe3a98e5845… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index fd123a42a3..7931056ec6 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -572,6 +572,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE }, {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, ANY_ROUTE }, + {"pv_xavu_print", (cmd_function)pv_xavu_print, 0, 0, 0, + ANY_ROUTE }, {"pv_var_to_xavp", (cmd_function)w_var_to_xavp, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE }, {"pv_xavp_to_var", (cmd_function)w_xavp_to_var, 1, fixup_spve_null, @@ -822,6 +824,12 @@ static int ki_xavp_print(sip_msg_t* msg) return 1; } +static int ki_xavu_print(sip_msg_t* msg) +{ + xavu_print_list(NULL); + return 1; +} + /** * */ @@ -1859,6 +1867,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("pv_xavu_print"), + SR_KEMIP_INT, ki_xavu_print, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_params_explode"), SR_KEMIP_INT, ki_xavp_params_explode, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 5b14b1a3a7..0cdef80a0e 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -568,6 +568,12 @@ int pv_xavp_print(sip_msg_t* msg, char* s1, char *s2) return 1; } +int pv_xavu_print(sip_msg_t* msg, char* s1, char *s2) +{ + xavu_print_list(NULL); + return 1; +} + /** * */ diff --git a/src/modules/pv/pv_xavp.h b/src/modules/pv/pv_xavp.h index 6f2e9f474b..3d56be5a58 100644 --- a/src/modules/pv/pv_xavp.h +++ b/src/modules/pv/pv_xavp.h @@ -33,6 +33,7 @@ int pv_set_xavu(struct sip_msg* msg, pv_param_t *param, int pv_parse_xavu_name(pv_spec_p sp, str *in); int pv_xavp_print(struct sip_msg* msg, char* s1, char *s2); +int pv_xavu_print(struct sip_msg* msg, char* s1, char *s2); int xavp_params_explode(str *params, str *xname);

1 0

git:master:729dac66: core: exposed xavu_print_list() function
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: 729dac6667b8ba4f7b417351770fda3e2ecb7b8c URL: https://github.com/kamailio/kamailio/commit/729dac6667b8ba4f7b417351770fda3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T13:43:55+02:00 core: exposed xavu_print_list() function --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/729dac6667b8ba4f7b417351770fda3… Patch: https://github.com/kamailio/kamailio/commit/729dac6667b8ba4f7b417351770fda3… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 492bef21f3..12c52512fd 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1102,6 +1102,11 @@ void xavu_print_list_content(sr_xavp_t **head, int level) xavx_print_list_content("XAVU", head, _xavu_list_crt, level); } +void xavu_print_list(sr_xavp_t **head) +{ + xavu_print_list_content(head, 0); +} + /** * */ diff --git a/src/core/xavp.h b/src/core/xavp.h index 59a075ecc0..66addbfff8 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -114,6 +114,7 @@ int xavp_set_child_sval(str *rname, str *cname, str *sval); /** xavu api */ void xavu_print_list_content(sr_xavp_t **head, int level); +void xavu_print_list(sr_xavp_t **head); #define xavu_destroy_list_unsafe xavp_destroy_list_unsafe #define xavu_destroy_list xavp_destroy_list void xavu_reset_list(void);

1 0

git:master:af0d730f: pv: $xavu(...) config variables implementation
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: af0d730fd8f8dbbebdb223f57e452e67c00ce862 URL: https://github.com/kamailio/kamailio/commit/af0d730fd8f8dbbebdb223f57e452e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T13:37:08+02:00 pv: $xavu(...) config variables implementation - single (unique) value variables similar to $xavp(...) - support for root list values: $xavu(x) - support for child list values: $xavu(x=>y) - values can be int or string - assign to $null deletes the $xavu(...) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/af0d730fd8f8dbbebdb223f57e452e6… Patch: https://github.com/kamailio/kamailio/commit/af0d730fd8f8dbbebdb223f57e452e6…

1 0

git:master:77ae0e27: core: function to print xavus for debugging
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: 77ae0e27fe8337c41d090e43060092e0658a4ad1 URL: https://github.com/kamailio/kamailio/commit/77ae0e27fe8337c41d090e43060092e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T13:36:24+02:00 core: function to print xavus for debugging --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/77ae0e27fe8337c41d090e43060092e… Patch: https://github.com/kamailio/kamailio/commit/77ae0e27fe8337c41d090e43060092e…

1 0

git:master:5a719961: tm: process xavu list in transaction contexts
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: 5a7199611a1c7c001f41d125a3ce89eebb08470c URL: https://github.com/kamailio/kamailio/commit/5a7199611a1c7c001f41d125a3ce89e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T10:43:21+02:00 tm: process xavu list in transaction contexts --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/5a7199611a1c7c001f41d125a3ce89e… Patch: https://github.com/kamailio/kamailio/commit/5a7199611a1c7c001f41d125a3ce89e…

1 0

git:master:621ba8bc: core: receive - reset xavu list after message processing
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: 621ba8bc1895e8b51e1eff6cbd32d391867d5c80 URL: https://github.com/kamailio/kamailio/commit/621ba8bc1895e8b51e1eff6cbd32d39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T10:42:04+02:00 core: receive - reset xavu list after message processing --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/621ba8bc1895e8b51e1eff6cbd32d39… Patch: https://github.com/kamailio/kamailio/commit/621ba8bc1895e8b51e1eff6cbd32d39… --- diff --git a/src/core/receive.c b/src/core/receive.c index 428214df68..1bf288420d 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -555,10 +555,11 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) } /** - * clean up msg environment, such as avp and xavp lists + * clean up msg environment, such as avp, xavp and xavu lists */ void ksr_msg_env_reset(void) { reset_avps(); xavp_reset_list(); + xavu_reset_list(); }

1 0

git:master:b536f6d5: core: pv - define xavu types
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: b536f6d5e8ffdc08b8d4a40e3236d305cf4fa03f URL: https://github.com/kamailio/kamailio/commit/b536f6d5e8ffdc08b8d4a40e3236d30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T10:40:38+02:00 core: pv - define xavu types --- Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/b536f6d5e8ffdc08b8d4a40e3236d30… Patch: https://github.com/kamailio/kamailio/commit/b536f6d5e8ffdc08b8d4a40e3236d30… --- diff --git a/src/core/pvar.h b/src/core/pvar.h index 2a249ea118..ffde26dedb 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -77,8 +77,8 @@ enum _pv_type { PVT_DSTURI, PVT_COLOR, PVT_BRANCH, PVT_FROM, PVT_TO, PVT_OURI, PVT_SCRIPTVAR, PVT_MSG_BODY, PVT_CONTEXT, - PVT_XAVP, PVT_HDRC, PVT_OTHER, - PVT_EXTRA /* keep it last */ + PVT_XAVP, PVT_XAVU, PVT_HDRC, + PVT_OTHER, PVT_EXTRA /* keep it last */ }; typedef enum _pv_type pv_type_t; @@ -306,6 +306,14 @@ typedef struct _pv_xavp_name { struct _pv_xavp_name *next; } pv_xavp_name_t; +/** + * XAVU + */ +typedef struct _pv_xavu_name { + str name; + struct _pv_xavu_name *next; +} pv_xavu_name_t; + int pv_eval_str(sip_msg_t *msg, str *dst, str *src); #endif

1 0

git:master:db826033: core: xavu api - like xavp but with single value items
by Daniel-Constantin Mierla 01 Apr '20

01 Apr '20

Module: kamailio Branch: master Commit: db826033759f1931686a061652d4b779e274bb70 URL: https://github.com/kamailio/kamailio/commit/db826033759f1931686a061652d4b77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-01T10:39:24+02:00 core: xavu api - like xavp but with single value items - simplified version without indexes --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/db826033759f1931686a061652d4b77… Patch: https://github.com/kamailio/kamailio/commit/db826033759f1931686a061652d4b77…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020