sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
421 discussions

git:5.3:781a20ab: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.3 Commit: 781a20ab23738d8a3639f3b973bb07df41b0735f URL: https://github.com/kamailio/kamailio/commit/781a20ab23738d8a3639f3b973bb07d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-22T15:01:26+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/781a20ab23738d8a3639f3b973bb07d… Patch: https://github.com/kamailio/kamailio/commit/781a20ab23738d8a3639f3b973bb07d… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 048372ae96..7cafc18603 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -273,11 +273,11 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) - If this parameter is set to 1 then only contacts that have “behind_NAT” - flag in user location database set will get ping. + If this parameter is set to 1 then only contacts that have the behind + NAT “nat_bflag” flag in user location database set will get ping. - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is + sent to all contacts. If it is 0 and sipping_bflag parameter is set, then SIP-request-based pinging is sent to all contacts. Default value is 0.

1 0

git:master:0b207f62: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 0b207f621cf5e245ece384fa4f31d34ffd1b82db URL: https://github.com/kamailio/kamailio/commit/0b207f621cf5e245ece384fa4f31d34… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-22T15:01:12+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/0b207f621cf5e245ece384fa4f31d34… Patch: https://github.com/kamailio/kamailio/commit/0b207f621cf5e245ece384fa4f31d34… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 40c5d7142e..4cfe36880b 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -280,11 +280,11 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) - If this parameter is set to 1 then only contacts that have “behind_NAT” - flag in user location database set will get ping. + If this parameter is set to 1 then only contacts that have the behind + NAT “nat_bflag” flag in user location database set will get ping. - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is + sent to all contacts. If it is 0 and sipping_bflag parameter is set, then SIP-request-based pinging is sent to all contacts. Default value is 0.

1 0

git:5.3:a82c6a6c: nathelper: update flag documenation
by Henning Westerholt 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.3 Commit: a82c6a6c4d7836e6cac586872bdc384abb657c60 URL: https://github.com/kamailio/kamailio/commit/a82c6a6c4d7836e6cac586872bdc384… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-22T12:53:41Z nathelper: update flag documenation (cherry picked from commit 95fa98e254ae85b29fa80a8cddde3442b69ca9dc) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a82c6a6c4d7836e6cac586872bdc384… Patch: https://github.com/kamailio/kamailio/commit/a82c6a6c4d7836e6cac586872bdc384… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index b5a5b08167..2ab9f00ff8 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -173,13 +173,13 @@ modparam("nathelper", "natping_interval", 10) <title><varname>ping_nated_only</varname> (integer)</title> <para> If this parameter is set to 1 then only contacts that have - <quote>behind_NAT</quote> flag in user location database set will - get ping. + the behind NAT <quote>nat_bflag</quote> flag in user location + database set will get ping. </para> <para> - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, then - SIP-request-based pinging is sent to all contacts. + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping + is sent to all contacts. If it is 0 and sipping_bflag parameter + is set, then SIP-request-based pinging is sent to all contacts. </para> <para> <emphasis>

1 0

git:5.2:befc5dcc: nathelper: update flag documenation
by Henning Westerholt 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.2 Commit: befc5dcc3607eda3b837197109faeda411bcb549 URL: https://github.com/kamailio/kamailio/commit/befc5dcc3607eda3b837197109faeda… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-22T12:53:15Z nathelper: update flag documenation (cherry picked from commit 95fa98e254ae85b29fa80a8cddde3442b69ca9dc) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/befc5dcc3607eda3b837197109faeda… Patch: https://github.com/kamailio/kamailio/commit/befc5dcc3607eda3b837197109faeda… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index e3c47e2d70..591bdc54cd 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -173,13 +173,13 @@ modparam("nathelper", "natping_interval", 10) <title><varname>ping_nated_only</varname> (integer)</title> <para> If this parameter is set to 1 then only contacts that have - <quote>behind_NAT</quote> flag in user location database set will - get ping. + the behind NAT <quote>nat_bflag</quote> flag in user location + database set will get ping. </para> <para> - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, then - SIP-request-based pinging is sent to all contacts. + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping + is sent to all contacts. If it is 0 and sipping_bflag parameter + is set, then SIP-request-based pinging is sent to all contacts. </para> <para> <emphasis>

1 0

