sr-dev December 2019

sr-dev@lists.kamailio.org

19 participants
279 discussions

by Victor Seva

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Related to PR #2162 #### Description As discussed on #2162 with this change it's possible to decide witch xavp_rcd values will be stored using the new module parameter xavp_rcd_mask Using the same helper function on build_contact() so the behavior is consistant. Before only ruid and expires where stored when build_contact() was called. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2168 -- Commit Summary -- * registrar: control what values to add to xavp_rcd via xavp_rcd_mask * registrar: add documentation for xavp_rcd_mask parameter -- File Changes -- M src/modules/registrar/doc/registrar_admin.xml (31) M src/modules/registrar/lookup.c (35) M src/modules/registrar/lookup.h (4) M src/modules/registrar/registrar.c (3) M src/modules/registrar/registrar.h (8) M src/modules/registrar/reply.c (47) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2168.patch https://github.com/kamailio/kamailio/pull/2168.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/2168

4 years, 5 months

git:master:433551f3: tls: init EVP_PKEY pointer when loading engine key

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 433551f3ea00e4151f2fa4e84d7c52422b6cefe3 URL: https://github.com/kamailio/kamailio/commit/433551f3ea00e4151f2fa4e84d7c524… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-10T12:46:34+01:00 tls: init EVP_PKEY pointer when loading engine key --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/433551f3ea00e4151f2fa4e84d7c524… Patch: https://github.com/kamailio/kamailio/commit/433551f3ea00e4151f2fa4e84d7c524… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index 2188345a1a..3bfe0b8f99 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1194,7 +1194,7 @@ EVP_PKEY* tls_lookup_private_key(SSL_CTX* ctx) static int load_engine_private_key(tls_domain_t* d) { int idx, ret_pwd, i; - EVP_PKEY *pkey; + EVP_PKEY *pkey = 0; int procs_no; char ctx_str[64];

4 years, 5 months

git:master:46436cf8: tcp: checks for event route index on close

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 46436cf8ef7d337c255b2fd9115544a6971f9741 URL: https://github.com/kamailio/kamailio/commit/46436cf8ef7d337c255b2fd9115544a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-10T12:38:30+01:00 tcp: checks for event route index on close --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/46436cf8ef7d337c255b2fd9115544a… Patch: https://github.com/kamailio/kamailio/commit/46436cf8ef7d337c255b2fd9115544a… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 3f66958b6c..cb1728390c 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -239,6 +239,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) str *evname; if(tcpops_event_callback.len > 0) { + rt = -1; keng = sr_kemi_eng_get(); if(keng == NULL) { LM_DBG("even callback set, but no kemi engine\n"); @@ -261,7 +262,11 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) set_route_type(EVENT_ROUTE); init_run_actions_ctx(&ctx); if(keng == NULL) { - run_top_route(event_rt.rlist[rt], fmsg, 0); + if(rt>=0) { + run_top_route(event_rt.rlist[rt], fmsg, 0); + } else { + LM_DBG("no event route block to execute\n"); + } } else { if(tev->reason==TCP_CLOSED_TIMEOUT) { evname = &tcpops_evrt_timeout;

4 years, 5 months

