sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
325 discussions

git:5.2:8f72e21b: sipcapture: fix inaccessible HEP chunks
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.2 Commit: 8f72e21b5f68c4dd467e3a109b1d7b1ee6091872 URL: https://github.com/kamailio/kamailio/commit/8f72e21b5f68c4dd467e3a109b1d7b1… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:20:03+01:00 sipcapture: fix inaccessible HEP chunks Chunk types 1 , 2 and 3 were not accessible. $hep(...) pseudovariable didn't return HEP chunks of type: * 1 (IP protocol family) returned HEP version (accessible via $hep(version)) * 2 (IP protocol ID) returned HEP message source IP * 3 (IPv4 source address) returned HEP message destination IP This removes keys src_ip and dst_ip. Use $si resp. $Ri instead. (cherry picked from commit 459ccabe9e3975dd5a90135ab96f3cccdf4ffdbe) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/8f72e21b5f68c4dd467e3a109b1d7b1… Patch: https://github.com/kamailio/kamailio/commit/8f72e21b5f68c4dd467e3a109b1d7b1… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index f880ec4457..2050026808 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3049,14 +3049,6 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) else goto error; } break; - case 6: { - if(!strncmp(in->s, "src_ip", 6)) - sp->pvp.pvn.u.isname.name.n = 2; - else if(!strncmp(in->s, "dst_ip", 6)) - sp->pvp.pvn.u.isname.name.n = 3; - else - goto error; - } break; case 7: { if(!strncmp(in->s, "version", 7)) sp->pvp.pvn.u.isname.name.n = 0; @@ -3079,27 +3071,12 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) static int pv_get_hep(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - static char sc_buf_ip[IP_ADDR_MAX_STR_SIZE + 12]; - int sc_buf_ip_len; - if(param == NULL) return -1; switch(param->pvn.u.isname.name.n) { case 0: return pv_get_uintval(msg, param, res, hep_version(msg)); - case 1: - return pv_get_uintval(msg, param, res, hep_version(msg)); - case 2: - sc_buf_ip_len = ip_addr2sbuf( - &msg->rcv.src_ip, sc_buf_ip, sizeof(sc_buf_ip) - 1); - sc_buf_ip[sc_buf_ip_len] = 0; - return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len); - case 3: - sc_buf_ip_len = ip_addr2sbuf( - &msg->rcv.dst_ip, sc_buf_ip, sizeof(sc_buf_ip) - 1); - sc_buf_ip[sc_buf_ip_len] = 0; - return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len); default: return hepv3_get_chunk(msg, msg->buf, msg->len, param->pvn.u.isname.name.n, param, res);

1 0

git:5.2:073212e0: sipcapture: fix typo
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.2 Commit: 073212e027e4e90b4520b32d5563d53afd22e0d9 URL: https://github.com/kamailio/kamailio/commit/073212e027e4e90b4520b32d5563d53… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:19:55+01:00 sipcapture: fix typo (cherry picked from commit d4d7a8bb27426045de9afd8636729426a346ca79) --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/073212e027e4e90b4520b32d5563d53… Patch: https://github.com/kamailio/kamailio/commit/073212e027e4e90b4520b32d5563d53… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 0430b96969..f58cd7bf5e 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -493,7 +493,7 @@ int parsing_hepv3_message(char *buf, unsigned int len) ri.bind_address = si; if(payload != NULL) { - /* and now recieve message */ + /* and now receive message */ if(hg->proto_t->data == 5) receive_logging_json_msg(payload, payload_len, hg, "rtcp_capture"); else if(hg->proto_t->data == 32) diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index dbb53c0537..f880ec4457 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2424,7 +2424,7 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) ri.bind_address = si; - /* and now recieve message */ + /* and now receive message */ receive_msg(buf + offset, len, &ri); if(si) pkg_free(si);

1 0

