sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
474 discussions

git:master:c5bac154: Merge pull request #2264 from armenb/core_strutils_urlencode_urldecode
by GitHub 28 Mar '20

28 Mar '20

Module: kamailio Branch: master Commit: c5bac15472ad7db452e35f000a3236a839f14cf8 URL: https://github.com/kamailio/kamailio/commit/c5bac15472ad7db452e35f000a3236a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-03-28T08:30:16+01:00 Merge pull request #2264 from armenb/core_strutils_urlencode_urldecode core: strutils - add urlencode and urldecode functions --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/c5bac15472ad7db452e35f000a3236a… Patch: https://github.com/kamailio/kamailio/commit/c5bac15472ad7db452e35f000a3236a… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index b06fa44175..7df31727cb 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -701,3 +701,76 @@ int reg_replace(char *pattern, char *replacement, char *string, str *result) return replace(&pmatch[0], string, replacement, result); } + +/* Converts a hex character to its integer value */ +char hex_to_char(char hex_code) +{ + return isdigit(hex_code) ? hex_code - '0' : tolower(hex_code) - 'a' + 10; +} + +/* Converts an integer value to its hex character */ +char char_to_hex(char char_code) +{ + static char hex[] = "0123456789abcdef"; + return hex[char_code & 15]; +} + +/*! \brief + * URL Encodes a string + */ +int urlencode(str *sin, str *sout) +{ + char *at, *p; + + if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || + sin->len<0 || sout->len < 3*sin->len+1) + return -1; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') + *at++ = *p; + else + *at++ = '%', *at++ = char_to_hex(*p >> 4), *at++ = char_to_hex(*p & 15); + p++; + } + + *at = 0; + sout->len = at - sout->s; + LM_DBG("urlencoded string is <%s>\n", sout->s); + + return 0; +} + +/*! \brief + * URL Decodes a string + */ +int urldecode(str *sin, str *sout) +{ + char *at, *p; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (*p == '%') { + if (p[1] && p[2]) { + *at++ = hex_to_char(p[1]) << 4 | hex_to_char(p[2]); + p += 2; + } + } else if (*p == '+') { + *at++ = ' '; + } else { + *at++ = *p; + } + p++; + } + + *at = 0; + sout->len = at - sout->s; + + LM_DBG("urldecoded string is <%s>\n", sout->s); + return 0; +} diff --git a/src/core/strutils.h b/src/core/strutils.h index 37152dd18d..8b20f72e44 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -61,4 +61,8 @@ int escape_param(str *sin, str *sout); int unescape_param(str *sin, str *sout); int escape_csv(str *sin, str *sout); +char hex_to_char(char hex_code); +char char_to_hex(char char_code); +int urlencode(str *sin, str *sout); +int urldecode(str *sin, str *sout); #endif

1 0

git:master:0973bee7: core: strutils - add urlencode and urldecode functions
by Armen Babikyan 28 Mar '20

28 Mar '20

Module: kamailio Branch: master Commit: 0973bee70e2a7f6ea274c357083fb67b6b2e27ad URL: https://github.com/kamailio/kamailio/commit/0973bee70e2a7f6ea274c357083fb67… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2020-03-27T14:32:29-07:00 core: strutils - add urlencode and urldecode functions - moved from modules/pv/pv_trans.c and exported, so they can be used in other modules - genericized fn names --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/0973bee70e2a7f6ea274c357083fb67… Patch: https://github.com/kamailio/kamailio/commit/0973bee70e2a7f6ea274c357083fb67… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index b06fa44175..7df31727cb 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -701,3 +701,76 @@ int reg_replace(char *pattern, char *replacement, char *string, str *result) return replace(&pmatch[0], string, replacement, result); } + +/* Converts a hex character to its integer value */ +char hex_to_char(char hex_code) +{ + return isdigit(hex_code) ? hex_code - '0' : tolower(hex_code) - 'a' + 10; +} + +/* Converts an integer value to its hex character */ +char char_to_hex(char char_code) +{ + static char hex[] = "0123456789abcdef"; + return hex[char_code & 15]; +} + +/*! \brief + * URL Encodes a string + */ +int urlencode(str *sin, str *sout) +{ + char *at, *p; + + if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || + sin->len<0 || sout->len < 3*sin->len+1) + return -1; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') + *at++ = *p; + else + *at++ = '%', *at++ = char_to_hex(*p >> 4), *at++ = char_to_hex(*p & 15); + p++; + } + + *at = 0; + sout->len = at - sout->s; + LM_DBG("urlencoded string is <%s>\n", sout->s); + + return 0; +} + +/*! \brief + * URL Decodes a string + */ +int urldecode(str *sin, str *sout) +{ + char *at, *p; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (*p == '%') { + if (p[1] && p[2]) { + *at++ = hex_to_char(p[1]) << 4 | hex_to_char(p[2]); + p += 2; + } + } else if (*p == '+') { + *at++ = ' '; + } else { + *at++ = *p; + } + p++; + } + + *at = 0; + sout->len = at - sout->s; + + LM_DBG("urldecoded string is <%s>\n", sout->s); + return 0; +} diff --git a/src/core/strutils.h b/src/core/strutils.h index 37152dd18d..8b20f72e44 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -61,4 +61,8 @@ int escape_param(str *sin, str *sout); int unescape_param(str *sin, str *sout); int escape_csv(str *sin, str *sout); +char hex_to_char(char hex_code); +char char_to_hex(char char_code); +int urlencode(str *sin, str *sout); +int urldecode(str *sin, str *sout); #endif

