sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:5.4:e93b62f2: secsipid: docs - small typo

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: e93b62f2f9a27943d68b1e2a8b2529f37a419292 URL: https://github.com/kamailio/kamailio/commit/e93b62f2f9a27943d68b1e2a8b2529f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:55:00+02:00 secsipid: docs - small typo (cherry picked from commit f74f1df842815e8a42d1b4f71b6f98287a625d41) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e93b62f2f9a27943d68b1e2a8b2529f… Patch: https://github.com/kamailio/kamailio/commit/e93b62f2f9a27943d68b1e2a8b2529f… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index ac5884679f..510da9159d 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -110,7 +110,7 @@ modparam("secsipid", "timeout", 2) the function is downloading the key using the URL from "info" parameter of the Identity header, using the value od "timeout" parameter to limit the download time. The validity of the JWT - body in the Identity header is also checjed against the "expire" + body in the Identity header is also checked against the "expire" parameter. </para> <para>

3 years, 8 months

git:master:37820f70: modules: readme files regenerated - jansson ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 37820f709cd437a63d8f655aec876aa8ee9d71f2 URL: https://github.com/kamailio/kamailio/commit/37820f709cd437a63d8f655aec876aa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-23T10:46:37+02:00 modules: readme files regenerated - jansson ... [skip ci] --- Modified: src/modules/jansson/README --- Diff: https://github.com/kamailio/kamailio/commit/37820f709cd437a63d8f655aec876aa… Patch: https://github.com/kamailio/kamailio/commit/37820f709cd437a63d8f655aec876aa… --- diff --git a/src/modules/jansson/README b/src/modules/jansson/README index a68d7f43f0..92b455c56c 100644 --- a/src/modules/jansson/README +++ b/src/modules/jansson/README @@ -33,7 +33,9 @@ Carsten Bock 3.2. jansson_set(type, key/path, value, result) 3.3. jansson_append(type, key/path, value, result) 3.4. jansson_array_size(key/path, src, dst) - 3.5. jansson_get_field(src, field_name, dst) + 3.5. jansson_xdecode(json, xavp) + 3.6. jansson_xencode(xavp, pv) + 3.7. jansson_get_field(src, field_name, dst) List of Examples @@ -42,7 +44,9 @@ Carsten Bock 1.3. jansson_append usage 1.4. jansson_array_size usage 1.5. array concatenation - 1.6. jansson_get_field usage + 1.6. jansson_xdecode usage + 1.7. jansson_xencode usage + 1.8. jansson_get_field usage Chapter 1. Admin Guide @@ -60,7 +64,9 @@ Chapter 1. Admin Guide 3.2. jansson_set(type, key/path, value, result) 3.3. jansson_append(type, key/path, value, result) 3.4. jansson_array_size(key/path, src, dst) - 3.5. jansson_get_field(src, field_name, dst) + 3.5. jansson_xdecode(json, xavp) + 3.6. jansson_xencode(xavp, pv) + 3.7. jansson_get_field(src, field_name, dst) 1. Overview @@ -89,7 +95,9 @@ Chapter 1. Admin Guide 3.2. jansson_set(type, key/path, value, result) 3.3. jansson_append(type, key/path, value, result) 3.4. jansson_array_size(key/path, src, dst) - 3.5. jansson_get_field(src, field_name, dst) + 3.5. jansson_xdecode(json, xavp) + 3.6. jansson_xencode(xavp, pv) + 3.7. jansson_get_field(src, field_name, dst) 3.1. jansson_get(key/path, src, dst) @@ -223,7 +231,31 @@ while($var(count) < $var(appendme_size)) { } ... -3.5. jansson_get_field(src, field_name, dst) +3.5. jansson_xdecode(json, xavp) + + Parse a JSON string in 'json' and store the elements in xapv 'xavp'. + Top-level JSON must be an object or an array of objects. Nested arrays + and objects are not decoded but stored as string. + + Example 1.6. jansson_xdecode usage +... +jansson_xdecode('{"foo":"bar"}', "js"); +xlog("foo is $xavp(js=>foo)"); +... + +3.6. jansson_xencode(xavp, pv) + + Encode the items in the xavp 'xavp' as JSON and store the result in a + pv. Nested xavps's are not supported. + + Example 1.7. jansson_xencode usage +... +$xavp(a=>foo) = "bar"; +jansson_xencode("a", "$var(js)"); +# $var(js) = '{"foo":"bar"}' +... + +3.7. jansson_get_field(src, field_name, dst) Copy field 'field_name' from json object 'src' and store it in pvar 'dst'. @@ -232,7 +264,7 @@ while($var(count) < $var(appendme_size)) { now it is just a wrapper around jansson_get, and its functionality is the same. - Example 1.6. jansson_get_field usage + Example 1.8. jansson_get_field usage ... jansson_get_field("{'foo':'bar'}", "foo", "$var(foo)"); xlog("foo is $var(foo)");