git:master:459ccabe: sipcapture: fix inaccessible HEP chunks
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 459ccabe9e3975dd5a90135ab96f3cccdf4ffdbe URL: https://github.com/kamailio/kamailio/commit/459ccabe9e3975dd5a90135ab96f3cc… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:18:21+01:00 sipcapture: fix inaccessible HEP chunks Chunk types 1 , 2 and 3 were not accessible. $hep(...) pseudovariable didn't return HEP chunks of type: * 1 (IP protocol family) returned HEP version (accessible via $hep(version)) * 2 (IP protocol ID) returned HEP message source IP * 3 (IPv4 source address) returned HEP message destination IP This removes keys src_ip and dst_ip. Use $si resp. $Ri instead. --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/459ccabe9e3975dd5a90135ab96f3cc… Patch: https://github.com/kamailio/kamailio/commit/459ccabe9e3975dd5a90135ab96f3cc… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 10e9d90e4d..5da37cbde7 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3043,14 +3043,6 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) else goto error; } break; - case 6: { - if(!strncmp(in->s, "src_ip", 6)) - sp->pvp.pvn.u.isname.name.n = 2; - else if(!strncmp(in->s, "dst_ip", 6)) - sp->pvp.pvn.u.isname.name.n = 3; - else - goto error; - } break; case 7: { if(!strncmp(in->s, "version", 7)) sp->pvp.pvn.u.isname.name.n = 0; @@ -3073,27 +3065,12 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) static int pv_get_hep(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - static char sc_buf_ip[IP_ADDR_MAX_STR_SIZE + 12]; - int sc_buf_ip_len; - if(param == NULL) return -1; switch(param->pvn.u.isname.name.n) { case 0: return pv_get_uintval(msg, param, res, hep_version(msg)); - case 1: - return pv_get_uintval(msg, param, res, hep_version(msg)); - case 2: - sc_buf_ip_len = ip_addr2sbuf( - &msg->rcv.src_ip, sc_buf_ip, sizeof(sc_buf_ip) - 1); - sc_buf_ip[sc_buf_ip_len] = 0; - return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len); - case 3: - sc_buf_ip_len = ip_addr2sbuf( - &msg->rcv.dst_ip, sc_buf_ip, sizeof(sc_buf_ip) - 1); - sc_buf_ip[sc_buf_ip_len] = 0; - return pv_get_strlval(msg, param, res, sc_buf_ip, sc_buf_ip_len); default: return hepv3_get_chunk(msg, msg->buf, msg->len, param->pvn.u.isname.name.n, param, res);

1 0

git:master:d4d7a8bb: sipcapture: fix typo
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: d4d7a8bb27426045de9afd8636729426a346ca79 URL: https://github.com/kamailio/kamailio/commit/d4d7a8bb27426045de9afd863672942… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:18:21+01:00 sipcapture: fix typo --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/d4d7a8bb27426045de9afd863672942… Patch: https://github.com/kamailio/kamailio/commit/d4d7a8bb27426045de9afd863672942… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index f435477a09..7606241074 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -493,7 +493,7 @@ int parsing_hepv3_message(char *buf, unsigned int len) ri.bind_address = si; if(payload != NULL) { - /* and now recieve message */ + /* and now receive message */ if(hg->proto_t->data == 5) receive_logging_json_msg(payload, payload_len, hg, "rtcp_capture"); else if(hg->proto_t->data == 32) diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 3622feea50..10e9d90e4d 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2421,7 +2421,7 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) ri.bind_address = si; - /* and now recieve message */ + /* and now receive message */ receive_msg(buf + offset, len, &ri); if(si) pkg_free(si);

1 0