git:master:263b8ce5: tm: rework code to avoid compiler warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 263b8ce5360716e44c6a7bcdbc65a76dfad67575 URL: https://github.com/kamailio/kamailio/commit/263b8ce5360716e44c6a7bcdbc65a76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T22:17:40+01:00 tm: rework code to avoid compiler warnings - fix log message priting wrong string variable --- Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/263b8ce5360716e44c6a7bcdbc65a76… Patch: https://github.com/kamailio/kamailio/commit/263b8ce5360716e44c6a7bcdbc65a76… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 949340f1ce..d2275a6151 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -165,8 +165,8 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, tm_cell_t *backup_T = T_UNDEFINED; int backup_T_branch = T_BR_UNDEFINED; sip_msg_t *faked_req; - sip_msg_t *brpl; - void *erpl; + sip_msg_t *brpl = NULL; + void *erpl = NULL; int faked_req_len = 0; struct cancel_info cancel_data; int branch; @@ -499,46 +499,48 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, } else { /* response handling */ tm_ctx_set_branch_index(T_BR_UNDEFINED); - /* unref the transaction */ - t_unref(brpl); - LM_DBG("Freeing earlier cloned reply\n"); - - /* free lumps that were added during reply processing */ - del_nonshm_lump( &(brpl->add_rm) ); - del_nonshm_lump( &(brpl->body_lumps) ); - del_nonshm_lump_rpl( &(brpl->reply_lump) ); - - /* free header's parsed structures that were added */ - for( hdr=brpl->headers ; hdr ; hdr=hdr->next ) { - if ( hdr->parsed && hdr_allocs_parse(hdr) && - (hdr->parsed<(void*)brpl || - hdr->parsed>=(void*)erpl)) { - clean_hdr_field(hdr); - hdr->parsed = 0; + if(brpl) { + /* unref the transaction */ + t_unref(brpl); + LM_DBG("Freeing earlier cloned reply\n"); + + /* free lumps that were added during reply processing */ + del_nonshm_lump( &(brpl->add_rm) ); + del_nonshm_lump( &(brpl->body_lumps) ); + del_nonshm_lump_rpl( &(brpl->reply_lump) ); + + /* free header's parsed structures that were added */ + for( hdr=brpl->headers ; hdr ; hdr=hdr->next ) { + if (hdr->parsed && hdr_allocs_parse(hdr) && + (hdr->parsed<(void*)brpl || + (erpl && hdr->parsed>=(void*)erpl))) { + clean_hdr_field(hdr); + hdr->parsed = 0; + } } - } - /* now go through hdr fields themselves - * and remove the pkg allocated space */ - hdr = brpl->headers; - while (hdr) { - if ( hdr && ((void*)hdr<(void*)brpl || - (void*)hdr>=(void*)erpl)) { - /* this header needs to be freed and removed form the list */ - if (!prev) { - brpl->headers = hdr->next; + /* now go through hdr fields themselves + * and remove the pkg allocated space */ + hdr = brpl->headers; + while (hdr) { + if ( hdr && ((void*)hdr<(void*)brpl || + (void*)hdr>=(void*)erpl)) { + /* this header needs to be freed and removed form the list */ + if (!prev) { + brpl->headers = hdr->next; + } else { + prev->next = hdr->next; + } + tmp = hdr; + hdr = hdr->next; + pkg_free(tmp); } else { - prev->next = hdr->next; + prev = hdr; + hdr = hdr->next; } - tmp = hdr; - hdr = hdr->next; - pkg_free(tmp); - } else { - prev = hdr; - hdr = hdr->next; } + sip_msg_free(brpl); } - sip_msg_free(brpl); } set_t(backup_T, backup_T_branch); diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index da47c60527..39180442e2 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1054,7 +1054,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) { regmatch_t pmatch; struct cell *t; - char *status, *s = NULL; + char *status = NULL; char backup; int lowest_status, n, ret; regex_t re; @@ -1071,7 +1071,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) memset(&re, 0, sizeof(regex_t)); if (regcomp(&re, sexp->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { - LM_ERR("Bad regular expression '%s'\n", s); + LM_ERR("Bad regular expression '%s'\n", sexp->s); goto error0; }

4 years, 5 months

git:master:fd750fe6: modules: readme files regenerated - tls ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: fd750fe6047343720e319479e405f6953a4097a4 URL: https://github.com/kamailio/kamailio/commit/fd750fe6047343720e319479e405f69… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-09T21:31:09+01:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/fd750fe6047343720e319479e405f69… Patch: https://github.com/kamailio/kamailio/commit/fd750fe6047343720e319479e405f69…

4 years, 5 months

git:master:0e5d24b4: tls: docs - fixed docbook tags

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0e5d24b4b5c427c1bcf0a4cecf21d6db260acb0c URL: https://github.com/kamailio/kamailio/commit/0e5d24b4b5c427c1bcf0a4cecf21d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T21:19:17+01:00 tls: docs - fixed docbook tags --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/0e5d24b4b5c427c1bcf0a4cecf21d6d… Patch: https://github.com/kamailio/kamailio/commit/0e5d24b4b5c427c1bcf0a4cecf21d6d… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index b04d47ed37..2e7ff3ce98 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1373,9 +1373,9 @@ modparam("tls", "engine_algorithms", "ALL") require_certificate parameters. Conversion table is as follows: </para> <itemizedlist> - <listitem><para>verify_certificate=0, require_certificate=0 => verify_client="off"</listitem></para> - <listitem><para>verify_certificate=1, require_certificate=0 => verify_client="optional"</listitem></para> - <listitem><para>verify_certificate=1, require_certificate=1 => verify_client="on"</listitem></para> + <listitem><para>verify_certificate=0, require_certificate=0 => verify_client="off"</para></listitem> + <listitem><para>verify_certificate=1, require_certificate=0 => verify_client="optional"</para></listitem> + <listitem><para>verify_certificate=1, require_certificate=1 => verify_client="on"</para></listitem> </itemizedlist> <example> <title>Set <varname>verify_client</varname> modparam parameter</title>

