sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:master:9a72a8ab: Merge pull request #1561 from tdimitrov/pcscf-secagree-dealloc

by GitHub

Module: kamailio Branch: master Commit: 9a72a8ab26b281102bd6813d6c80adac6aecb88b URL: https://github.com/kamailio/kamailio/commit/9a72a8ab26b281102bd6813d6c80ada… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-20T08:26:29+02:00 Merge pull request #1561 from tdimitrov/pcscf-secagree-dealloc Proper deallocation for the ipsec parameters in contact for IMS PCSCF modules --- Modified: src/modules/ims_registrar_pcscf/sec_agree.c Modified: src/modules/ims_registrar_pcscf/sec_agree.h Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/9a72a8ab26b281102bd6813d6c80ada… Patch: https://github.com/kamailio/kamailio/commit/9a72a8ab26b281102bd6813d6c80ada… --- diff --git a/src/modules/ims_registrar_pcscf/sec_agree.c b/src/modules/ims_registrar_pcscf/sec_agree.c index bc72272189..099dbbfff3 100644 --- a/src/modules/ims_registrar_pcscf/sec_agree.c +++ b/src/modules/ims_registrar_pcscf/sec_agree.c @@ -69,7 +69,7 @@ static int process_sec_agree_param(str name, str value, ipsec_t *ret) SEC_COPY_STR_PARAM(ret->mod, value); } else if(strncasecmp(name.s, "ealg", name.len) == 0) { - SEC_COPY_STR_PARAM(ret->r_alg, value); + SEC_COPY_STR_PARAM(ret->r_ealg, value); } else if(strncasecmp(name.s, "spi-c", name.len) == 0) { ret->spi_uc = parse_digits(value); @@ -201,20 +201,27 @@ static security_t* parse_sec_agree(struct hdr_field* h) return params; cleanup: - if(params) { + // The same piece of code also lives in modules/ims_usrloc_pcscf/pcontact.c + // Function - free_security() + // Keep them in sync! + if (params) { shm_free(params->sec_header.s); - if(params->data.ipsec) { + if(params->type == SECURITY_IPSEC && params->data.ipsec) { + shm_free(params->data.ipsec->ealg.s); + shm_free(params->data.ipsec->r_ealg.s); + shm_free(params->data.ipsec->ck.s); + shm_free(params->data.ipsec->alg.s); shm_free(params->data.ipsec->r_alg.s); + shm_free(params->data.ipsec->ik.s); shm_free(params->data.ipsec->prot.s); shm_free(params->data.ipsec->mod.s); - shm_free(params->data.ipsec->ealg.s); - shm_free(params->data.ipsec); } shm_free(params); } + return NULL; } diff --git a/src/modules/ims_registrar_pcscf/sec_agree.h b/src/modules/ims_registrar_pcscf/sec_agree.h index 421f30075b..958a79ca3b 100644 --- a/src/modules/ims_registrar_pcscf/sec_agree.h +++ b/src/modules/ims_registrar_pcscf/sec_agree.h @@ -32,6 +32,4 @@ */ security_t* cscf_get_security(struct sip_msg *msg); -void free_security_t(security_t *params); - #endif // SEC_AGREE_H diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 60d6b28132..76297bf1d9 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -112,6 +112,11 @@ void free_ppublic(ppublic_t* _p) shm_free(_p); } + +// The same piece of code also lives in modules/ims_registrar_pcscf/sec_agree.c +// Function - parse_sec_agree() +// goto label - cleanup +// Keep them in sync! void free_security(security_t* _p) { if (!_p) @@ -137,8 +142,9 @@ void free_security(security_t* _p) case SECURITY_TLS: shm_free(_p->data.tls); break; - - default: // Nothing to deallocate + + case SECURITY_NONE: + //Nothing to deallocate break; }

6 years, 5 months

git:master:18f7771a: ims_usrloc_pcscf: Update comment for free_security()

by Tsvetomir Dimitrov