git:master:5750b405: usrloc: Updated documentation for 'timer_procs' parameter to clarify purpose of having multiple timer processes.
by Your Name 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 5750b405e78de7d2f701708f9c41126c3173d8f5 URL: https://github.com/kamailio/kamailio/commit/5750b405e78de7d2f701708f9c41126… Author: Your Name <you(a)example.com> Committer: Your Name <you(a)example.com> Date: 2020-02-20T10:35:19-05:00 usrloc: Updated documentation for 'timer_procs' parameter to clarify purpose of having multiple timer processes. Raised in this sr-users thread by Joel Serrano: https://lists.kamailio.org/pipermail/sr-users/2020-February/108306.html --- Modified: src/modules/usrloc/README Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5750b405e78de7d2f701708f9c41126… Patch: https://github.com/kamailio/kamailio/commit/5750b405e78de7d2f701708f9c41126… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index ff466b0e78..40f9f0f1cd 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -854,6 +854,12 @@ modparam("usrloc", "db_check_update", 1) set to 0, no dedicated timer is started, the one from core will be used. + If the number of timer processes is greater than 1, the workload + of synchronization and record expiration is split up among the + multiple processes. (Each process is assigned a range of slots + from the internal hash table, and is responsible for cleanup and + storage on those slots.) + Default value is “0”. Example 1.36. Set timer_procs parameter diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 0f14209784..d23b2a9e7e 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -952,6 +952,14 @@ modparam("usrloc", "db_check_update", 1) database. If set to 0, no dedicated timer is started, the one from core will be used. </para> + + <para> + If the number of timer processes is greater than 1, the workload + of synchronization and record expiration is split up among the + multiple processes. (Each process is assigned a range of slots + from the internal hash table, and is responsible for cleanup and + storage on those slots.) + </para> <para> <emphasis> Default value is <quote>0</quote>.

3 2

ims_qos module - dedicated bearer release after call end
by Pafel 21 Feb '20

21 Feb '20

Hello, I am using ims qos module to send Rx_AAR for dedicated bearer via Diameter RX interface. Kamailio PCSCF is configured with #!define WITH_RX_CALL. It is working as expected but I have an issue with the release of the bearer after the call is disconnected. There is no function available to release the bearer. As I saw the only way to do this is via the rx_auth_expiry which is static: modparam("ims_qos", "rx_auth_expiry", 120) Is this something that is planned to be developed in the future or there is something I am missing? Thanks in advance! Regards, Pavel

2 3

git:master:84e049e7: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 84e049e7976c8c1407ae6d109fb4c10395b852de URL: https://github.com/kamailio/kamailio/commit/84e049e7976c8c1407ae6d109fb4c10… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-21T10:01:15+01:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/84e049e7976c8c1407ae6d109fb4c10… Patch: https://github.com/kamailio/kamailio/commit/84e049e7976c8c1407ae6d109fb4c10…

1 0

git:master:b96a1be8: kex: docs for rpc stats.fetchn command
by Daniel-Constantin Mierla 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: b96a1be81c6f4bb8ac3a8b11a02fc5d6a55faf41 URL: https://github.com/kamailio/kamailio/commit/b96a1be81c6f4bb8ac3a8b11a02fc5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-21T09:54:18+01:00 kex: docs for rpc stats.fetchn command --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b96a1be81c6f4bb8ac3a8b11a02fc5d… Patch: https://github.com/kamailio/kamailio/commit/b96a1be81c6f4bb8ac3a8b11a02fc5d… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 4893b4a280..334f989342 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -740,8 +740,8 @@ resetdebug(); <para>Print the list of available internal statistics.</para> <para>NOTE: the result is an array of strings that have the list of statistics formated like "name = value", being propagated over the time - from the MI variant. Use "stats.fetch" command to have a more - JSON-friendly output.</para> + from the MI variant. Use "stats.fetch" or "stats.fetchn"commands to have + a more JSON-friendly output.</para> <para>Parameters: <emphasis>statsid</emphasis> - which statistics to be printed. If set to 'all' then all statistics are printed; if set to 'statsgroup:' then all statistics in the group are printed; @@ -777,6 +777,29 @@ resetdebug(); &kamcmd; stats.fetch shmem.free_size &kamcmd; stats.fetch shmem: fwd_requests fwd_replies </programlisting> + </section> + <section id="kex.r.stats.fetchn"> + <title> + <function moreinfo="none">stats.fetchn</function> + </title> + <para>Print the list of available internal statistics with a more + json friendly output. Each printed statistic is a field in the output + structure: {"statsgroup.statsname" : statsvalue}. The value is + represented as number.</para> + <para>Parameters: <emphasis>statsid</emphasis> - which statistics to + be printed. If set to 'all' then all statistics are printed; if + set to 'statsgroup:' then all statistics in the group are printed; + if set to 'statsname' then the statistics identified by the name + is printed (can be also 'statsgroup.stastname' or + 'statsgroup:statsname').</para> + <para>Examples:</para> + <programlisting format="linespecific"> + &kamcmd; stats.fetchn all + &kamcmd; stats.fetchn core: + &kamcmd; stats.fetchn unsupported_methods + &kamcmd; stats.fetchn shmem.free_size + &kamcmd; stats.fetchn shmem: fwd_requests fwd_replies + </programlisting> </section> <section id="kex.r.stats.reset_statistics"> <title>

