sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:master:0a6323d4: secsipid: docs - fixed example for timeout parameter
by Daniel-Constantin Mierla 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: 0a6323d43654a2b6c51eb84f9f7a225573a8e005 URL: https://github.com/kamailio/kamailio/commit/0a6323d43654a2b6c51eb84f9f7a225… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T07:17:21+01:00 secsipid: docs - fixed example for timeout parameter --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0a6323d43654a2b6c51eb84f9f7a225… Patch: https://github.com/kamailio/kamailio/commit/0a6323d43654a2b6c51eb84f9f7a225… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 5ea85d6faf..79e77fc487 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -87,10 +87,10 @@ modparam("secsipid", "expire", 600) </emphasis> </para> <example> - <title>Set <varname>expire</varname> parameter</title> + <title>Set <varname>timeout</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("secsipid", "expire", 600) +modparam("secsipid", "timeout", 2) ... </programlisting> </example>

1 0

git:master:13da8cf5: ims_ocs: declare extern global variables in header file
by Daniel-Constantin Mierla 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: 13da8cf58a2abfcd87a48fbc963d4e1a26d60085 URL: https://github.com/kamailio/kamailio/commit/13da8cf58a2abfcd87a48fbc963d4e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T07:02:18+01:00 ims_ocs: declare extern global variables in header file --- Modified: src/modules/ims_ocs/ims_ocs_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/13da8cf58a2abfcd87a48fbc963d4e1… Patch: https://github.com/kamailio/kamailio/commit/13da8cf58a2abfcd87a48fbc963d4e1… --- diff --git a/src/modules/ims_ocs/ims_ocs_mod.h b/src/modules/ims_ocs/ims_ocs_mod.h index b46a29a4b4..cfddfdccc9 100644 --- a/src/modules/ims_ocs/ims_ocs_mod.h +++ b/src/modules/ims_ocs/ims_ocs_mod.h @@ -26,8 +26,8 @@ /** callback functions */ -struct cdp_binds cdpb; -cdp_avp_bind_t *cdp_avp; +extern struct cdp_binds cdpb; +extern cdp_avp_bind_t *cdp_avp; struct AAAMessage;

1 0

git:master:f879b4c4: core: small improvement related to commit 5e42adae624f9741 in cfg parser
by Henning Westerholt 05 Mar '20

05 Mar '20

Module: kamailio Branch: master Commit: f879b4c4d75777892f160d8abe639c6f15f68569 URL: https://github.com/kamailio/kamailio/commit/f879b4c4d75777892f160d8abe639c6… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-05T18:13:33+01:00 core: small improvement related to commit 5e42adae624f9741 in cfg parser --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/f879b4c4d75777892f160d8abe639c6… Patch: https://github.com/kamailio/kamailio/commit/f879b4c4d75777892f160d8abe639c6… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 29b5b4aa1d..114b8b9c0f 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2673,7 +2673,7 @@ attr_mark: ATTR_MARK { s_attr = (struct avp_spec*)pkg_malloc(sizeof(struct avp_spec)); if (!s_attr) { yyerror("No memory left"); YYABORT; } - else { memset(s_attr, 0, (sizeof(struct avp_spec))); s_attr->type = 0; } + else { memset(s_attr, 0, (sizeof(struct avp_spec))); } } ; attr_id:

1 0

Re: [sr-dev] [kamailio/kamailio] core: initialize memory to 0 in cfg parser in a few more places (5e42ada)
by Henning Westerholt 05 Mar '20

05 Mar '20

indeed, thank you -- 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/commit/5e42adae624f9741e26dfb0af4acced…

1 0

Re: [sr-dev] [kamailio/kamailio] core: initialize memory to 0 in cfg parser in a few more places (5e42ada)
by Daniel-Constantin Mierla 05 Mar '20

05 Mar '20

Minor one: the `s_attr->type = 0;` is no longer necessary. -- 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/commit/5e42adae624f9741e26dfb0af4acced…

1 0

git:master:5e42adae: core: initialize memory to 0 in cfg parser in a few more places
by Henning Westerholt 05 Mar '20

05 Mar '20