Module: kamailio Branch: master Commit: 18f7771a8ce74e03b942a41095c6325f43ddb32f URL: https://github.com/kamailio/kamailio/commit/18f7771a8ce74e03b942a41095c6325… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-06-11T17:19:22+03:00 ims_usrloc_pcscf: Update comment for free_security() --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/18f7771a8ce74e03b942a41095c6325… Patch: https://github.com/kamailio/kamailio/commit/18f7771a8ce74e03b942a41095c6325… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 60d6b28132..76297bf1d9 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -112,6 +112,11 @@ void free_ppublic(ppublic_t* _p) shm_free(_p); } + +// The same piece of code also lives in modules/ims_registrar_pcscf/sec_agree.c +// Function - parse_sec_agree() +// goto label - cleanup +// Keep them in sync! void free_security(security_t* _p) { if (!_p) @@ -137,8 +142,9 @@ void free_security(security_t* _p) case SECURITY_TLS: shm_free(_p->data.tls); break; - - default: // Nothing to deallocate + + case SECURITY_NONE: + //Nothing to deallocate break; }

6 years, 5 months

git:master:2a0bef40: ims_registrar_pcscf: Updated security_t deallocation in sec_agree.c. Fix parsing of ealg parameter.

by Tsvetomir Dimitrov

Module: kamailio Branch: master Commit: 2a0bef409ddd9d8e29963553bb3c4e2e77d36ffb URL: https://github.com/kamailio/kamailio/commit/2a0bef409ddd9d8e29963553bb3c4e2… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-06-11T17:08:42+03:00 ims_registrar_pcscf: Updated security_t deallocation in sec_agree.c. Fix parsing of ealg parameter. --- Modified: src/modules/ims_registrar_pcscf/sec_agree.c Modified: src/modules/ims_registrar_pcscf/sec_agree.h --- Diff: https://github.com/kamailio/kamailio/commit/2a0bef409ddd9d8e29963553bb3c4e2… Patch: https://github.com/kamailio/kamailio/commit/2a0bef409ddd9d8e29963553bb3c4e2… --- diff --git a/src/modules/ims_registrar_pcscf/sec_agree.c b/src/modules/ims_registrar_pcscf/sec_agree.c index bc72272189..099dbbfff3 100644 --- a/src/modules/ims_registrar_pcscf/sec_agree.c +++ b/src/modules/ims_registrar_pcscf/sec_agree.c @@ -69,7 +69,7 @@ static int process_sec_agree_param(str name, str value, ipsec_t *ret) SEC_COPY_STR_PARAM(ret->mod, value); } else if(strncasecmp(name.s, "ealg", name.len) == 0) { - SEC_COPY_STR_PARAM(ret->r_alg, value); + SEC_COPY_STR_PARAM(ret->r_ealg, value); } else if(strncasecmp(name.s, "spi-c", name.len) == 0) { ret->spi_uc = parse_digits(value); @@ -201,20 +201,27 @@ static security_t* parse_sec_agree(struct hdr_field* h) return params; cleanup: - if(params) { + // The same piece of code also lives in modules/ims_usrloc_pcscf/pcontact.c + // Function - free_security() + // Keep them in sync! + if (params) { shm_free(params->sec_header.s); - if(params->data.ipsec) { + if(params->type == SECURITY_IPSEC && params->data.ipsec) { + shm_free(params->data.ipsec->ealg.s); + shm_free(params->data.ipsec->r_ealg.s); + shm_free(params->data.ipsec->ck.s); + shm_free(params->data.ipsec->alg.s); shm_free(params->data.ipsec->r_alg.s); + shm_free(params->data.ipsec->ik.s); shm_free(params->data.ipsec->prot.s); shm_free(params->data.ipsec->mod.s); - shm_free(params->data.ipsec->ealg.s); - shm_free(params->data.ipsec); } shm_free(params); } + return NULL; } diff --git a/src/modules/ims_registrar_pcscf/sec_agree.h b/src/modules/ims_registrar_pcscf/sec_agree.h index 421f30075b..958a79ca3b 100644 --- a/src/modules/ims_registrar_pcscf/sec_agree.h +++ b/src/modules/ims_registrar_pcscf/sec_agree.h @@ -32,6 +32,4 @@ */ security_t* cscf_get_security(struct sip_msg *msg); -void free_security_t(security_t *params); - #endif // SEC_AGREE_H

