sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:master:9a3b5d8c: core: fixed use of flags-based protocol detection
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 9a3b5d8c017f4de6a647184b0a1c464de9671b74 URL: https://github.com/kamailio/kamailio/commit/9a3b5d8c017f4de6a647184b0a1c464… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T20:18:39+02:00 core: fixed use of flags-based protocol detection - wrong field was used due to c&p --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/9a3b5d8c017f4de6a647184b0a1c464… Patch: https://github.com/kamailio/kamailio/commit/9a3b5d8c017f4de6a647184b0a1c464… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 1abc042e28..61d9ac6185 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -145,22 +145,22 @@ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ /* sip request */ #define IS_SIP(req) \ (((req)->first_line.type == SIP_REQUEST) && \ - ((req)->first_line.type & FLINE_FLAG_PROTO_SIP)) + ((req)->first_line.flags & FLINE_FLAG_PROTO_SIP)) /* sip reply */ #define IS_SIP_REPLY(rpl) \ (((rpl)->first_line.type == SIP_REPLY) && \ - ((rpl)->first_line.type & FLINE_FLAG_PROTO_SIP)) + ((rpl)->first_line.flags & FLINE_FLAG_PROTO_SIP)) /* http request */ #define IS_HTTP(req) \ (((req)->first_line.type == SIP_REQUEST) && \ - ((req)->first_line.type & FLINE_FLAG_PROTO_HTTP)) + ((req)->first_line.flags & FLINE_FLAG_PROTO_HTTP)) /* http reply */ #define IS_HTTP_REPLY(rpl) \ (((rpl)->first_line.type == SIP_REPLY) && \ - ((rpl)->first_line.type & FLINE_FLAG_PROTO_HTTP)) + ((rpl)->first_line.flags & FLINE_FLAG_PROTO_HTTP)) /*! \brief * Return a URI to which the message should be really sent (not what should

1 0

git:master:573a5667: pv: new function xavp_slist_explode("slist", "sep", "mode", "xname")
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 573a56676ac11671468903a83efdfbbe6fb0dff0 URL: https://github.com/kamailio/kamailio/commit/573a56676ac11671468903a83efdfbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T15:45:08+02:00 pv: new function xavp_slist_explode("slist", "sep", "mode", "xname") - break a string in tokens by separators, storing them in xavp --- 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/573a56676ac11671468903a83efdfbb… Patch: https://github.com/kamailio/kamailio/commit/573a56676ac11671468903a83efdfbb…

2 2

git:master:e3e6471b: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: e3e6471b114b2358c20cbc9a60ee745ac1bce162 URL: https://github.com/kamailio/kamailio/commit/e3e6471b114b2358c20cbc9a60ee745… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-14T16:16:29+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/e3e6471b114b2358c20cbc9a60ee745… Patch: https://github.com/kamailio/kamailio/commit/e3e6471b114b2358c20cbc9a60ee745… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index 0af232eeda..a6702afa12 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -475,7 +475,8 @@ xavp_params_implode("x", "$var(out)"); the tokens, the supported mode right now is 't', which trims the white spaces around the value. - The fourth parameter is the name of the xavp to hold the tokens. + The fourth parameter is the name of the root xavp to hold the tokens in + fields named 'v' and indexed from 0. The values are stored as string type. @@ -485,10 +486,10 @@ xavp_params_implode("x", "$var(out)"); ... xavp_slist_explode("a=b; c=d;", "=;", "t", "x"); # results in: -# $xavp(x[0]) = "a"; -# $xavp(x[1]) = "b"; -# $xavp(x[2]) = "c"; -# $xavp(x[3]) = "d"; +# $xavp(x[0]=>v[0]) = "a"; +# $xavp(x[0]=>v[1]) = "b"; +# $xavp(x[0]=>v[2]) = "c"; +# $xavp(x[0]=>v[3]) = "d"; ... 4.11. xavp_child_seti(rname, cname, ival)

1 0

git:master:695448dc: pv: exported xavp_slist_explode() to kemi
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 695448dc49812225c743e385edf846405c94b3e2 URL: https://github.com/kamailio/kamailio/commit/695448dc49812225c743e385edf8464… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T16:15:09+02:00 pv: exported xavp_slist_explode() to kemi --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/695448dc49812225c743e385edf8464… Patch: https://github.com/kamailio/kamailio/commit/695448dc49812225c743e385edf8464… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index b60cfb56f8..9367103bfe 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -2739,6 +2739,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_slist_explode"), + SR_KEMIP_INT, ki_xavp_slist_explode, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_seti"), SR_KEMIP_INT, ki_xavp_seti, { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE,

1 0