1 0

git:master:7d1e27e9: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: 7d1e27e945b09674f07bdb56f69947b41e8e945a URL: https://github.com/kamailio/kamailio/commit/7d1e27e945b09674f07bdb56f69947b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-27T18:31:09+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/7d1e27e945b09674f07bdb56f69947b… Patch: https://github.com/kamailio/kamailio/commit/7d1e27e945b09674f07bdb56f69947b… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 4637de5a55..5f3592be47 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -93,6 +93,7 @@ Carsten Bock 3.51. ka_method (str) 3.52. ka_from (str) 3.53. ka_domain (str) + 3.54. ka_filter (int) 4. RPC Commands @@ -193,6 +194,7 @@ Carsten Bock 1.51. ka_method parameter usage 1.52. ka_from parameter usage 1.53. ka_domain parameter usage + 1.54. ka_filter parameter usage Chapter 1. Admin Guide @@ -262,6 +264,7 @@ Chapter 1. Admin Guide 3.51. ka_method (str) 3.52. ka_from (str) 3.53. ka_domain (str) + 3.54. ka_filter (int) 4. RPC Commands @@ -394,6 +397,7 @@ Chapter 1. Admin Guide 3.51. ka_method (str) 3.52. ka_from (str) 3.53. ka_domain (str) + 3.54. ka_filter (int) 3.1. nat_bflag (int) @@ -1066,14 +1070,15 @@ modparam("usrloc", "version_table", 0) 3.50. ka_mode (int) Keepalive mode - control the internal keepalive mechanism. With this - feature enable, the module sends periodically (based on timer interval) - SIP requests to location contacts and measures the round trip in - microseconds (the round trip value can be seen in the response of the - RPC command 'ul.dump'). + feature enabled, the module sends periodically (based on timer + interval) SIP requests to location contacts and measures the round trip + in microseconds (the round trip value can be seen in the response of + the RPC command 'ul.dump'). Its value is a set of flags: * 0 - if the value is zero, no keepalive is sent - * 1 - if set to 1, the keepalive is enabled for all contacts + * 1 (bit 1 set) - if set to 1, the keepalive is enabled for all + contacts * 2 (bit 2 set) - the keepalive is sent only for natted contacts (nat_bflag set) * 4 (bit 3 set) - the keepalive is sent only for UDP contacts @@ -1134,6 +1139,22 @@ modparam("usrloc", "ka_from", "sip:server@mydomain.com") modparam("usrloc", "ka_domain", "mydomain.com") ... +3.54. ka_filter (int) + + Set filters for keepalive processing. + + Its value is a set of flags: + * 0 - if the value is zero, no filter is enabled for keepalives + * 1 (bit 1 set) - keepalives sent only to records matching the + server_id global parameter. + + Default value is “0” (no filter). + + Example 1.54. ka_filter parameter usage +... +modparam("usrloc", "ka_filter", 1) +... + 4. RPC Commands 4.1. ul.dump

1 0

