sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
313 discussions

[kamailio/kamailio] tmx: add t_drop (#1726)

by lazedo

#### 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  we have a use case where we need to drop the request within a transaction, and that is not possible because tm module will always send the final reply. ``` route[MYREQ] { ## protect from retrans if (!t_newtran()) { xlog("L_ERROR", "$ci|log|failed to create transaction\n"); drop; } if(some early business use case that requires drop) { xlog("L_INFO", "$ci|log|dropping request\n"); t_drop(); } async_func_that_suspends_and_continues("$anyparam", "TR_OK", "TR_ERROR"); } failure_route[TR_ERROR] { xlog("L_INFO", "$ci|log|failed $T_reply_code $T_reply_reason\n"); t_drop(); } onreply_route[TR_OK] { xlog("L_INFO", "$ci|log|checking transaction result\n"); if(some business use case that requires dropping the request) { t_drop(); } ... } ``` if we use `drop` instead of `t_drop` , we always get a final reply sent to the requestor not sure if this is the right approach to the problem but at least fixes for us and can start the discussion. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1726 -- Commit Summary -- * tmx: add t_drop -- File Changes -- M src/modules/tmx/tmx_mod.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1726.patch https://github.com/kamailio/kamailio/pull/1726.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/1726

5 years, 8 months

git:master:bdad243d: tmx: exported t_drop functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bdad243dfb5a56c052eaa01150bbfc4696bd2ccb URL: https://github.com/kamailio/kamailio/commit/bdad243dfb5a56c052eaa01150bbfc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-03T21:01:39+01:00 tmx: exported t_drop functions to kemi framework --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bdad243dfb5a56c052eaa01150bbfc4… Patch: https://github.com/kamailio/kamailio/commit/bdad243dfb5a56c052eaa01150bbfc4… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index c31eae6713..1dc22f4f27 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -704,17 +704,9 @@ static int t_is_request_route(sip_msg_t* msg) /** * */ -static int w_t_drop1(sip_msg_t* msg, char *p1, char *p2) +static int ki_t_drop_rcode(sip_msg_t* msg, int rcode) { tm_cell_t *t = 0; - unsigned int uas_status = 500; - - if(p1) { - if(fixup_get_ivalue(msg, (gparam_p)p1, (int*)&uas_status)<0) - { - uas_status = 500; - } - } t=_tmx_tmb.t_gett(); if (t==NULL || t==T_UNDEFINED) { @@ -722,19 +714,42 @@ static int w_t_drop1(sip_msg_t* msg, char *p1, char *p2) return -1; } - t->uas.status = uas_status; + t->uas.status = (unsigned int)rcode; if(t_is_request_route(msg) == 1) { _tmx_tmb.t_release(msg); } return 0; } +/** + * + */ +static int ki_t_drop(sip_msg_t* msg) +{ + return ki_t_drop_rcode(msg, 500); +} + +/** + * + */ +static int w_t_drop1(sip_msg_t* msg, char *p1, char *p2) +{ + int uas_status = 500; + + if(p1) { + if(fixup_get_ivalue(msg, (gparam_t*)p1, &uas_status)<0) { + uas_status = 500; + } + } + return ki_t_drop_rcode(msg, uas_status); +} + /** * */ static int w_t_drop0(sip_msg_t* msg, char *p1, char *p2) { - return w_t_drop1(msg, NULL, NULL); + return ki_t_drop_rcode(msg, 500); } @@ -1140,6 +1155,16 @@ static sr_kemi_t sr_kemi_tmx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tmx"), str_init("t_drop"), + SR_KEMIP_INT, ki_t_drop, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tmx"), str_init("t_drop_rcode"), + SR_KEMIP_INT, ki_t_drop_rcode, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

5 years, 8 months

git:master:9eaea57f: tmx: new function t_drop([rcode])

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9eaea57fd7e43c538a13d87c73a48786e287d113 URL: https://github.com/kamailio/kamailio/commit/9eaea57fd7e43c538a13d87c73a4878… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-03T20:53:28+01:00 tmx: new function t_drop([rcode]) - based on GH #1726 --- Modified: src/modules/tmx/doc/tmx_admin.xml Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9eaea57fd7e43c538a13d87c73a4878… Patch: https://github.com/kamailio/kamailio/commit/9eaea57fd7e43c538a13d87c73a4878… --- diff --git a/src/modules/tmx/doc/tmx_admin.xml b/src/modules/tmx/doc/tmx_admin.xml index 19c808c931..e6646ecdb7 100644 --- a/src/modules/tmx/doc/tmx_admin.xml +++ b/src/modules/tmx/doc/tmx_admin.xml @@ -432,6 +432,60 @@ route[MYROUTE] { </programlisting> </example> </section> + <section id="tmx.f.t_drop"> + <title> + <function moreinfo="none">t_drop([rcode]) + </function> + </title> + <para> + Drops the transaction with response code (500 default). + </para> + <para> + Parameters:. + </para> + <itemizedlist> + <listitem><para> + <emphasis>rcode</emphasis> - response code to set in uas status. + </para></listitem> + </itemizedlist> + <para> + This function can be used in ANY_ROUTE. + </para> + <example> + <title><function>t_drop</function> usage</title> + <programlisting format="linespecific"> +... +route[MYREQ] +{ +... + if (!t_newtran()) { + xlog("L_ERROR", "$ci|log|failed to create transaction\n"); + drop; + } + + t_on_failure("TR_ERROR"); + t_on_reply("TR_OK"); + t_relay(); +} + +failure_route[TR_ERROR] +{ + xlog("L_INFO", "$ci|log|failed $T_reply_code $T_reply_reason\n"); + t_drop(); +} + +onreply_route[TR_OK] +{ + xlog("L_INFO", "$ci|log|checking transaction result\n"); + if(status=~"60[0-9]") { + t_drop(); + } +... +} +... +</programlisting> + </example> + </section> <section id="tmx.f.t_reuse_branch"> <title> diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index a40a00da6e..c31eae6713 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -74,6 +74,8 @@ static int w_t_is_branch_route(sip_msg_t* msg, char*, char* ); static int w_t_is_reply_route(sip_msg_t* msg, char*, char*); static int w_t_is_request_route(sip_msg_t* msg, char*, char*); +static int w_t_drop0(sip_msg_t* msg, char*, char*); +static int w_t_drop1(sip_msg_t* msg, char*, char*); static int w_t_suspend(sip_msg_t* msg, char*, char*); static int w_t_continue(sip_msg_t* msg, char *idx, char *lbl, char *rtn); static int w_t_reuse_branch(sip_msg_t* msg, char*, char*); @@ -198,6 +200,8 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE }, {"bind_tmx", (cmd_function)bind_tmx, 1, 0, 0, ANY_ROUTE }, + {"t_drop", (cmd_function)w_t_drop0, 0, 0, 0, ANY_ROUTE}, + {"t_drop", (cmd_function)w_t_drop1, 1, fixup_igp_null, 0, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -697,6 +701,43 @@ static int t_is_request_route(sip_msg_t* msg) return -1; } +/** + * + */ +static int w_t_drop1(sip_msg_t* msg, char *p1, char *p2) +{ + tm_cell_t *t = 0; + unsigned int uas_status = 500; + + if(p1) { + if(fixup_get_ivalue(msg, (gparam_p)p1, (int*)&uas_status)<0) + { + uas_status = 500; + } + } + + t=_tmx_tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) { + LM_ERR("no transaction\n"); + return -1; + } + + t->uas.status = uas_status; + if(t_is_request_route(msg) == 1) { + _tmx_tmb.t_release(msg); + } + return 0; +} + +/** + * + */ +static int w_t_drop0(sip_msg_t* msg, char *p1, char *p2) +{ + return w_t_drop1(msg, NULL, NULL); +} + + /** * */

5 years, 8 months

git:master:6f2e1203: Merge pull request #1749 from jchavanton/issue_1745

by GitHub

Module: kamailio Branch: master Commit: 6f2e12039ef341b1dcb88c77272d2e9f0f53f252 URL: https://github.com/kamailio/kamailio/commit/6f2e12039ef341b1dcb88c77272d2e9… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-12-03T10:17:46-08:00 Merge pull request #1749 from jchavanton/issue_1745 acc_json: support for leg_info fields --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6f2e12039ef341b1dcb88c77272d2e9… Patch: https://github.com/kamailio/kamailio/commit/6f2e12039ef341b1dcb88c77272d2e9… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 908d7d0eb9..ee3f84bf6b 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -160,6 +160,7 @@ static void destroy(void) int acc_json_init(acc_init_info_t *inf) { + LM_DBG(" init ...\n"); return 0; } @@ -246,6 +247,27 @@ int acc_json_send_request(struct sip_msg *req, acc_info_t *inf) extra = extra->next; } + /* add leginfo fields */ + if(inf->leg_info) { + o = accb.get_leg_attrs(inf->leg_info, req, inf->varr + attr_cnt, + inf->iarr + attr_cnt, inf->tarr + attr_cnt, 1); + attr_cnt += o; + m = attr_cnt; + + struct acc_extra *leg_info = inf->leg_info; + for(; i < m; i++) { + LM_DBG("[%d][%s][%.*s]\n", i, leg_info->name.s, inf->varr[i].len, + inf->varr[i].s); + char *tmp = strndup(inf->varr[i].s, inf->varr[i].len); + json_t *value = json_string(tmp); + if(!value) + value = json_string("NON-UTF8"); + json_object_set_new(object, leg_info->name.s, value); + free(tmp); + leg_info = leg_info->next; + } + } + if(object) { if(json_object_size(object) == 0) { LM_ERR("json object empty\n");

5 years, 8 months

[kamailio/kamailio] [WIP] acc_json: support for leg_info fields (#1749)

by Julien Chavanton

#### 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 - [ ] Tested changes locally - [x] Related to issue #1745 #### Description Quick implementation with a few tests, I just sharing it, but I sleep on it and review before merging. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1749 -- Commit Summary -- * acc_json: support for leg_info fields -- File Changes -- M src/modules/acc_json/acc_json_mod.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1749.patch https://github.com/kamailio/kamailio/pull/1749.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/1749

5 years, 8 months

git:master:60c8d903: acc_json: support for leg_info fields

by Julien Chavanton

Module: kamailio Branch: master Commit: 60c8d903ff4b6c8f9f88952ef0f666aa457437a8 URL: https://github.com/kamailio/kamailio/commit/60c8d903ff4b6c8f9f88952ef0f666a… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-12-03T06:37:31Z acc_json: support for leg_info fields --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/60c8d903ff4b6c8f9f88952ef0f666a… Patch: https://github.com/kamailio/kamailio/commit/60c8d903ff4b6c8f9f88952ef0f666a… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 908d7d0eb9..ee3f84bf6b 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -160,6 +160,7 @@ static void destroy(void) int acc_json_init(acc_init_info_t *inf) { + LM_DBG(" init ...\n"); return 0; } @@ -246,6 +247,27 @@ int acc_json_send_request(struct sip_msg *req, acc_info_t *inf) extra = extra->next; } + /* add leginfo fields */ + if(inf->leg_info) { + o = accb.get_leg_attrs(inf->leg_info, req, inf->varr + attr_cnt, + inf->iarr + attr_cnt, inf->tarr + attr_cnt, 1); + attr_cnt += o; + m = attr_cnt; + + struct acc_extra *leg_info = inf->leg_info; + for(; i < m; i++) { + LM_DBG("[%d][%s][%.*s]\n", i, leg_info->name.s, inf->varr[i].len, + inf->varr[i].s); + char *tmp = strndup(inf->varr[i].s, inf->varr[i].len); + json_t *value = json_string(tmp); + if(!value) + value = json_string("NON-UTF8"); + json_object_set_new(object, leg_info->name.s, value); + free(tmp); + leg_info = leg_info->next; + } + } + if(object) { if(json_object_size(object) == 0) { LM_ERR("json object empty\n");

5 years, 8 months

git:4.4:97f3081f: utils/kamctl: [pgsql] add missing options for pgsql_ro_query()

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 97f3081f8af788e0c4a420e22bd2d5267f43d4ec URL: https://github.com/kamailio/kamailio/commit/97f3081f8af788e0c4a420e22bd2d52… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-03T12:34:21+01:00 utils/kamctl: [pgsql] add missing options for pgsql_ro_query() Thanks Andreas Maus <maus+debianbug(a)ypbind.de> fix #1750 (cherry picked from commit 1894b378f975e7129024f6f10640c6c642e30a1b) --- Modified: utils/kamctl/kamctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/97f3081f8af788e0c4a420e22bd2d52… Patch: https://github.com/kamailio/kamailio/commit/97f3081f8af788e0c4a420e22bd2d52… --- diff --git a/utils/kamctl/kamctl.pgsql b/utils/kamctl/kamctl.pgsql index 60cbd92f06..8b9e7f04bf 100644 --- a/utils/kamctl/kamctl.pgsql +++ b/utils/kamctl/kamctl.pgsql @@ -46,8 +46,9 @@ pgsql_query() { # input: sql query, optional pgsql command-line params pgsql_ro_query() { - mdbg "pgsql_ro_query: $PGSQL $2 -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" + mdbg "pgsql_ro_query: $PGSQL $2 -A -q -t -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -U $DBROUSER \ $DBNAME \

5 years, 8 months

git:5.0:85b85617: utils/kamctl: [pgsql] add missing options for pgsql_ro_query()

by Victor Seva

Module: kamailio Branch: 5.0 Commit: 85b85617032533a56a15e6fc4ac90b61df98a36a URL: https://github.com/kamailio/kamailio/commit/85b85617032533a56a15e6fc4ac90b6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-03T12:31:59+01:00 utils/kamctl: [pgsql] add missing options for pgsql_ro_query() Thanks Andreas Maus <maus+debianbug(a)ypbind.de> fix #1750 (cherry picked from commit 1894b378f975e7129024f6f10640c6c642e30a1b) --- Modified: utils/kamctl/kamctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/85b85617032533a56a15e6fc4ac90b6… Patch: https://github.com/kamailio/kamailio/commit/85b85617032533a56a15e6fc4ac90b6… --- diff --git a/utils/kamctl/kamctl.pgsql b/utils/kamctl/kamctl.pgsql index 7e5abaef9a..1250dc0d7e 100644 --- a/utils/kamctl/kamctl.pgsql +++ b/utils/kamctl/kamctl.pgsql @@ -57,15 +57,17 @@ pgsql_query() { # input: sql query, optional pgsql command-line params pgsql_ro_query() { - mdbg "pgsql_ro_query: $PGSQL $2 -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" + mdbg "pgsql_ro_query: $PGSQL $2 -A -q -t -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" if [ -z "$DBPORT" ] ; then PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -U $DBROUSER \ $DBNAME \ -c "$1" else PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -p $DBPORT \ -U $DBROUSER \

5 years, 8 months

git:5.1:54c904e4: utils/kamctl: [pgsql] add missing options for pgsql_ro_query()

by Victor Seva

Module: kamailio Branch: 5.1 Commit: 54c904e4dc9dae3cd82e547e2328cad9381e48ec URL: https://github.com/kamailio/kamailio/commit/54c904e4dc9dae3cd82e547e2328cad… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-03T12:31:18+01:00 utils/kamctl: [pgsql] add missing options for pgsql_ro_query() Thanks Andreas Maus <maus+debianbug(a)ypbind.de> fix #1750 (cherry picked from commit 1894b378f975e7129024f6f10640c6c642e30a1b) --- Modified: utils/kamctl/kamctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/54c904e4dc9dae3cd82e547e2328cad… Patch: https://github.com/kamailio/kamailio/commit/54c904e4dc9dae3cd82e547e2328cad… --- diff --git a/utils/kamctl/kamctl.pgsql b/utils/kamctl/kamctl.pgsql index 7e5abaef9a..1250dc0d7e 100644 --- a/utils/kamctl/kamctl.pgsql +++ b/utils/kamctl/kamctl.pgsql @@ -57,15 +57,17 @@ pgsql_query() { # input: sql query, optional pgsql command-line params pgsql_ro_query() { - mdbg "pgsql_ro_query: $PGSQL $2 -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" + mdbg "pgsql_ro_query: $PGSQL $2 -A -q -t -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" if [ -z "$DBPORT" ] ; then PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -U $DBROUSER \ $DBNAME \ -c "$1" else PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -p $DBPORT \ -U $DBROUSER \

5 years, 8 months

[kamailio/kamailio] Missing options for psql in pgsql_ro_query prevents usage of kamctl (#1750)

by Victor Seva

>From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906233 > In the current version missing command line options for the read-only psql call (in pgsql_ro_query) prevents usage of kamctl for PostgreSQL backend, e.g. when adding a _new_ user: > root@debian9 ~ # kamctl add phone_u phone_p database engine 'PGSQL' loaded Control engine 'FIFO' loaded is_user: user counter=1 INFO: user 'phone_u' already exists > This is because the psql query returns the correct result (0 in this case) but the pgsql_ro_query function lacks the psql options -A -q -t as defined. >As a result the query contains the result and the coloumn name and footer,e.g. in this case: ``` root@debian9 ~ # /usr/bin/psql -h localhost -U kamailioro kamailio \ -c "select count(*) from subscriber where username='phone_u';" count ------- 0 (1 row) ``` >In this example the "kamctl add" command looks at the last line of the output to check if the user is already defined and misinterprets the result as it expectes "0" as the result. >This affect not only the "kamctl add" command but most calls that calls $DBROCMD in kamctl. -- 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/issues/1750

5 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018