sr-dev May 2018

sr-dev@lists.kamailio.org

22 participants
214 discussions

git:master:0f8a879a: ims_registrar_pcscf: Update tmp security only if there are sec-agree params in the message

by Tsvetomir Dimitrov

Module: kamailio Branch: master Commit: 0f8a879a212bd114aaa261a58e256f7fa51042c8 URL: https://github.com/kamailio/kamailio/commit/0f8a879a212bd114aaa261a58e256f7… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-05-09T10:12:58+03:00 ims_registrar_pcscf: Update tmp security only if there are sec-agree params in the message --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/0f8a879a212bd114aaa261a58e256f7… Patch: https://github.com/kamailio/kamailio/commit/0f8a879a212bd114aaa261a58e256f7… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 0edf7bd808..39dfe4d589 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -354,9 +354,11 @@ int save_pending(struct sip_msg* _m, udomain_t* _d) { } // Update security parameters - if(ul.update_temp_security(_d, sec_params->type, sec_params, pcontact) != 0) - { - LM_ERR("Error updating temp security\n"); + if(sec_params) { + if(ul.update_temp_security(_d, sec_params->type, sec_params, pcontact) != 0) + { + LM_ERR("Error updating temp security\n"); + } } ul.unlock_udomain(_d, &ci.via_host, ci.via_port, ci.via_prot);

6 years, 8 months