Module: kamailio Branch: master Commit: 5e42adae624f9741e26dfb0af4accede2a8f92d2 URL: https://github.com/kamailio/kamailio/commit/5e42adae624f9741e26dfb0af4acced… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-05T17:31:53+01:00 core: initialize memory to 0 in cfg parser in a few more places --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/5e42adae624f9741e26dfb0af4acced… Patch: https://github.com/kamailio/kamailio/commit/5e42adae624f9741e26dfb0af4acced… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 6319f8b5b4..29b5b4aa1d 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2673,7 +2673,7 @@ attr_mark: ATTR_MARK { s_attr = (struct avp_spec*)pkg_malloc(sizeof(struct avp_spec)); if (!s_attr) { yyerror("No memory left"); YYABORT; } - else s_attr->type = 0; + else { memset(s_attr, 0, (sizeof(struct avp_spec))); s_attr->type = 0; } } ; attr_id: @@ -3712,6 +3712,7 @@ static struct name_lst* mk_name_lst(char* host, int flags) if (l==0) { PKG_MEM_CRITICAL; } else { + memset(l, 0, sizeof(struct name_lst)); l->name=host; l->flags=flags; l->next=0; @@ -3728,6 +3729,7 @@ static struct socket_id* mk_listen_id(char* host, int proto, int port) if (l==0) { PKG_MEM_CRITICAL; } else { + memset(l, 0, sizeof(struct socket_id)); l->addr_lst=mk_name_lst(host, 0); if (l->addr_lst==0){ pkg_free(l); @@ -3763,6 +3765,7 @@ static struct socket_id* mk_listen_id2(struct name_lst* addr_l, int proto, if (l==0) { PKG_MEM_CRITICAL; } else { + memset(l, 0, sizeof(struct socket_id)); l->flags=addr_l->flags; l->port=port; l->proto=proto;

1 0

git:master:9cd1cec4: ims_charging: extern declaration for cdpb
by Daniel-Constantin Mierla 05 Mar '20

05 Mar '20

Module: kamailio Branch: master Commit: 9cd1cec4dedadcfcd50322c4709c4844a3db2f4f URL: https://github.com/kamailio/kamailio/commit/9cd1cec4dedadcfcd50322c4709c484… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-05T15:08:25+01:00 ims_charging: extern declaration for cdpb --- Modified: src/modules/ims_charging/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/9cd1cec4dedadcfcd50322c4709c484… Patch: https://github.com/kamailio/kamailio/commit/9cd1cec4dedadcfcd50322c4709c484… --- diff --git a/src/modules/ims_charging/dialog.c b/src/modules/ims_charging/dialog.c index 9b03998170..fdbaafe663 100644 --- a/src/modules/ims_charging/dialog.c +++ b/src/modules/ims_charging/dialog.c @@ -5,7 +5,7 @@ #include "ims_charging_stats.h" #include "../../core/parser/hf.h" -struct cdp_binds cdpb; +extern struct cdp_binds cdpb; extern int ro_db_mode; extern char *domain;

1 0

git:master:a13d49fb: ims_charging: use extern to avoid double declaration of globals
by Daniel-Constantin Mierla 05 Mar '20

05 Mar '20

Module: kamailio Branch: master Commit: a13d49fb099dd5e8d832a0559a8e69aa8c61c1ae URL: https://github.com/kamailio/kamailio/commit/a13d49fb099dd5e8d832a0559a8e69a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-05T13:45:36+01:00 ims_charging: use extern to avoid double declaration of globals --- Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_session_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/a13d49fb099dd5e8d832a0559a8e69a… Patch: https://github.com/kamailio/kamailio/commit/a13d49fb099dd5e8d832a0559a8e69a… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index 06284c6732..5fabde6714 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -25,6 +25,8 @@ MODULE_VERSION +struct dlg_binds* dlgb_p; + /* parameters */ char* ro_destination_host_s = "hss.ims.smilecoms.com"; char* ro_service_context_id_root_s = "32260(a)3gpp.org"; @@ -46,6 +48,8 @@ int video_service_identifier = 1001; int video_rating_group = 200; +struct impu_data impu_data_t; + /* DB params */ static str db_url = str_init(DEFAULT_DB_URL); static unsigned int db_update_period = DB_DEFAULT_UPDATE_PERIOD; diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index cd3ae215ae..b78016b99a 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -54,10 +54,10 @@ struct session_setup_data { unsigned int tlabel; }; -struct dlg_binds* dlgb_p; +extern struct dlg_binds* dlgb_p; extern struct tm_binds tmb; -int interim_request_credits; +extern int interim_request_credits; extern int voice_service_identifier; extern int voice_rating_group; diff --git a/src/modules/ims_charging/ro_session_hash.h b/src/modules/ims_charging/ro_session_hash.h index b81e843245..556d11d849 100644 --- a/src/modules/ims_charging/ro_session_hash.h +++ b/src/modules/ims_charging/ro_session_hash.h @@ -42,7 +42,9 @@ struct diameter_avp_value { struct impu_data { str identity; str contact; -} impu_data_t; +}; + +extern struct impu_data impu_data_t; struct ro_session { volatile int ref;