git:master:95fa98e2: nathelper: update flag documenation
by Henning Westerholt 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 95fa98e254ae85b29fa80a8cddde3442b69ca9dc URL: https://github.com/kamailio/kamailio/commit/95fa98e254ae85b29fa80a8cddde344… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-22T12:52:12Z nathelper: update flag documenation --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/95fa98e254ae85b29fa80a8cddde344… Patch: https://github.com/kamailio/kamailio/commit/95fa98e254ae85b29fa80a8cddde344… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 27b2ef3dbd..c188694d53 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -173,13 +173,13 @@ modparam("nathelper", "natping_interval", 10) <title><varname>ping_nated_only</varname> (integer)</title> <para> If this parameter is set to 1 then only contacts that have - <quote>behind_NAT</quote> flag in user location database set will - get ping. + the behind NAT <quote>nat_bflag</quote> flag in user location + database set will get ping. </para> <para> - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, then - SIP-request-based pinging is sent to all contacts. + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping + is sent to all contacts. If it is 0 and sipping_bflag parameter + is set, then SIP-request-based pinging is sent to all contacts. </para> <para> <emphasis>

1 0

git:5.3:3333d76e: siptrace: siptrace: fix memory leak in fake replies tracing
by Federico Cabiddu 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.3 Commit: 3333d76e57c637b6d6dd7617ba4a51892a836d04 URL: https://github.com/kamailio/kamailio/commit/3333d76e57c637b6d6dd7617ba4a518… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-22T14:17:14+02:00 siptrace: siptrace: fix memory leak in fake replies tracing --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/3333d76e57c637b6d6dd7617ba4a518… Patch: https://github.com/kamailio/kamailio/commit/3333d76e57c637b6d6dd7617ba4a518… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index ccd0b72508..e49946e525 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1496,6 +1496,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) siptrace_data_t sto; siptrace_info_t* info; int faked = 0; + int parsed_f = 0; struct sip_msg *msg; struct sip_msg *req; struct ip_addr to_ip; @@ -1534,6 +1535,11 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if(msg == NULL || msg == FAKED_REPLY) { msg = t->uas.request; faked = 1; + /* check if from header has been already parsed. + * If not we have to parse it in pkg memory and free it at the end. + */ + if (msg->from && msg->from->parsed == NULL) + parsed_f = 1; } if(sip_trace_prepare(msg) < 0) @@ -1617,10 +1623,16 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if (info->uriState == STRACE_RAW_URI) { LM_BUG("uriState must be either UNUSED or PARSED here! must be a bug! Message won't be traced!\n"); - return; + goto end; } sip_trace_store(&sto, info->uriState == STRACE_PARSED_URI ? &info->u.dest_info : NULL, NULL); + +end: + if (faked && parsed_f) { + free_from(msg->from->parsed); + msg->from->parsed = NULL; + } } static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps)

1 0