[kamailio/kamailio] ims_registrar_pcscf: Update tmp security only if there are sec-agree … (#1527)

by Tsvetomir Dimitrov

…params in the message   #### 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 #1526 #### Description  If a register is received without sec-agree parameters, a NULL pointer is deferenced, which causes segfault. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1527 -- Commit Summary -- * ims_registrar_pcscf: Update tmp security only if there are sec-agree params in the message -- File Changes -- M src/modules/ims_registrar_pcscf/save.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1527.patch https://github.com/kamailio/kamailio/pull/1527.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/1527

6 years, 8 months

git:master:2a3ca594: topos_redis: proper length value when comparing to insert INVITE branch

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2a3ca5942291d29de05b14338a36cecbec11f129 URL: https://github.com/kamailio/kamailio/commit/2a3ca5942291d29de05b14338a36cec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-23T20:43:48+02:00 topos_redis: proper length value when comparing to insert INVITE branch --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/2a3ca5942291d29de05b14338a36cec… Patch: https://github.com/kamailio/kamailio/commit/2a3ca5942291d29de05b14338a36cec… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 50e33121ee..bc810e702b 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1116,7 +1116,7 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, return -1; } - if(md->s_method.len==6 && strncmp(md->s_method.s, "INVITE", 7)==0) { + if(md->s_method.len==6 && strncmp(md->s_method.s, "INVITE", 6)==0) { if(tps_redis_insert_invite_branch(md)<0) { LM_ERR("failed to insert INVITE extra branch data\n"); return -1;

6 years, 9 months

git:master:eb2f25ca: tm: set msg for log_prefix before running failure_route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: eb2f25ca0810f966d089da3aa1e32e3e98a4ab16 URL: https://github.com/kamailio/kamailio/commit/eb2f25ca0810f966d089da3aa1e32e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-23T20:42:51+02:00 tm: set msg for log_prefix before running failure_route - reported by GH #1531 --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/eb2f25ca0810f966d089da3aa1e32e3… Patch: https://github.com/kamailio/kamailio/commit/eb2f25ca0810f966d089da3aa1e32e3… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 9958e70333..8b94cec624 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -988,6 +988,7 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, t->on_failure=0; /* if continuing on timeout of a suspended transaction, reset the flag */ t->flags &= ~T_ASYNC_SUSPENDED; + log_prefix_set(faked_req); if (exec_pre_script_cb(faked_req, FAILURE_CB_TYPE)>0) { /* run a failure_route action if some was marked */ keng = sr_kemi_eng_get(); @@ -1002,6 +1003,7 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, } exec_post_script_cb(faked_req, FAILURE_CB_TYPE); } + log_prefix_set(NULL); /* update message flags, if changed in failure route */ t->uas.request->flags = faked_req->flags; }

6 years, 9 months

git:master:f3109d4d: core: qm malloc - wrapper to print execution file and line for qm_debug_frag()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f3109d4dcdc4ef810ccf4a8d17f28f7fce42271c URL: https://github.com/kamailio/kamailio/commit/f3109d4dcdc4ef810ccf4a8d17f28f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-23T18:43:22+02:00 core: qm malloc - wrapper to print execution file and line for qm_debug_frag() --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/f3109d4dcdc4ef810ccf4a8d17f28f7… Patch: https://github.com/kamailio/kamailio/commit/f3109d4dcdc4ef810ccf4a8d17f28f7… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 10abb86c43..0c3528544d 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -112,15 +112,18 @@ inline static unsigned long big_hash_idx(unsigned long s) #define END_CHECK_PATTERN2 0xabcdefed -static void qm_debug_frag(struct qm_block* qm, struct qm_frag* f, - const char* file, unsigned int line) +#define qm_debug_frag(qm, f, file, line) \ + qm_debug_check_frag((qm), (f), (file), (line), __FILE__, __LINE__) +static void qm_debug_check_frag(struct qm_block* qm, struct qm_frag* f, + const char* file, unsigned int line, + const char* efile, unsigned int eline) { if (f->check!=ST_CHECK_PATTERN){ LM_CRIT("BUG: qm: fragm. %p (address %p) " "beginning overwritten (%lx)! Memory allocator was called " - "from %s:%u. Fragment marked by %s:%lu.\n", + "from %s:%u. Fragment marked by %s:%lu. Exec from %s:%u.\n", f, (char*)f+sizeof(struct qm_frag), - f->check, file, line, f->file, f->line); + f->check, file, line, f->file, f->line, efile, eline); qm_status(qm); abort(); }; @@ -128,10 +131,10 @@ static void qm_debug_frag(struct qm_block* qm, struct qm_frag* f, (FRAG_END(f)->check2!=END_CHECK_PATTERN2)){ LM_CRIT("BUG: qm: fragm. %p (address %p) " "end overwritten (%lx, %lx)! Memory allocator was called " - "from %s:%u. Fragment marked by %s:%lu.\n", + "from %s:%u. Fragment marked by %s:%lu. Exec from %s:%u.\n", f, (char*)f+sizeof(struct qm_frag), FRAG_END(f)->check1, FRAG_END(f)->check2, - file, line, f->file, f->line); + file, line, f->file, f->line, efile, eline); qm_status(qm); abort(); } @@ -140,9 +143,10 @@ static void qm_debug_frag(struct qm_block* qm, struct qm_frag* f, (PREV_FRAG_END(f)->check2!=END_CHECK_PATTERN2) ) ){ LM_CRIT("BUG: qm: prev. fragm. tail overwritten(%lx, %lx)[%p:%p]! " "Memory allocator was called from %s:%u. Fragment marked by " - "%s:%lu.\n", + "%s:%lu. Exec from %s:%u.\n", PREV_FRAG_END(f)->check1, PREV_FRAG_END(f)->check2, f, - (char*)f+sizeof(struct qm_frag), file, line, f->file, f->line); + (char*)f+sizeof(struct qm_frag), file, line, f->file, f->line, + efile, eline); qm_status(qm); abort(); }

6 years, 9 months

git:master:3334a011: modules: readme files regenerated - p_usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3334a011f6de4dc7284e2875e0d08158f8859482 URL: https://github.com/kamailio/kamailio/commit/3334a011f6de4dc7284e2875e0d0815… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-23T16:31:59+02:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/3334a011f6de4dc7284e2875e0d0815… Patch: https://github.com/kamailio/kamailio/commit/3334a011f6de4dc7284e2875e0d0815…

6 years, 9 months

[kamailio/kamailio] p_usrloc: new parameter "mdb_availability_control" has been created. (#1529)

by hdikme

- The new parameter "mdb_availability_control" overwrites the "write_on_master_db" parameter based on the availability of master database.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1529 -- Commit Summary -- * p_usrloc: new parameter "mdb_availability_control" has been created. -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (20) M src/modules/p_usrloc/p_usrloc_mod.c (17) M src/modules/p_usrloc/p_usrloc_mod.h (6) M src/modules/p_usrloc/ul_db.c (34) M src/modules/p_usrloc/ul_db.h (1) M src/modules/p_usrloc/ul_db_watch.c (24) M src/modules/p_usrloc/ul_db_watch.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1529.patch https://github.com/kamailio/kamailio/pull/1529.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/1529

6 years, 9 months

git:master:bec6a75a: Merge pull request #1529 from hdikme/mdb_avail_ctl

by GitHub

Module: kamailio Branch: master Commit: bec6a75ac664a2c8834339b499f3b4f907312e48 URL: https://github.com/kamailio/kamailio/commit/bec6a75ac664a2c8834339b499f3b4f… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: GitHub <noreply(a)github.com> Date: 2018-05-23T17:17:51+03:00 Merge pull request #1529 from hdikme/mdb_avail_ctl p_usrloc: new parameter "mdb_availability_control" has been created. --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db.h Modified: src/modules/p_usrloc/ul_db_watch.c Modified: src/modules/p_usrloc/ul_db_watch.h --- Diff: https://github.com/kamailio/kamailio/commit/bec6a75ac664a2c8834339b499f3b4f… Patch: https://github.com/kamailio/kamailio/commit/bec6a75ac664a2c8834339b499f3b4f…

6 years, 9 months

git:master:61c96f0c: p_usrloc: new parameter "mdb_availability_control" has been created.

by Huseyin Dikme

Module: kamailio Branch: master Commit: 61c96f0cc8ddac3e0aa71046ec4021a90b629975 URL: https://github.com/kamailio/kamailio/commit/61c96f0cc8ddac3e0aa71046ec4021a… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: 2018-05-23T12:54:59+02:00 p_usrloc: new parameter "mdb_availability_control" has been created. - The new parameter "mdb_availability_control" overwrites the "write_on_db" parameter based on the availability of master database. --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db.h Modified: src/modules/p_usrloc/ul_db_watch.c Modified: src/modules/p_usrloc/ul_db_watch.h --- Diff: https://github.com/kamailio/kamailio/commit/61c96f0cc8ddac3e0aa71046ec4021a… Patch: https://github.com/kamailio/kamailio/commit/61c96f0cc8ddac3e0aa71046ec4021a…

6 years, 9 months

git:5.0:0045f52d: tls: Fixed build tls module on Alpine dist

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 0045f52da587a2aa1c050d920bc3900273409a23 URL: https://github.com/kamailio/kamailio/commit/0045f52da587a2aa1c050d920bc3900… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-22T21:32:14+02:00 tls: Fixed build tls module on Alpine dist (cherry picked from commit 9bdc1eba76f03cd009d7f04906f13bdb6579f511) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/0045f52da587a2aa1c050d920bc3900… Patch: https://github.com/kamailio/kamailio/commit/0045f52da587a2aa1c050d920bc3900… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 054d687e9c..3664469bd9 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -847,7 +847,7 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); -#if OPENSSL_VERSION_NUMBER >= 0x010100000L +#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) /* explicit execution of libssl cleanup to avoid being executed again * by atexit(), when shm is gone */ DBG("executing openssl v1.1+ cleanup\n");

6 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2018