git:master:30eda8a8: usrloc: keepalive server id filtering also for in-memory contacts
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: 30eda8a8f244e3e6eba66b50fa355b11735d8f7d URL: https://github.com/kamailio/kamailio/commit/30eda8a8f244e3e6eba66b50fa355b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T18:16:28+01:00 usrloc: keepalive server id filtering also for in-memory contacts --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/30eda8a8f244e3e6eba66b50fa355b1… Patch: https://github.com/kamailio/kamailio/commit/30eda8a8f244e3e6eba66b50fa355b1… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 14eb75b1d4..a811df5326 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -222,6 +222,9 @@ int ul_ka_db_records(int partidx) /* flags */ uc.cflags = VAL_BITMAP(ROW_VALUES(row) + 3); + /* server id */ + uc.server_id = server_id; + /* aor from username and domain */ ur.aor.s = aorbuf; ur.domain = &dom->name; diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 3557848e34..7955efa14b 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -31,6 +31,7 @@ #include "../../core/ut.h" #include "../../core/resolve.h" #include "../../core/forward.h" +#include "../../core/globals.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" @@ -69,6 +70,7 @@ extern str ul_ka_from; extern str ul_ka_domain; extern str ul_ka_method; extern int ul_ka_mode; +extern int ul_ka_filter; extern unsigned int nat_bflag; static unsigned int _ul_ka_counter = 0; @@ -113,6 +115,9 @@ int ul_ka_urecord(urecord_t *ur) if (uc->c.len <= 0) { continue; } + if((ul_ka_filter&GAU_OPT_SERVER_ID) && (uc->server_id != server_id)) { + continue; + } if(ul_ka_mode & ULKA_NAT) { /* keepalive for natted contacts only */ if (nat_bflag == 0) {

1 0

git:master:1968b324: usrloc: docs for ka_filter parameter
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: 1968b3248acc9d71974f5765e489af82ecf4849a URL: https://github.com/kamailio/kamailio/commit/1968b3248acc9d71974f5765e489af8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T18:06:46+01:00 usrloc: docs for ka_filter parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1968b3248acc9d71974f5765e489af8… Patch: https://github.com/kamailio/kamailio/commit/1968b3248acc9d71974f5765e489af8… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index d4f96db94f..7b945a76bb 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1229,9 +1229,12 @@ modparam("usrloc", "rm_expired_delay", 30) <section id="usrloc.p.server_id_filter"> <title><varname>server_id_filter</varname> (int)</title> <para> - Enable (1) or disable (0) filter records by server_id on load and during cleaning of expired db records. - It could be useful when you want to use the same location table for several kamailio instances which are configured to work in db_mode=1 or db_mode=2 (cache modes). - Otherwise one instance of proxy cleans records made by another proxy and that breaks its cache. + Enable (1) or disable (0) filter records by server_id on load and + during cleaning of expired db records. It could be useful when you + want to use the same location table for several kamailio instances + which are configured to work in db_mode=1 or db_mode=2 (cache modes). + Otherwise one instance of proxy cleans records made by another proxy + and that breaks its cache. </para> <para> <emphasis> @@ -1271,7 +1274,7 @@ modparam("usrloc", "version_table", 0) <title><varname>ka_mode</varname> (int)</title> <para> Keepalive mode - control the internal keepalive mechanism. With this feature - enable, the module sends periodically (based on timer interval) SIP requests + enabled, the module sends periodically (based on timer interval) SIP requests to location contacts and measures the round trip in microseconds (the round trip value can be seen in the response of the RPC command 'ul.dump'). </para> @@ -1286,7 +1289,7 @@ modparam("usrloc", "version_table", 0) </listitem> <listitem> <para> - 1 - if set to 1, the keepalive is enabled for all contacts + 1 (bit 1 set) - if set to 1, the keepalive is enabled for all contacts </para> </listitem> <listitem> @@ -1349,7 +1352,7 @@ modparam("usrloc", "ka_method", "NOTIFY") </example> </section> - <section id="usrloc.p.from"> + <section id="usrloc.p.ka_from"> <title><varname>ka_from</varname> (str)</title> <para> The SIP URI to be set in the From header of the keepalive requests. @@ -1367,7 +1370,7 @@ modparam("usrloc", "ka_from", "sip:server@mydomain.com") </example> </section> - <section id="usrloc.p.domain"> + <section id="usrloc.p.ka_domain"> <title><varname>ka_domain</varname> (str)</title> <para> The domain to be set in To header URI if the multi-domain is not enabled. @@ -1387,6 +1390,40 @@ modparam("usrloc", "ka_domain", "mydomain.com") </example> </section> + <section id="usrloc.p.ka_filter"> + <title><varname>ka_filter</varname> (int)</title> + <para> + Set filters for keepalive processing. + </para> + <para> + Its value is a set of flags: + </para> + <itemizedlist> + <listitem> + <para> + 0 - if the value is zero, no filter is enabled for keepalives + </para> + </listitem> + <listitem> + <para> + 1 (bit 1 set) - keepalives sent only to records matching the + server_id global parameter. + </para> + </listitem> + </itemizedlist> + <para> + Default value is <quote>0</quote> (no filter). + </para> + <example> + <title><varname>ka_filter</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_filter", 1) +... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master:c4f3de7b: usrloc: internal keepalive support for db only mode
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: c4f3de7bfa704551e4b6cbf16e543c469a42c99c URL: https://github.com/kamailio/kamailio/commit/c4f3de7bfa704551e4b6cbf16e543c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T17:54:00+01:00 usrloc: internal keepalive support for db only mode - new parameter ka_filter to enable server_id filtering of db records processed for keepalive --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c4f3de7bfa704551e4b6cbf16e543c4… Patch: https://github.com/kamailio/kamailio/commit/c4f3de7bfa704551e4b6cbf16e543c4…