6 years, 5 months

[kamailio/kamailio] Proper deallocation for the ipsec parameters in contact for IMS PCSCF modules (#1561)

by Tsvetomir Dimitrov

#### 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:  - [ ] PR should be backported to stable branches - [ X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The patch contains two fixes for sec-agree parameters handling in: - module ims_registar_pcscf: ealg is read in wrong field of struct ipsec_t (was in r_alg, shoud be in r_ealg) - modules ims_registar_pcscf and ims_userloc_pcscf: struct ipsec_t is correctly deallocated from contact. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1561 -- Commit Summary -- * ims_registrar_pcscf: Updated security_t deallocation in sec_agree.c. Fix parsing of ealg parameter. * ims_usrloc_pcscf: Update comment for free_security() -- File Changes -- M src/modules/ims_registrar_pcscf/sec_agree.c (17) M src/modules/ims_registrar_pcscf/sec_agree.h (2) M src/modules/ims_usrloc_pcscf/pcontact.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1561.patch https://github.com/kamailio/kamailio/pull/1561.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/1561

6 years, 5 months

[kamailio] set_contact_alias is not applied (#445)

by Olle E. Johansson

If I run set_contact_alias nothing happens - the contact remains the same on the outbound message There's no error returned and debug logs indicate a proper header However, if I add "msg_apply_changes()" on the line after set_contact_alias the Contact sent to next hop has the alias content No other changes --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/445

6 years, 5 months

git:5.1:af57a5a9: dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..)

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: af57a5a9c19c6e8a26248a97c05d8e9de95a2691 URL: https://github.com/kamailio/kamailio/commit/af57a5a9c19c6e8a26248a97c05d8e9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-19T22:36:20+02:00 dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..) (cherry picked from commit 60fc36982d804466dd2a38f8c47e05e3cbf20ad9) --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/af57a5a9c19c6e8a26248a97c05d8e9… Patch: https://github.com/kamailio/kamailio/commit/af57a5a9c19c6e8a26248a97c05d8e9… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 1a27842254..8ed9dce1d3 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -35,7 +35,7 @@ dmq_api_t dlg_dmqb; dmq_peer_t* dlg_dmq_peer = NULL; dmq_resp_cback_t dlg_dmq_resp_callback = {&dlg_dmq_resp_callback_f, 0}; -int dmq_send_all_dlgs(); +int dmq_send_all_dlgs(dmq_node_t* dmq_node); int dlg_dmq_request_sync();

6 years, 5 months

git:5.0:941097d8: dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..)

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 941097d8faa5974d87587187d7725460106846b8 URL: https://github.com/kamailio/kamailio/commit/941097d8faa5974d87587187d772546… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-19T22:35:59+02:00 dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..) (cherry picked from commit 60fc36982d804466dd2a38f8c47e05e3cbf20ad9) --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/941097d8faa5974d87587187d772546… Patch: https://github.com/kamailio/kamailio/commit/941097d8faa5974d87587187d772546… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 1a27842254..8ed9dce1d3 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -35,7 +35,7 @@ dmq_api_t dlg_dmqb; dmq_peer_t* dlg_dmq_peer = NULL; dmq_resp_cback_t dlg_dmq_resp_callback = {&dlg_dmq_resp_callback_f, 0}; -int dmq_send_all_dlgs(); +int dmq_send_all_dlgs(dmq_node_t* dmq_node); int dlg_dmq_request_sync();

6 years, 5 months