git:master:d2c444c5: pv: docs - reflect use of xavp fields for tokens by xavp_slist_explode()
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: d2c444c58b8f6f084f27e0129dc0cf02dfb6f7ba URL: https://github.com/kamailio/kamailio/commit/d2c444c58b8f6f084f27e0129dc0cf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T16:13:19+02:00 pv: docs - reflect use of xavp fields for tokens by xavp_slist_explode() --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d2c444c58b8f6f084f27e0129dc0cf0… Patch: https://github.com/kamailio/kamailio/commit/d2c444c58b8f6f084f27e0129dc0cf0… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 3967b38234..61df878c3a 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -438,7 +438,8 @@ xavp_params_implode("x", "$var(out)"); the white spaces around the value. </para> <para> - The fourth parameter is the name of the xavp to hold the tokens. + The fourth parameter is the name of the root xavp to hold the tokens + in fields named 'v' and indexed from 0. </para> <para> The values are stored as string type. @@ -452,10 +453,10 @@ xavp_params_implode("x", "$var(out)"); ... xavp_slist_explode("a=b; c=d;", "=;", "t", "x"); # results in: -# $xavp(x[0]) = "a"; -# $xavp(x[1]) = "b"; -# $xavp(x[2]) = "c"; -# $xavp(x[3]) = "d"; +# $xavp(x[0]=>v[0]) = "a"; +# $xavp(x[0]=>v[1]) = "b"; +# $xavp(x[0]=>v[2]) = "c"; +# $xavp(x[0]=>v[3]) = "d"; ... </programlisting> </example>

1 0

git:master:2b4ec1cf: pv: xavp_slist_explode() stores tockes in xavp fields
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 2b4ec1cf1d30f5520ef68f9e7e653100fa8ce68e URL: https://github.com/kamailio/kamailio/commit/2b4ec1cf1d30f5520ef68f9e7e65310… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T16:13:19+02:00 pv: xavp_slist_explode() stores tockes in xavp fields - no longer in root xavp list, but a sublist with tokes having name 'v' --- Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/2b4ec1cf1d30f5520ef68f9e7e65310… Patch: https://github.com/kamailio/kamailio/commit/2b4ec1cf1d30f5520ef68f9e7e65310… --- diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 0f7652218d..ae2c6ce048 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -586,8 +586,10 @@ int pv_xavi_print(sip_msg_t* msg, char* s1, char *s2) int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) { str s; + sr_xavp_t *xavp_list=NULL; sr_xavp_t *xavp=NULL; sr_xval_t xval; + str itname = str_init("v"); int i; int j; int sfound; @@ -620,7 +622,22 @@ int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = s; - xavp = xavp_add_value_after(xname, &xval, xavp); + if(xavp_list == NULL) { + if(xavp_add_value(&itname, &xval, &xavp_list)==NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + return -1; + } + xavp = xavp_list; + } else { + xavp = xavp_add_value_after(&itname, &xval, xavp); + if(xavp == NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + xavp_destroy_list(&xavp_list); + return -1; + } + } } s.s = slist->s + i + 1; } @@ -637,7 +654,31 @@ int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = s; - xavp = xavp_add_value_after(xname, &xval, xavp); + if(xavp_list == NULL) { + if(xavp_add_value(&itname, &xval, &xavp_list)==NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + return -1; + } + xavp = xavp_list; + } else { + xavp = xavp_add_value_after(&itname, &xval, xavp); + if(xavp == NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + xavp_destroy_list(&xavp_list); + return -1; + } + } + } + + /* add main xavp in root list */ + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_XAVP; + xval.v.xavp = xavp_list; + if(xavp_add_value(xname, &xval, NULL)==NULL) { + xavp_destroy_list(&xavp); + return -1; } return 0;

1 0

git:master:75d4082e: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 75d4082e510948f88f7254e22c05a02118260041 URL: https://github.com/kamailio/kamailio/commit/75d4082e510948f88f7254e22c05a02… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-14T16:01:13+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/75d4082e510948f88f7254e22c05a02… Patch: https://github.com/kamailio/kamailio/commit/75d4082e510948f88f7254e22c05a02…

1 0

git:master:df63402a: pv: docs for xvp_slist_explode()
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: df63402a57a7ef6da0d2eb3f88ee68c116c38549 URL: https://github.com/kamailio/kamailio/commit/df63402a57a7ef6da0d2eb3f88ee68c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T15:55:29+02:00 pv: docs for xvp_slist_explode() --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/df63402a57a7ef6da0d2eb3f88ee68c… Patch: https://github.com/kamailio/kamailio/commit/df63402a57a7ef6da0d2eb3f88ee68c… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 8b4b0aa309..3967b38234 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -413,6 +413,49 @@ $xavp(x[0]=>c) = "d"; $xavp(x[0]=>a) = "b"; xavp_params_implode("x", "$var(out)"); # results in: $var(out) is "a=b;c=d;e=f;" +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_slist_explode"> + <title> + <function moreinfo="none">xavp_slist_explode(slist, sep, mode, xname)</function> + </title> + <para> + Breaks a string list in tokens by separators and stores them + in XAVPs. Note that is not storing empty values. + </para> + <para> + The first parameter has to be a string (static or with variables). + </para> + <para> + The second parameter has to contain separator characters (they + can be many). + </para> + <para> + The third parameter is mode, controlling the behaviour of extracting + the tokens, the supported mode right now is 't', which trims + the white spaces around the value. + </para> + <para> + The fourth parameter is the name of the xavp to hold the tokens. + </para> + <para> + The values are stored as string type. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_slist_explode</function> usage</title> + <programlisting format="linespecific"> +... +xavp_slist_explode("a=b; c=d;", "=;", "t", "x"); +# results in: +# $xavp(x[0]) = "a"; +# $xavp(x[1]) = "b"; +# $xavp(x[2]) = "c"; +# $xavp(x[3]) = "d"; ... </programlisting> </example>