[kamailio/kamailio] siptrace: siptrace: fix memory leak in fake replies tracing (#2295)
by Federico Cabiddu 22 Apr '20

22 Apr '20

#### 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 - [X] 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:  - [X] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When tracing a faked reply (like 200 for CANCEL), the sip msg used to retrieve the tracing parameters is the transaction's uas one (uas.request) which might have the from header parsed or not, depending on the routing script actions (by default, if I'm not wrong, it is not parsed). If the header is not parsed, calling get_from in trace_onreply_out function will lead to a memory leak, beacause the header is parsed in pkg memory not freed when the transaction is deleted. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2295 -- Commit Summary -- * siptrace: siptrace: fix memory leak in fake replies tracing -- File Changes -- M src/modules/siptrace/siptrace.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2295.patch https://github.com/kamailio/kamailio/pull/2295.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/2295

2 12

git:master:673f25e0: Merge pull request #2295 from kamailio/grumvalski/siptrace_memleak_fix
by GitHub 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 673f25e0961cc49ad1804bb524b8e371adc39ff2 URL: https://github.com/kamailio/kamailio/commit/673f25e0961cc49ad1804bb524b8e37… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-22T14:05:26+02:00 Merge pull request #2295 from kamailio/grumvalski/siptrace_memleak_fix siptrace: siptrace: fix memory leak in fake replies tracing --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/673f25e0961cc49ad1804bb524b8e37… Patch: https://github.com/kamailio/kamailio/commit/673f25e0961cc49ad1804bb524b8e37… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 3bd1f5a98c..5b4c064bec 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1383,7 +1383,7 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) } if(sip_trace_msg_attrs(msg, &sto) < 0) { - return; + return; } if(ps->send_buf.len > 0) { @@ -1569,6 +1569,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) siptrace_data_t sto; siptrace_info_t* info; int faked = 0; + int parsed_f = 0; struct sip_msg *msg; struct sip_msg *req; struct ip_addr to_ip; @@ -1607,10 +1608,15 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if(msg == NULL || msg == FAKED_REPLY) { msg = t->uas.request; faked = 1; + /* check if from header has been already parsed. + * If not we have to parse it in pkg memory and free it at the end. + */ + if (msg->from && msg->from->parsed == NULL) + parsed_f = 1; } if(sip_trace_msg_attrs(msg, &sto) < 0) { - return; + goto end; } if(faked == 0) { @@ -1656,7 +1662,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) sto.status.s = int2strbuf(ps->code, statusbuf, INT2STR_MAX_LEN, &sto.status.len); if(sto.status.s == 0) { LM_ERR("failure to get the status string\n"); - return; + goto end; } memset(&to_ip, 0, sizeof(struct ip_addr)); @@ -1686,10 +1692,16 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if (info->uriState == STRACE_RAW_URI) { LM_BUG("uriState must be either UNUSED or PARSED here! must be a bug! Message won't be traced!\n"); - return; + goto end; } sip_trace_store(&sto, info->uriState == STRACE_PARSED_URI ? &info->u.dest_info : NULL, NULL); + +end: + if (faked && parsed_f) { + free_from(msg->from->parsed); + msg->from->parsed = NULL; + } } static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps)

1 0

git:master:0f461ee2: siptrace: free parsed from in case of errors
by Federico Cabiddu 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 0f461ee26fa72d1d2f4f6777f3e0d233619dc3fb URL: https://github.com/kamailio/kamailio/commit/0f461ee26fa72d1d2f4f6777f3e0d23… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-22T12:17:18+02:00 siptrace: free parsed from in case of errors --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/0f461ee26fa72d1d2f4f6777f3e0d23… Patch: https://github.com/kamailio/kamailio/commit/0f461ee26fa72d1d2f4f6777f3e0d23… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 26e9323ec7..5b4c064bec 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1383,7 +1383,7 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) } if(sip_trace_msg_attrs(msg, &sto) < 0) { - return; + return; } if(ps->send_buf.len > 0) { @@ -1616,7 +1616,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) } if(sip_trace_msg_attrs(msg, &sto) < 0) { - return; + goto end; } if(faked == 0) { @@ -1662,7 +1662,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) sto.status.s = int2strbuf(ps->code, statusbuf, INT2STR_MAX_LEN, &sto.status.len); if(sto.status.s == 0) { LM_ERR("failure to get the status string\n"); - return; + goto end; } memset(&to_ip, 0, sizeof(struct ip_addr)); @@ -1700,7 +1700,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) end: if (faked && parsed_f) { free_from(msg->from->parsed); - msg->from->parsed = NULL; + msg->from->parsed = NULL; } }

1 0

git:master:ee7496f1: siptrace: siptrace: fix memory leak in fake replies tracing
by Federico Cabiddu 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: ee7496f18b626a6c5dff10753db5b546759f6f7b URL: https://github.com/kamailio/kamailio/commit/ee7496f18b626a6c5dff10753db5b54… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-22T10:54:29+02:00 siptrace: siptrace: fix memory leak in fake replies tracing --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ee7496f18b626a6c5dff10753db5b54… Patch: https://github.com/kamailio/kamailio/commit/ee7496f18b626a6c5dff10753db5b54… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 3bd1f5a98c..26e9323ec7 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1569,6 +1569,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) siptrace_data_t sto; siptrace_info_t* info; int faked = 0; + int parsed_f = 0; struct sip_msg *msg; struct sip_msg *req; struct ip_addr to_ip; @@ -1607,6 +1608,11 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if(msg == NULL || msg == FAKED_REPLY) { msg = t->uas.request; faked = 1; + /* check if from header has been already parsed. + * If not we have to parse it in pkg memory and free it at the end. + */ + if (msg->from && msg->from->parsed == NULL) + parsed_f = 1; } if(sip_trace_msg_attrs(msg, &sto) < 0) { @@ -1686,10 +1692,16 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if (info->uriState == STRACE_RAW_URI) { LM_BUG("uriState must be either UNUSED or PARSED here! must be a bug! Message won't be traced!\n"); - return; + goto end; } sip_trace_store(&sto, info->uriState == STRACE_PARSED_URI ? &info->u.dest_info : NULL, NULL); + +end: + if (faked && parsed_f) { + free_from(msg->from->parsed); + msg->from->parsed = NULL; + } } static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps)

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020