1 0

git:master:f47700bb: usrloc: fixed wrong comments related to the flags fields in ucontact_t
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: f47700bb55cbf19f7d3f7d967bd4c4755a994db5 URL: https://github.com/kamailio/kamailio/commit/f47700bb55cbf19f7d3f7d967bd4c47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T17:52:53+01:00 usrloc: fixed wrong comments related to the flags fields in ucontact_t --- Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/f47700bb55cbf19f7d3f7d967bd4c47… Patch: https://github.com/kamailio/kamailio/commit/f47700bb55cbf19f7d3f7d967bd4c47… --- diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index 5d071c1734..a9a0309d9d 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -82,8 +82,8 @@ typedef struct ucontact { str callid; /*!< Call-ID header field of registration */ int cseq; /*!< CSeq value */ cstate_t state; /*!< State of the contact (\ref cstate) */ - unsigned int flags; /*!< Various flags (NAT, ping type, etc) */ - unsigned int cflags; /*!< Custom contact flags (from script) */ + unsigned int flags; /*!< Various internal flags (sync, etc) */ + unsigned int cflags; /*!< Custom contact flags (from script - bflags) */ str user_agent; /*!< User-Agent header field */ str uniq; /*!< Uniq header field */ struct socket_info *sock; /*!< received socket */

1 0

git:master:bef747a3: usrloc: global root var for domains list renamed to _ksr_ul_root
by Daniel-Constantin Mierla 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: bef747a3ff728fb92593c565229d20e642b8b6c4 URL: https://github.com/kamailio/kamailio/commit/bef747a3ff728fb92593c565229d20e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-27T13:58:56+01:00 usrloc: global root var for domains list renamed to _ksr_ul_root --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/dlist.h Modified: src/modules/usrloc/ul_rpc.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bef747a3ff728fb92593c565229d20e… Patch: https://github.com/kamailio/kamailio/commit/bef747a3ff728fb92593c565229d20e…

1 0

git:master:3b706926: pkg/kamailio/deb: version set 5.4.0~dev4
by Victor Seva 27 Mar '20

27 Mar '20

Module: kamailio Branch: master Commit: 3b7069269f28be7869a90420682ef03641a741e4 URL: https://github.com/kamailio/kamailio/commit/3b7069269f28be7869a90420682ef03… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-27T12:55:43+01:00 pkg/kamailio/deb: version set 5.4.0~dev4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/3b7069269f28be7869a90420682ef03… Patch: https://github.com/kamailio/kamailio/commit/3b7069269f28be7869a90420682ef03…

1 0

[kamailio/kamailio] [FEATURE REQUEST] - Add RTT metric to usrloc for measuring subscriber latency (#2223)
by Joel Serrano 27 Mar '20

27 Mar '20

## Description ### Add RTT metric to usrloc for measuring subscriber latency This has been discussed several times in the mailing list. As I personally need this too I though it would be a good idea to open this issue for tracking. Unfortunately I'm not aware of the complexity of implementing this and I cannot code it myself, I'm happy to do any testing though or help with any other tasks. Some threads were this has been commented and some solutions proposed by @miconda: https://lists.kamailio.org/pipermail/sr-users/2015-April/088031.html (1st post, see complete thread) https://lists.kamailio.org/pipermail/sr-users/2019-January/104291.html (1st post, see complete thread) Thanks! -- 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/2223

2 2

← Newer
1
...
12
13
14
15
16
17
18
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020