1 0

git:master:7a9cb26a: kex: new rpc command stats.fetchn
by Daniel-Constantin Mierla 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 7a9cb26aafc95ec8acb44ce36e513303319b8b6d URL: https://github.com/kamailio/kamailio/commit/7a9cb26aafc95ec8acb44ce36e51330… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-21T09:51:12+01:00 kex: new rpc command stats.fetchn - get internal statistics with the values represented as numbers - alternative to stats.fetch where the values are represented as strings --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/7a9cb26aafc95ec8acb44ce36e51330… Patch: https://github.com/kamailio/kamailio/commit/7a9cb26aafc95ec8acb44ce36e51330…

1 0

git:master:61ffd51c: tm: exported function to kemi returning the branch index
by Daniel-Constantin Mierla 21 Feb '20

21 Feb '20

Module: kamailio Branch: master Commit: 61ffd51c45daaefd87c7ec4a9d4d05afc9a306d6 URL: https://github.com/kamailio/kamailio/commit/61ffd51c45daaefd87c7ec4a9d4d05a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-21T08:58:24+01:00 tm: exported function to kemi returning the branch index --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/61ffd51c45daaefd87c7ec4a9d4d05a… Patch: https://github.com/kamailio/kamailio/commit/61ffd51c45daaefd87c7ec4a9d4d05a… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index b9b7f94877..8bcb1bd570 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -63,6 +63,7 @@ #include "../../core/cfg/cfg.h" #include "../../core/globals.h" #include "../../core/timer_ticks.h" +#include "../../core/dset.h" #include "../../core/mod_fix.h" #include "../../core/kemi.h" @@ -922,6 +923,50 @@ static int w_t_get_status_code(sip_msg_t* msg, char *p1, char *p2) return ki_t_get_status_code(msg); } +static int ki_t_get_branch_index(sip_msg_t* msg) +{ + tm_cell_t *t = 0; + tm_ctx_t *tcx = 0; + int idx = T_BR_UNDEFINED; + + if(msg==NULL) { + return -1; + } + + /* statefull replies have the branch_index set */ + if(msg->first_line.type == SIP_REPLY) { + tcx = tm_ctx_get(); + if(tcx != NULL) { + idx = tcx->branch_index; + } + } else switch(route_type) { + case BRANCH_ROUTE: + case BRANCH_FAILURE_ROUTE: + /* branch and branch_failure routes have their index set */ + tcx = tm_ctx_get(); + if(tcx != NULL) { + idx = tcx->branch_index; + } + break; + case REQUEST_ROUTE: + /* take the branch number from the number of added branches */ + idx = nr_branches; + break; + case FAILURE_ROUTE: + /* first get the transaction */ + t = get_t(); + if ( t == NULL || t == T_UNDEFINED ) { + return -1; + } + /* add the currently added branches to the number of + * completed branches in the transaction + */ + idx = t->nr_of_outgoings + nr_branches; + break; + } + return idx; +} + static int t_check_status(struct sip_msg* msg, char *p1, char *foo) { regmatch_t pmatch; @@ -3162,6 +3207,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_get_branch_index"), + SR_KEMIP_INT, ki_t_get_branch_index, + { SR_KEMIP_NONE, 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 } } };

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2020