4 years, 5 months

git:master:765f4b1f: modules: readme files regenerated - tls ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 765f4b1f862ca297e673f0133d1acbdc4615ccb0 URL: https://github.com/kamailio/kamailio/commit/765f4b1f862ca297e673f0133d1acbd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-09T21:16:14+01:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/765f4b1f862ca297e673f0133d1acbd… Patch: https://github.com/kamailio/kamailio/commit/765f4b1f862ca297e673f0133d1acbd…

4 years, 5 months

git:master:24a522ba: tls: add verify_client support (#2166)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 24a522ba8565ccf1fc1d50792f8fb2585dd30039 URL: https://github.com/kamailio/kamailio/commit/24a522ba8565ccf1fc1d50792f8fb25… Author: Armen Babikyan <armenb(a)mit.edu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T21:02:53+01:00 tls: add verify_client support (#2166) * tls: add verify_client support * tls: fix error in forward-port * tls: docbook update --- Modified: src/modules/tls/doc/params.xml Modified: src/modules/tls/tls_cfg.c Modified: src/modules/tls/tls_cfg.h Modified: src/modules/tls/tls_config.c Modified: src/modules/tls/tls_config.h Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rpc.c Modified: src/modules/tls/tls_verify.c Modified: src/modules/tls/tls_verify.h --- Diff: https://github.com/kamailio/kamailio/commit/24a522ba8565ccf1fc1d50792f8fb25… Patch: https://github.com/kamailio/kamailio/commit/24a522ba8565ccf1fc1d50792f8fb25…

4 years, 5 months

[kamailio/kamailio] tls: add verify_client support (#2166)

by Armen Babikyan

Note: See below for more info about motivation of this feature. #### 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 This feature aims to replace require_certificate and verify_certificate params with a single option, verify_client: * Provides flexibility: require_certificate and verify_certificate are both booleans, so there are only 4 max combinations of params, and only 3 of them make sense (require_certificate=1 and verify_certificate=0 does not). In contrast, verify_client is a list of enumerated values, which can be more gracefully expanded by adding additional behaviors to the enum. * Motivation for this feature is to enable optional_no_ca behavior, described in the docbook; Without this feature, that behavior cannot be represented by any combination of require_certificate and verify_certificate. I figured if I need to add another variable to support desired behavior, it may as well be one that can hold more than just boolean values. * This feature was inspired from a similar one in Nginx; that software has a similar "ssl_verify_client" option that takes the same "on", "off", "optional", and "optional_no_ca" values, which effectively implement the same feature. Note that there is no shared code between implementations, and that these behaviors are implemented (in both cases) via a very thin layer of glue code on top of the OpenSSL library. * Note that the only function definition in tls_verify.c, verify_callback(int pre_verify_ok, X509_STORE_CTX *ctx), has been compiled into the kamailio binary, but apparently not used. Rather than modify the existing function, I added a simple 1-line function (2 if you count the log message too) to enable this feature. Please let me know if I can answer any questions. Thanks! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2166 -- Commit Summary -- * tls: add verify_client support -- File Changes -- M src/modules/tls/doc/params.xml (52) M src/modules/tls/tls_cfg.c (3) M src/modules/tls/tls_cfg.h (1) M src/modules/tls/tls_config.c (31) M src/modules/tls/tls_config.h (4) M src/modules/tls/tls_domain.c (20) M src/modules/tls/tls_domain.h (14) M src/modules/tls/tls_mod.c (12) M src/modules/tls/tls_rpc.c (3) M src/modules/tls/tls_verify.c (6) M src/modules/tls/tls_verify.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2166.patch https://github.com/kamailio/kamailio/pull/2166.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/2166

4 years, 5 months

[kamailio/kamailio] dmq usrloc replicate socket info (#2173)

by Nuno M Reis

- replicate socket_info through dmq for anycast scenarios using a new modparam You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2173 -- Commit Summary -- * Merge branch 'master' of git://git.sip-router.org/kamailio * Merge branch 'master' of git://github.com/kamailio/kamailio * replicate_socket_info using dmq -- File Changes -- M src/modules/dmq_usrloc/README (17) M src/modules/dmq_usrloc/dmq_usrloc.c (2) M src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml (33) M src/modules/dmq_usrloc/usrloc_sync.c (30) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2173.patch https://github.com/kamailio/kamailio/pull/2173.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/2173

4 years, 5 months

← Newer
1
...
18
19
20
21
22
23
24
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2019