git:5.0:89585896: dialog: dlg stats incremented twice (ported from git master 9317175c71c2c4a613)

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 89585896ed388f492b357218d66abf6b2c42e496 URL: https://github.com/kamailio/kamailio/commit/89585896ed388f492b357218d66abf6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-19T22:34:31+02:00 dialog: dlg stats incremented twice (ported from git master 9317175c71c2c4a613) (cherry picked from commit d8800d458386a7e35a523f33886f3b148697fa46) --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/89585896ed388f492b357218d66abf6… Patch: https://github.com/kamailio/kamailio/commit/89585896ed388f492b357218d66abf6… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 56ef5a473a..6baf7ddaf4 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -121,8 +121,6 @@ str empty_str = STR_NULL; /* statistic variables */ int dlg_enable_stats = 1; -int active_dlgs_cnt = 0; -int early_dlgs_cnt = 0; int detect_spirals = 1; int dlg_send_bye = 0; int dlg_timeout_noreset = 0; @@ -733,11 +731,6 @@ static int child_init(int rank) } } - if (rank==1) { - if_update_stat(dlg_enable_stats, active_dlgs, active_dlgs_cnt); - if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt); - } - if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index f4f7448327..0b9d77ce89 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -80,8 +80,6 @@ static db1_con_t* dialog_db_handle = 0; /* database connection handle */ static db_func_t dialog_dbf; extern int dlg_enable_stats; -extern int active_dlgs_cnt; -extern int early_dlgs_cnt; #define SET_STR_VALUE(_val, _str)\ @@ -376,10 +374,8 @@ static int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows) dlg->state = VAL_INT(values+8); if (dlg->state==DLG_STATE_CONFIRMED_NA || dlg->state==DLG_STATE_CONFIRMED) { - active_dlgs_cnt++; if_update_stat(dlg_enable_stats, active_dlgs, 1); } else if (dlg->state==DLG_STATE_EARLY) { - early_dlgs_cnt++; if_update_stat(dlg_enable_stats, early_dlgs, 1); }

6 years, 5 months

git:5.1:d8800d45: dialog: dlg stats incremented twice (ported from git master 9317175c71c2c4a613)

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: d8800d458386a7e35a523f33886f3b148697fa46 URL: https://github.com/kamailio/kamailio/commit/d8800d458386a7e35a523f33886f3b1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-19T22:33:05+02:00 dialog: dlg stats incremented twice (ported from git master 9317175c71c2c4a613) --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/d8800d458386a7e35a523f33886f3b1… Patch: https://github.com/kamailio/kamailio/commit/d8800d458386a7e35a523f33886f3b1… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7fb5013afb..1cf14fce07 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -126,8 +126,6 @@ str empty_str = STR_NULL; /* statistic variables */ int dlg_enable_stats = 1; -int active_dlgs_cnt = 0; -int early_dlgs_cnt = 0; int detect_spirals = 1; int dlg_send_bye = 0; int dlg_timeout_noreset = 0; @@ -745,11 +743,6 @@ static int child_init(int rank) } } - if (rank==1) { - if_update_stat(dlg_enable_stats, active_dlgs, active_dlgs_cnt); - if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt); - } - if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index f4f7448327..0b9d77ce89 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -80,8 +80,6 @@ static db1_con_t* dialog_db_handle = 0; /* database connection handle */ static db_func_t dialog_dbf; extern int dlg_enable_stats; -extern int active_dlgs_cnt; -extern int early_dlgs_cnt; #define SET_STR_VALUE(_val, _str)\ @@ -376,10 +374,8 @@ static int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows) dlg->state = VAL_INT(values+8); if (dlg->state==DLG_STATE_CONFIRMED_NA || dlg->state==DLG_STATE_CONFIRMED) { - active_dlgs_cnt++; if_update_stat(dlg_enable_stats, active_dlgs, 1); } else if (dlg->state==DLG_STATE_EARLY) { - early_dlgs_cnt++; if_update_stat(dlg_enable_stats, early_dlgs, 1); }

6 years, 5 months

git:master:78c68974: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 78c6897492d7846acdcf5af21c4c8839aff0b09b URL: https://github.com/kamailio/kamailio/commit/78c6897492d7846acdcf5af21c4c883… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-19T19:16:29+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/78c6897492d7846acdcf5af21c4c883… Patch: https://github.com/kamailio/kamailio/commit/78c6897492d7846acdcf5af21c4c883…

6 years, 5 months

← Newer
1
...
12
13
14
15
16
17
18
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018