3 years, 8 months

[kamailio/kamailio] tm: Fix faked_reply_prio by passing correct reply to get_prio (#2515)

by Alex Hermann

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Instead of passing the to be evaluated reply as the "best" reply, pass the actual "best" reply. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2515 -- Commit Summary -- * tm: Fix faked_reply_prio by passing correct reply to get_prio -- File Changes -- M src/modules/tm/t_reply.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2515.patch https://github.com/kamailio/kamailio/pull/2515.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2515

3 years, 8 months

git:master:5731cc09: tm: Fix faked_reply_prio by passing correct reply to get_prio

by Alex Hermann

Module: kamailio Branch: master Commit: 5731cc0911ff65bf7efd433a83a25ffbf6073d10 URL: https://github.com/kamailio/kamailio/commit/5731cc0911ff65bf7efd433a83a25ff… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-19T15:36:37+02:00 tm: Fix faked_reply_prio by passing correct reply to get_prio Instead of passing the to be evaluated reply as the "best" reply, pass the actual "best" reply. --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/5731cc0911ff65bf7efd433a83a25ff… Patch: https://github.com/kamailio/kamailio/commit/5731cc0911ff65bf7efd433a83a25ff… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 328c6743d4..2324e29e59 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1249,17 +1249,19 @@ inline static short int get_prio(unsigned int resp, struct sip_msg *rpl) int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) { int best_b, best_s, b; - sip_msg_t *rpl; + sip_msg_t *rpl, *best_rpl; best_b=-1; best_s=0; + best_rpl=NULL; for ( b=0; b<t->nr_of_outgoings ; b++ ) { rpl = t->uac[b].reply; /* "fake" for the currently processed branch */ if (b==inc_branch) { - if (get_prio(inc_code, rpl)<get_prio(best_s, rpl)) { + if (get_prio(inc_code, rpl)<get_prio(best_s, best_rpl)) { best_b=b; best_s=inc_code; + best_rpl=rpl; } continue; } @@ -1275,9 +1277,10 @@ int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) return -2; /* if reply is null => t_send_branch "faked" reply, skip over it */ if ( rpl && - get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, rpl) ) { + get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, best_rpl) ) { best_b =b; best_s = t->uac[b].last_received; + best_rpl=rpl; } } /* find lowest branch */

3 years, 8 months

git:master:352830ca: Merge pull request #2515 from gaaf/fixes/tm-pick-branch

by GitHub

Module: kamailio Branch: master Commit: 352830ca7c39032dfaecbcb1a6b1bb0865ee55d3 URL: https://github.com/kamailio/kamailio/commit/352830ca7c39032dfaecbcb1a6b1bb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-23T10:35:44+02:00 Merge pull request #2515 from gaaf/fixes/tm-pick-branch tm: Fix faked_reply_prio by passing correct reply to get_prio --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/352830ca7c39032dfaecbcb1a6b1bb0… Patch: https://github.com/kamailio/kamailio/commit/352830ca7c39032dfaecbcb1a6b1bb0… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 328c6743d4..2324e29e59 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1249,17 +1249,19 @@ inline static short int get_prio(unsigned int resp, struct sip_msg *rpl) int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) { int best_b, best_s, b; - sip_msg_t *rpl; + sip_msg_t *rpl, *best_rpl; best_b=-1; best_s=0; + best_rpl=NULL; for ( b=0; b<t->nr_of_outgoings ; b++ ) { rpl = t->uac[b].reply; /* "fake" for the currently processed branch */ if (b==inc_branch) { - if (get_prio(inc_code, rpl)<get_prio(best_s, rpl)) { + if (get_prio(inc_code, rpl)<get_prio(best_s, best_rpl)) { best_b=b; best_s=inc_code; + best_rpl=rpl; } continue; } @@ -1275,9 +1277,10 @@ int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) return -2; /* if reply is null => t_send_branch "faked" reply, skip over it */ if ( rpl && - get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, rpl) ) { + get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, best_rpl) ) { best_b =b; best_s = t->uac[b].last_received; + best_rpl=rpl; } } /* find lowest branch */

3 years, 8 months

[kamailio/kamailio] tmx: Allow $T_branch(flags) in onreply_route (#2516)

by Alex Hermann

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Allow $T_branch(flags) in onreply_route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2516 -- Commit Summary -- * tmx: Allow $T_branch(flags) in onreply_route -- File Changes -- M src/modules/tmx/t_var.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2516.patch https://github.com/kamailio/kamailio/pull/2516.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2516

3 years, 8 months

git:master:d161d452: tmx: Allow $T_branch(flags) in onreply_route

by Alex Hermann

Module: kamailio Branch: master Commit: d161d4523fc6b0619defe918bc204cc7a9cae073 URL: https://github.com/kamailio/kamailio/commit/d161d4523fc6b0619defe918bc204cc… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-19T15:46:37+02:00 tmx: Allow $T_branch(flags) in onreply_route --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/d161d4523fc6b0619defe918bc204cc… Patch: https://github.com/kamailio/kamailio/commit/d161d4523fc6b0619defe918bc204cc… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 1aa1dc0cff..3e977c9877 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -805,14 +805,24 @@ int pv_get_t_branch(struct sip_msg *msg, pv_param_t *param, " in MODE_ONFAILURE\n", branch); return pv_get_null(msg, param, res); } - res->ri = t->uac[branch].branch_flags; - res->flags = PV_VAL_INT; - LM_DBG("branch flags is [%u]\n", res->ri); + break; + case TM_ONREPLY_ROUTE: + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx == NULL) { + LM_ERR("no reply branch\n"); + return pv_get_null(msg, param, res); + } + branch = tcx->branch_index; break; default: LM_ERR("unsupported route_type %d\n", get_route_type()); return pv_get_null(msg, param, res); } + if(branch<0 || branch>=t->nr_of_outgoings) { + return pv_get_null(msg, param, res); + } + LM_DBG("branch flags is [%u]\n", t->uac[branch].branch_flags); + return pv_get_uintval(msg, param, res, t->uac[branch].branch_flags); break; case 6: /* $T_branch(uri) */ if (get_route_type() != TM_ONREPLY_ROUTE) {

3 years, 8 months

git:master:78d680fb: Merge pull request #2516 from gaaf/features/tm-branch-flags-in-reply

by GitHub

Module: kamailio Branch: master Commit: 78d680fbae05c40a0de7a8100e76be20b06b99e4 URL: https://github.com/kamailio/kamailio/commit/78d680fbae05c40a0de7a8100e76be2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-23T10:33:57+02:00 Merge pull request #2516 from gaaf/features/tm-branch-flags-in-reply tmx: Allow $T_branch(flags) in onreply_route --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/78d680fbae05c40a0de7a8100e76be2… Patch: https://github.com/kamailio/kamailio/commit/78d680fbae05c40a0de7a8100e76be2… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 1aa1dc0cff..3e977c9877 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -805,14 +805,24 @@ int pv_get_t_branch(struct sip_msg *msg, pv_param_t *param, " in MODE_ONFAILURE\n", branch); return pv_get_null(msg, param, res); } - res->ri = t->uac[branch].branch_flags; - res->flags = PV_VAL_INT; - LM_DBG("branch flags is [%u]\n", res->ri); + break; + case TM_ONREPLY_ROUTE: + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx == NULL) { + LM_ERR("no reply branch\n"); + return pv_get_null(msg, param, res); + } + branch = tcx->branch_index; break; default: LM_ERR("unsupported route_type %d\n", get_route_type()); return pv_get_null(msg, param, res); } + if(branch<0 || branch>=t->nr_of_outgoings) { + return pv_get_null(msg, param, res); + } + LM_DBG("branch flags is [%u]\n", t->uac[branch].branch_flags); + return pv_get_uintval(msg, param, res, t->uac[branch].branch_flags); break; case 6: /* $T_branch(uri) */ if (get_route_type() != TM_ONREPLY_ROUTE) {

3 years, 8 months

[kamailio/kamailio] jansson: Add en-/decode to/from xavp (#2513)

by Alex Hermann

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add functions to encode and decode JSON from/to an xavp You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2513 -- Commit Summary -- * jansson: Add en-/decode to/from xavp -- File Changes -- M src/modules/jansson/doc/jansson_admin.xml (38) M src/modules/jansson/jansson_funcs.c (191) M src/modules/jansson/jansson_funcs.h (2) M src/modules/jansson/jansson_mod.c (44) M src/modules/jansson/jansson_utils.c (51) M src/modules/jansson/jansson_utils.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2513.patch https://github.com/kamailio/kamailio/pull/2513.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2513

3 years, 8 months

git:master:554a0d44: Merge pull request #2513 from gaaf/features/jansson-xavp

by GitHub

Module: kamailio Branch: master Commit: 554a0d4424fd0c4d3a4a562e175ae3ed1722d504 URL: https://github.com/kamailio/kamailio/commit/554a0d4424fd0c4d3a4a562e175ae3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-23T10:33:12+02:00 Merge pull request #2513 from gaaf/features/jansson-xavp jansson: Add en-/decode to/from xavp --- Modified: src/modules/jansson/doc/jansson_admin.xml Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h Modified: src/modules/jansson/jansson_mod.c Modified: src/modules/jansson/jansson_utils.c Modified: src/modules/jansson/jansson_utils.h --- Diff: https://github.com/kamailio/kamailio/commit/554a0d4424fd0c4d3a4a562e175ae3e… Patch: https://github.com/kamailio/kamailio/commit/554a0d4424fd0c4d3a4a562e175ae3e…

3 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020