sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

[kamailio/kamailio] registrar: added new parameter sock_addr (#2498)

by Konstantin

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This feature was made half year ago. We would like to have inside location record address of the host where kamailio is installed. However when we installed it behind NAT we got private address in this field. This feature introduces possibility to set a socket string which will be written into location record. It could be public address instead address on which the register request was received. The default value is NULL and it works as usual. The feature was installed on our production servers in April and since that time it works well. I would like to propose this feature to others, because it could be useful. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2498 -- Commit Summary -- * registrar: added new parameter sock_addr -- File Changes -- M src/modules/registrar/doc/registrar_admin.xml (25) M src/modules/registrar/registrar.c (2) M src/modules/registrar/registrar.h (1) M src/modules/registrar/save.c (39) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2498.patch https://github.com/kamailio/kamailio/pull/2498.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/2498

3 years, 9 months

git:master:b495a00c: registrar: docs updated to reflect sock_mode parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b495a00c9a6fb2e073e7bd2a2b394facc9d76ea5 URL: https://github.com/kamailio/kamailio/commit/b495a00c9a6fb2e073e7bd2a2b394fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T11:34:03+02:00 registrar: docs updated to reflect sock_mode parameter --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b495a00c9a6fb2e073e7bd2a2b394fa… Patch: https://github.com/kamailio/kamailio/commit/b495a00c9a6fb2e073e7bd2a2b394fa… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 52559a638f..4fb1e8a5e8 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -535,26 +535,27 @@ modparam("registrar", "sock_hdr_name", "Sock-Info") </example> </section> - <section id="registrar.p.use_advertised_address"> - <title><varname>use_advertised_address</varname> (integer)</title> + <section id="registrar.p.sock_mode"> + <title><varname>sock_mode</varname> (integer)</title> <para> - This parameter can be used to override value written into socket field when contact is saved. - If set to 1, advertised address will be written instead local listen socket. + If set to 1, the server stores the advertised address in socket field, + instead of bind address. </para> <para> - This could be useful when kamailio is installed behind NAT and it is necessary to store its public IP - instead socket on which the register request was received. + This could be useful when kamailio is installed behind NAT and it is + necessary to store its public IP instead socket on which the register + request was received. </para> <para> <emphasis> - Default value is 0 (disabled). + Default value is 0 (store bind address). </emphasis> </para> <example> - <title>Set <varname>use_advertised_address</varname> parameter</title> + <title>Set <varname>sock_mode</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("registrar", "use_advertised_address", 1) +modparam("registrar", "sock_mode", 1) ... </programlisting> </example>

3 years, 9 months

git:master:32bf022a: registrar: renamed parameter to use advertise addr for socket

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 32bf022ad48ff1d7ac02ce2201373e8b684d4f6f URL: https://github.com/kamailio/kamailio/commit/32bf022ad48ff1d7ac02ce2201373e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T11:31:52+02:00 registrar: renamed parameter to use advertise addr for socket - becomes sock_mode, when set to 0 (default) use bind address, if set to 1, then use advertised address if specified --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/registrar.h Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/32bf022ad48ff1d7ac02ce2201373e8… Patch: https://github.com/kamailio/kamailio/commit/32bf022ad48ff1d7ac02ce2201373e8… --- diff --git a/src/modules/registrar/registrar.c b/src/modules/registrar/registrar.c index 7dae9b6ccb..923fde39d9 100644 --- a/src/modules/registrar/registrar.c +++ b/src/modules/registrar/registrar.c @@ -132,7 +132,7 @@ int reg_use_domain = 0; int sock_flag = -1; str sock_hdr_name = {0,0}; -int sock_advertise_enabled = 0; +int reg_sock_mode = 0; /* where to go for event route ("usrloc:contact-expired") */ int reg_expire_event_rt = -1; /* default disabled */ @@ -232,6 +232,7 @@ static param_export_t params[] = { {"received_avp", PARAM_STRING, &rcv_avp_param }, {"max_contacts", INT_PARAM, &default_registrar_cfg.max_contacts }, {"retry_after", INT_PARAM, &default_registrar_cfg.retry_after }, + {"sock_mode", PARAM_INT, &reg_sock_mode }, {"sock_flag", INT_PARAM, &sock_flag }, {"sock_hdr_name", PARAM_STR, &sock_hdr_name }, {"method_filtering", INT_PARAM, &method_filtering }, @@ -251,7 +252,6 @@ static param_export_t params[] = { {"lookup_filter_mode", INT_PARAM, &reg_lookup_filter_mode }, {"min_expires_mode", PARAM_INT, &reg_min_expires_mode }, {"use_expired_contacts", INT_PARAM, &default_registrar_cfg.use_expired_contacts }, - {"use_advertised_address", PARAM_INT, &sock_advertise_enabled }, {0, 0, 0} }; diff --git a/src/modules/registrar/registrar.h b/src/modules/registrar/registrar.h index 0fbdbd5bd4..fcf565a6fd 100644 --- a/src/modules/registrar/registrar.h +++ b/src/modules/registrar/registrar.h @@ -99,7 +99,7 @@ extern int reg_flow_timer; extern str sock_hdr_name; extern int sock_flag; -extern int sock_advertise_enabled; +extern int reg_sock_mode; extern str reg_xavp_cfg; extern str reg_xavp_rcd; diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 702499cfdd..4302127814 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -62,6 +62,8 @@ #include "save.h" #include "config.h" +#define REG_SOCK_USE_ADVERTISED 1 /* 1<<0 */ + static int mem_only = 0; extern sruid_t _reg_sruid; @@ -255,14 +257,17 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, /* set received socket */ if (_m->flags&sock_flag) { ci.sock = get_sock_val(_m); - if (ci.sock==0) + } + if (ci.sock==NULL) { + if ((reg_sock_mode & REG_SOCK_USE_ADVERTISED) + && _m->rcv.bind_address != NULL + && _m->rcv.bind_address->useinfo.sock_str.len > 0) { + memset(&si, 0, sizeof(struct socket_info)); + si.sock_str = _m->rcv.bind_address->useinfo.sock_str; + ci.sock = &si; + } else { ci.sock = _m->rcv.bind_address; - } else if (sock_advertise_enabled && _m->rcv.bind_address && _m->rcv.bind_address->useinfo.sock_str.len > 0) { - memset(&si, 0, sizeof(struct socket_info)); - si.sock_str = _m->rcv.bind_address->useinfo.sock_str; - ci.sock = &si; - } else { - ci.sock = _m->rcv.bind_address; + } } /* set tcp connection id */

3 years, 9 months

git:master:28e69c4c: modules: readme files regenerated - crypto ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 28e69c4cf214cbedb17ddccbf88a4acf8456adeb URL: https://github.com/kamailio/kamailio/commit/28e69c4cf214cbedb17ddccbf88a4ac… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-14T11:31:20+02:00 modules: readme files regenerated - crypto ... [skip ci] --- Modified: src/modules/crypto/README Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/28e69c4cf214cbedb17ddccbf88a4ac… Patch: https://github.com/kamailio/kamailio/commit/28e69c4cf214cbedb17ddccbf88a4ac…

3 years, 9 months

git:master:e3ec71b4: registrar: added option to store advertised address in socket field (#2498)

by GitHub

Module: kamailio Branch: master Commit: e3ec71b45181c2413b4aba4e2ea5e1b371a6da56 URL: https://github.com/kamailio/kamailio/commit/e3ec71b45181c2413b4aba4e2ea5e1b… Author: Konstantin <piligrim_pk(a)mail.ru> Committer: GitHub <noreply(a)github.com> Date: 2020-10-14T11:22:20+02:00 registrar: added option to store advertised address in socket field (#2498) * registrar: added new parameter sock_addr - override socket address on which the register request was received - default is NULL - store local socket address - usefull when kamailio is behind NAT and it is necessary to store public instead private address * registrar: replaced dynamically allocated var with static var Made refactoring of proposed solution. * registrar: socket field in location db will be initialized by advertise address from listen parameter According to code review recommendations I changed my solution - removed new config file parameter and use advertise address from listen parameter to initialized received socket which is written to location db inside registration record. * registrar: added additional check socket bind_address for null * registrar: introduced config parameter to enable/disable socket advertised address feature --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/registrar.h Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/e3ec71b45181c2413b4aba4e2ea5e1b… Patch: https://github.com/kamailio/kamailio/commit/e3ec71b45181c2413b4aba4e2ea5e1b…

3 years, 9 months

[kamailio/kamailio] crypto: add crypto_hmac_sha256() function (#2505)

by vitalikvoip

#### 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 PR adds crypto_hmac_sha256() function that can be used for JWT (JSON Web Token) authentication. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2505 -- Commit Summary -- * crypto: add crypto_hmac_sha256() function -- File Changes -- M src/modules/crypto/crypto_mod.c (115) M src/modules/crypto/doc/crypto_admin.xml (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2505.patch https://github.com/kamailio/kamailio/pull/2505.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/2505

3 years, 9 months

git:master:31d2e205: crypto: add crypto_hmac_sha256() function

by Vitalii Aleksandrov

Module: kamailio Branch: master Commit: 31d2e205cb4c17631abe8458a8a3b80323910637 URL: https://github.com/kamailio/kamailio/commit/31d2e205cb4c17631abe8458a8a3b80… Author: Vitalii Aleksandrov <valeksandrov(a)avistar.com> Committer: Vitalii Aleksandrov <valeksandrov(a)avistar.com> Date: 2020-10-13T15:07:16+03:00 crypto: add crypto_hmac_sha256() function --- Modified: src/modules/crypto/crypto_mod.c Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/31d2e205cb4c17631abe8458a8a3b80… Patch: https://github.com/kamailio/kamailio/commit/31d2e205cb4c17631abe8458a8a3b80…

3 years, 9 months

git:master:e7fe760e: Merge pull request #2505 from vitalikvoip/master

by GitHub

Module: kamailio Branch: master Commit: e7fe760e6a4a0f0c5eaedd0eb3530c5b3e1c7d05 URL: https://github.com/kamailio/kamailio/commit/e7fe760e6a4a0f0c5eaedd0eb3530c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-14T11:16:44+02:00 Merge pull request #2505 from vitalikvoip/master crypto: add crypto_hmac_sha256() function --- Modified: src/modules/crypto/crypto_mod.c Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e7fe760e6a4a0f0c5eaedd0eb3530c5… Patch: https://github.com/kamailio/kamailio/commit/e7fe760e6a4a0f0c5eaedd0eb3530c5…

3 years, 9 months

[kamailio/kamailio] Make the FLAGS declaration slightly clearer (#2500)

by Andrew Webster

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] 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) - [ ] 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/2500 -- Commit Summary -- * Make the FLAGS declaration slightly clearer -- File Changes -- M etc/kamailio.cfg (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2500.patch https://github.com/kamailio/kamailio/pull/2500.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/2500

3 years, 9 months

git:master:59b4a820: etc: kamailio.cfg - relocated comment related to branch flags

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 59b4a820aba7487552e98c8b082e7abd56fa8e81 URL: https://github.com/kamailio/kamailio/commit/59b4a820aba7487552e98c8b082e7ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T11:13:01+02:00 etc: kamailio.cfg - relocated comment related to branch flags --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/59b4a820aba7487552e98c8b082e7ab… Patch: https://github.com/kamailio/kamailio/commit/59b4a820aba7487552e98c8b082e7ab… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index e31d112839..29af152df7 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -150,12 +150,12 @@ import_file "kamailio-local.cfg" # - flags # FLT_ - per transaction (message) flags -# FLB_ - per branch flags #!define FLT_ACC 1 #!define FLT_ACCMISSED 2 #!define FLT_ACCFAILED 3 #!define FLT_NATS 5 +# FLB_ - per branch flags #!define FLB_NATB 6 #!define FLB_NATSIPPING 7

3 years, 9 months

← Newer
1
...
29
30
31
32
33
34
35
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020