1 0

[kamailio/kamailio] corex: check not in SHM before PKG free for path (#2237)
by Stefan Mititelu 05 Mar '20

05 Mar '20

Do the same for reset_path_vector() in core msg parser.   #### 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 - [X] Tested changes locally - [X] Related to issue #1144 #### Description  Hi, Please have a look on this old discussion: https://lists.kamailio.org/pipermail/sr-dev/2018-July/047190.html We have been doing the shm_address_in() since then and no other apparent issue found since then. Please let me know what you think. Also let me know if I can backport this to 5.3. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2237 -- Commit Summary -- * corex: check not in SHM before PKG free for path -- File Changes -- M src/core/parser/msg_parser.c (11) M src/modules/corex/corex_lib.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2237.patch https://github.com/kamailio/kamailio/pull/2237.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/2237

3 4

git:5.2:1a142067: corex: check not in SHM before PKG free for path
by Henning Westerholt 05 Mar '20

05 Mar '20

Module: kamailio Branch: 5.2 Commit: 1a142067b04e41b98ce2f8d7f0946c2dcbd7914f URL: https://github.com/kamailio/kamailio/commit/1a142067b04e41b98ce2f8d7f0946c2… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-05T12:45:41+01:00 corex: check not in SHM before PKG free for path Do the same for reset_path_vector() in core msg parser. (cherry picked from commit 395303dbb3572e57bd8d16bcbbfb29d6d54a60fe) --- Modified: src/core/parser/msg_parser.c Modified: src/modules/corex/corex_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/1a142067b04e41b98ce2f8d7f0946c2… Patch: https://github.com/kamailio/kamailio/commit/1a142067b04e41b98ce2f8d7f0946c2… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index c220a5bb5c..0a8506e5a3 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -806,11 +806,14 @@ int set_path_vector(struct sip_msg* msg, str* path) void reset_path_vector(struct sip_msg* const msg) { - if (msg->path_vec.s) { - pkg_free(msg->path_vec.s); + if (!shm_address_in(msg->path_vec.s)) { + if (msg->path_vec.s) + pkg_free(msg->path_vec.s); + msg->path_vec.s = 0; + msg->path_vec.len = 0; + } else { + LM_WARN("Found path_vec that is not in pkg mem!\n"); } - msg->path_vec.s = 0; - msg->path_vec.len = 0; } diff --git a/src/modules/corex/corex_lib.c b/src/modules/corex/corex_lib.c index ec5334cb2e..3d3f73c0bd 100644 --- a/src/modules/corex/corex_lib.c +++ b/src/modules/corex/corex_lib.c @@ -63,11 +63,13 @@ int corex_append_branch(sip_msg_t *msg, str *uri, str *qv) msg->dst_uri.len = 0; /* if this is a cloned message, don't free the path vector as it was copied into shm memory and will be freed as contiguous block*/ - if (!(msg->msg_flags&FL_SHM_CLONE)) { - if(msg->path_vec.s!=0) + if (!shm_address_in(msg->path_vec.s)) { + if (msg->path_vec.s) pkg_free(msg->path_vec.s); msg->path_vec.s = 0; msg->path_vec.len = 0; + } else { + LM_WARN("Found path_vec that is not in pkg mem!\n"); } }

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
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