1 0

pstn_route add_route(): route name <IP> not defined error
by sai Sudheer 14 Oct '20

14 Oct '20

Hii,I am trying to use pstn_route module for the first time, and i want to route the invite to specific pstn server based on its prefix.I have loaded the module & setup the DB, and it's giving error saying route name (from DB) is not defined after adding the a prefix into DB table., and there were no errors when DB table is empty.Not sure how to defined it, or i dont know what did i miss. Please help. #### CONFIG ##########loadmodule "prefix_route.so"modparam("prefix_route", "db_url", "mysql://xxxxx:xxxxx@localhost/kamailioDB")modparam("prefix_route", "db_table", "new_prefix_route") #PSTN Routing table contains if (!prefix_route("+44")) { xlog("L_INFO", "+44 prefix didnt match with prefix_route DB\n"); } ########## DB####MariaDB [kamailio]> select * from new_prefix_route;Empty set (0.00 sec) MariaDB [kamailio]> exit;########## Kamailio looks good untill here, no errors.. # Now i have added a prefix into sql DBINSERT INTO new_prefix_route VALUES ("+44", "10.10.1.1:5060", "route for this prefix");###########Error log after adding a prefix into new_prefix_route table & restart of kamailio 0(5802) CRITICAL: prefix_route [prefix_route.c:72]: add_route(): route name '10.10.1.1:5060' is not defined 0(5802) NOTICE: prefix_route [prefix_route.c:170]: pr_db_load(): Total prefix routes loaded: 1 0(5802) ERROR: prefix_route [prefix_route.c:174]: pr_db_load(): error flushing tree 0(5802) CRITICAL: prefix_route [prefix_route.c:212]: mod_init(): db load failed I have tried a "name" instead of IP (though i dont know how to convert that "name" into a IP:Port), But i am still getting same error using "name" instead of IP:port @ route field in DB. Please help.

1 0

git:master:b0b2ab6d: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: b0b2ab6d2ebdabb64a054b47ee68a3276de71185 URL: https://github.com/kamailio/kamailio/commit/b0b2ab6d2ebdabb64a054b47ee68a32… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-14T11:46:17+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/b0b2ab6d2ebdabb64a054b47ee68a32… Patch: https://github.com/kamailio/kamailio/commit/b0b2ab6d2ebdabb64a054b47ee68a32… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 43a662763e..2f89366997 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -62,7 +62,7 @@ Bogdan-Andre Iancu 3.15. retry_after (integer) 3.16. sock_flag (integer) 3.17. sock_hdr_name (string) - 3.18. use_advertised_address (integer) + 3.18. sock_mode (integer) 3.19. method_filtering (integer) 3.20. use_path (integer) 3.21. path_mode (integer) @@ -131,7 +131,7 @@ Bogdan-Andre Iancu 1.14. Set retry_after parameter 1.15. Set sock_flag parameter 1.16. Set sock_hdr_name parameter - 1.17. Set use_advertised_address parameter + 1.17. Set sock_mode parameter 1.18. Set method_filtering parameter 1.19. Set use_path parameter 1.20. Set path_mode parameter @@ -194,7 +194,7 @@ Chapter 1. Admin Guide 3.15. retry_after (integer) 3.16. sock_flag (integer) 3.17. sock_hdr_name (string) - 3.18. use_advertised_address (integer) + 3.18. sock_mode (integer) 3.19. method_filtering (integer) 3.20. use_path (integer) 3.21. path_mode (integer) @@ -325,7 +325,7 @@ Chapter 1. Admin Guide 3.15. retry_after (integer) 3.16. sock_flag (integer) 3.17. sock_hdr_name (string) - 3.18. use_advertised_address (integer) + 3.18. sock_mode (integer) 3.19. method_filtering (integer) 3.20. use_path (integer) 3.21. path_mode (integer) @@ -604,21 +604,20 @@ modparam("registrar", "sock_flag", 18) modparam("registrar", "sock_hdr_name", "Sock-Info") ... -3.18. use_advertised_address (integer) +3.18. sock_mode (integer) - This parameter can be used to override value written into socket field - when contact is saved. If set to 1, advertised address will be written - instead local listen socket. + If set to 1, the server stores the advertised address in socket field, + instead of bind address. This could be useful when kamailio is installed behind NAT and it is necessary to store its public IP instead socket on which the register request was received. - Default value is 0 (disabled). + Default value is 0 (store bind address). - Example 1.17. Set use_advertised_address parameter + Example 1.17. Set sock_mode parameter ... -modparam("registrar", "use_advertised_address", 1) +modparam("registrar", "sock_mode", 1) ... 3.19. method_filtering (integer)

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020