sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
325 discussions

git:master:387de23a: rtpengine: do nothing in rtpengine_manage() when used in event_route[tm:branch-failure:...]
by Daniel-Constantin Mierla 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: 387de23a5c9252ee8409d378ea452bfd52e416d4 URL: https://github.com/kamailio/kamailio/commit/387de23a5c9252ee8409d378ea452bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-23T12:20:17+01:00 rtpengine: do nothing in rtpengine_manage() when used in event_route[tm:branch-failure:...] - avoid duplicating sdp operations --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/387de23a5c9252ee8409d378ea452bf… Patch: https://github.com/kamailio/kamailio/commit/387de23a5c9252ee8409d378ea452bf… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 4db1461f0d..c040c36444 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3616,9 +3616,14 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) int nosdp; tm_cell_t *t = NULL; + if(route_type==BRANCH_FAILURE_ROUTE) { + /* do nothing in branch failure event route + * - delete done on transaction failure route */ + return 1; + } + if (msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || - (msg->cseq==NULL))) - { + (msg->cseq==NULL))) { LM_ERR("no CSEQ header\n"); return -1; } @@ -3626,7 +3631,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) method = get_cseq(msg)->method_id; if (!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL - || method==METHOD_BYE || method==METHOD_UPDATE)) + || method==METHOD_BYE || method==METHOD_UPDATE)) return -1; if (method==METHOD_CANCEL || method==METHOD_BYE)

1 0

git:master:345d6f67: topoh: skip http reply handling
by Daniel-Constantin Mierla 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: 345d6f67006e4254300209742a2778b925cafaf7 URL: https://github.com/kamailio/kamailio/commit/345d6f67006e4254300209742a2778b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-22T11:18:06+01:00 topoh: skip http reply handling --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/345d6f67006e4254300209742a2778b… Patch: https://github.com/kamailio/kamailio/commit/345d6f67006e4254300209742a2778b… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index fb5d045910..62606fdced 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -249,8 +249,14 @@ int th_prepare_msg(sip_msg_t *msg) LM_DBG("non sip request message\n"); return 1; } - } else if(msg->first_line.type!=SIP_REPLY) { - LM_DBG("non sip message\n"); + } else if(msg->first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(msg)) + { + LM_DBG("non sip reply message\n"); + return 1; + } + } else { + LM_DBG("unknown sip message type %d\n", msg->first_line.type); return 1; }

1 0

git:master:fad79564: topos: skip http reply handling
by Daniel-Constantin Mierla 23 Feb '20

23 Feb '20

Module: kamailio Branch: master Commit: fad795648f8cbf12cc099dea18092ff7beee9c75 URL: https://github.com/kamailio/kamailio/commit/fad795648f8cbf12cc099dea18092ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-22T10:55:20+01:00 topos: skip http reply handling --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fad795648f8cbf12cc099dea18092ff… Patch: https://github.com/kamailio/kamailio/commit/fad795648f8cbf12cc099dea18092ff… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 22f2850d43..24f1216901 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -269,8 +269,13 @@ int tps_prepare_msg(sip_msg_t *msg) LM_DBG("non sip request message\n"); return 1; } - } else if(msg->first_line.type!=SIP_REPLY) { - LM_DBG("non sip message\n"); + } else if(msg->first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(msg)) { + LM_DBG("non sip reply message\n"); + return 1; + } + } else { + LM_DBG("unknown sip message type %d\n", msg->first_line.type); return 1; }

1 0

git:5.2:ef8238a5: usrloc: Updated docs for 'timer_procs' parameter about multiple timer processes
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.2 Commit: ef8238a58dc901904e53655cf9e14028fd190c2b URL: https://github.com/kamailio/kamailio/commit/ef8238a58dc901904e53655cf9e1402… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:26:43+01:00 usrloc: Updated docs for 'timer_procs' parameter about multiple timer processes --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ef8238a58dc901904e53655cf9e1402… Patch: https://github.com/kamailio/kamailio/commit/ef8238a58dc901904e53655cf9e1402… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 3dd180b937..74a1ac0506 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>.

2 2

git:5.2:179026e0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.2 Commit: 179026e078427f64ad8b360a41ded71ca2706090 URL: https://github.com/kamailio/kamailio/commit/179026e078427f64ad8b360a41ded71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-21T17:31:36+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/179026e078427f64ad8b360a41ded71… Patch: https://github.com/kamailio/kamailio/commit/179026e078427f64ad8b360a41ded71… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index fdf6b6f18b..a16e84af55 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -854,6 +854,11 @@ 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

1 0

git:5.3:f0c94fe9: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.3 Commit: f0c94fe953c631b722d6ea87a7dc81b8d9842ad1 URL: https://github.com/kamailio/kamailio/commit/f0c94fe953c631b722d6ea87a7dc81b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-21T17:31:22+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/f0c94fe953c631b722d6ea87a7dc81b… Patch: https://github.com/kamailio/kamailio/commit/f0c94fe953c631b722d6ea87a7dc81b… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index ff466b0e78..b8b0ffcaac 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -854,6 +854,11 @@ 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

1 0

git:5.3:dd78efd6: usrloc: Updated docs for 'timer_procs' parameter about multiple timer processes
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.3 Commit: dd78efd695490c68f21e13511c39956f95d503da URL: https://github.com/kamailio/kamailio/commit/dd78efd695490c68f21e13511c39956… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:25:10+01:00 usrloc: Updated docs for 'timer_procs' parameter about multiple timer processes --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dd78efd695490c68f21e13511c39956… Patch: https://github.com/kamailio/kamailio/commit/dd78efd695490c68f21e13511c39956… --- 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>.

1 0

[kamailio/kamailio] Sipcapture fix hep attributes (#2214)
by Bastian Triller 21 Feb '20

21 Feb '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  `$hep(...)` pseudovariable returns wrong values for keys `src_ip`, `dst_ip` and `0x001`. This patch removes the keys `src_ip` and `dst_ip` (`$si` resp. `$Ri` can be used for these values). `0x001` now correctly returns IP protocol family (`AF_INET`, `AF_INET6` ...). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2214 -- Commit Summary -- * sipcapture: fix typo * sipcapture: fix inaccessible HEP chunks -- File Changes -- M src/modules/sipcapture/hep.c (2) M src/modules/sipcapture/sipcapture.c (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2214.patch https://github.com/kamailio/kamailio/pull/2214.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/2214

3 7

git:5.3:ded3181d: sipcapture: fix inaccessible HEP chunks
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.3 Commit: ded3181d36a496186214ff6940081bb5a3a339f6 URL: https://github.com/kamailio/kamailio/commit/ded3181d36a496186214ff6940081bb… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:21:15+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/ded3181d36a496186214ff6940081bb… Patch: https://github.com/kamailio/kamailio/commit/ded3181d36a496186214ff6940081bb… --- 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:5.3:a1727714: sipcapture: fix typo
by Henning Westerholt 21 Feb '20

21 Feb '20

Module: kamailio Branch: 5.3 Commit: a1727714bcb4e78e455b77ec13dec4d7c4f7164a URL: https://github.com/kamailio/kamailio/commit/a1727714bcb4e78e455b77ec13dec4d… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-21T17:21:11+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/a1727714bcb4e78e455b77ec13dec4d… Patch: https://github.com/kamailio/kamailio/commit/a1727714bcb4e78e455b77ec13dec4d… --- 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

← Newer
1
...
15
16
17
18
19
20
21
...
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