sr-dev July 2020

sr-dev@lists.kamailio.org

26 participants
390 discussions

git:master:0cc1e167: db_redis: use safer localtime_r() function
by Daniel-Constantin Mierla 06 Jul '20

06 Jul '20

Module: kamailio Branch: master Commit: 0cc1e167b9e54bb4a652162445efe89b02939eed URL: https://github.com/kamailio/kamailio/commit/0cc1e167b9e54bb4a652162445efe89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-06T08:50:00+02:00 db_redis: use safer localtime_r() function --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/0cc1e167b9e54bb4a652162445efe89… Patch: https://github.com/kamailio/kamailio/commit/0cc1e167b9e54bb4a652162445efe89… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index ea1a6aa43e..9c81385a39 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1152,6 +1152,7 @@ static int db_redis_compare_column(db_key_t k, db_val_t *v, db_op_t op, redisRep double d_value; str *tmpstr; char tmp[32] = ""; + struct tm _time; int vtype = VAL_TYPE(v); @@ -1283,7 +1284,8 @@ static int db_redis_compare_column(db_key_t k, db_val_t *v, db_op_t op, redisRep return -1; case DB1_DATETIME: // TODO: insert int value to db for faster comparison! - strftime(tmp, sizeof(tmp), "%Y-%m-%d %H:%M:%S", localtime(&(VAL_TIME(v)))); + localtime_r(&(VAL_TIME(v)), &_time); + strftime(tmp, sizeof(tmp), "%Y-%m-%d %H:%M:%S", &_time); LM_DBG("comparing DATETIME %s %s %s\n", reply->str, op, tmp); if (!strcmp(op, OP_EQ)) { return (strcmp(reply->str, tmp) == 0) ? 0 : -1;

1 0

git:master:ebf80aca: dispatcher: variables declared at the beginning of blocks
by Daniel-Constantin Mierla 06 Jul '20

06 Jul '20

Module: kamailio Branch: master Commit: ebf80aca06cdbba1f00d502168ee8ab4d1d3d14f URL: https://github.com/kamailio/kamailio/commit/ebf80aca06cdbba1f00d502168ee8ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-04T17:50:54+02:00 dispatcher: variables declared at the beginning of blocks --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ebf80aca06cdbba1f00d502168ee8ab… Patch: https://github.com/kamailio/kamailio/commit/ebf80aca06cdbba1f00d502168ee8ab…

1 0

[kamailio/kamailio] Revert "nathelper: add optional set_contact_alias([trim]) parameter" (#2389)
by Emmanuel Schmidbauer 04 Jul '20

04 Jul '20

Reverts kamailio/kamailio#2388 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2389 -- Commit Summary -- * Revert "nathelper: add optional set_contact_alias([trim]) parameter" -- File Changes -- M src/core/dset.c (85) M src/core/dset.h (1) M src/modules/nathelper/doc/nathelper_admin.xml (12) M src/modules/nathelper/nathelper.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2389.patch https://github.com/kamailio/kamailio/pull/2389.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/2389

3 4

git:master:6a637cf8: core: tcp - test connection reference counter to avoid going negative
by Daniel-Constantin Mierla 03 Jul '20

03 Jul '20

Module: kamailio Branch: master Commit: 6a637cf84906ec5315c77e5458180f7d9d69a481 URL: https://github.com/kamailio/kamailio/commit/6a637cf84906ec5315c77e5458180f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-03T23:00:24+02:00 core: tcp - test connection reference counter to avoid going negative --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/6a637cf84906ec5315c77e5458180f7… Patch: https://github.com/kamailio/kamailio/commit/6a637cf84906ec5315c77e5458180f7… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index fd5a644ee5..f19f75a588 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3263,7 +3263,8 @@ inline static int tcpconn_put_destroy(struct tcp_connection* tcpconn) * the refcnt. and at least a membar_write_atomic_op() mem. barrier or * a mb_atomic_* op must * be used to make sure all the changed flags are * written into memory prior to the new refcnt value */ - if (unlikely(mb_atomic_dec_and_test(&tcpconn->refcnt))){ + if (unlikely((mb_atomic_get(&tcpconn->refcnt)==0) + || mb_atomic_dec_and_test(&tcpconn->refcnt))){ _tcpconn_free(tcpconn); return 1; }

1 0

[kamailio/kamailio] nathelper: add optional set_contact_alias([trim]) parameter (#2388)
by Emmanuel Schmidbauer 03 Jul '20

03 Jul '20

#### Pre-Submission Checklist - [x] 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) - [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 issue #2308 #### Description add support for trimming an already existing alias parameter when calling `set_contact_alias()` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2388 -- Commit Summary -- * nathelper: add optional set_contact_alias([trim]) parameter -- File Changes -- M src/core/dset.c (85) M src/core/dset.h (1) M src/modules/nathelper/doc/nathelper_admin.xml (12) M src/modules/nathelper/nathelper.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2388.patch https://github.com/kamailio/kamailio/pull/2388.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/2388

3 9

git:master:9322a98c: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 03 Jul '20

03 Jul '20

Module: kamailio Branch: master Commit: 9322a98cd451fa470c8ff93f85758f41c4fc6bce URL: https://github.com/kamailio/kamailio/commit/9322a98cd451fa470c8ff93f85758f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-03T19:31:10+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/9322a98cd451fa470c8ff93f85758f4… Patch: https://github.com/kamailio/kamailio/commit/9322a98cd451fa470c8ff93f85758f4… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 7398c702a5..4cfe36880b 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -67,7 +67,7 @@ Ovidiu Sas 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) 5.8. handle_ruri_alias() - 5.9. set_contact_alias([trim]) + 5.9. set_contact_alias() 5.10. set_alias_to_pv(target_avp) 6. Exported Pseudo Variables @@ -158,7 +158,7 @@ Chapter 1. Admin Guide 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) 5.8. handle_ruri_alias() - 5.9. set_contact_alias([trim]) + 5.9. set_contact_alias() 5.10. set_alias_to_pv(target_avp) 6. Exported Pseudo Variables @@ -498,7 +498,7 @@ modparam("nathelper", "nat_addr_mode", 0) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) 5.8. handle_ruri_alias() - 5.9. set_contact_alias([trim]) + 5.9. set_contact_alias() 5.10. set_alias_to_pv(target_avp) 5.1. fix_nated_contact() @@ -700,19 +700,13 @@ if(is_rfc1918("$rd")) { }; ... -5.9. set_contact_alias([trim]) +5.9. set_contact_alias() Adds an “;alias=ip~port~transport” parameter to the contact URI containing the received ip, port, and transport protocol. The new contact URI is immediately visible to other modules in the way the fix_nated_contact() does it. - Meaning of parameters: - * trim - by default, set_contact_alias() will not detect and trim an - already existing alias parameter. If this optional parameter is set - to "1", set_contact_alias() will trim the existing alias before - adding a new one. - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE, and FAILURE_ROUTE.

1 0

git:master:626fbd00: Merge pull request #2389 from kamailio/revert-2388-nathelper-set_contact_alias-trim
by GitHub 03 Jul '20

03 Jul '20

Module: kamailio Branch: master Commit: 626fbd002e4d569767e84a99a2163d0bd9ff6efd URL: https://github.com/kamailio/kamailio/commit/626fbd002e4d569767e84a99a2163d0… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-07-03T13:26:13-04:00 Merge pull request #2389 from kamailio/revert-2388-nathelper-set_contact_alias-trim Revert "nathelper: add optional set_contact_alias([trim]) parameter" --- Modified: src/core/dset.c Modified: src/core/dset.h Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/626fbd002e4d569767e84a99a2163d0… Patch: https://github.com/kamailio/kamailio/commit/626fbd002e4d569767e84a99a2163d0…

1 0

git:master:2802bd75: Revert "nathelper: add optional set_contact_alias([trim]) parameter"
by GitHub 03 Jul '20

03 Jul '20

Module: kamailio Branch: master Commit: 2802bd75cd03e16bf6541fde1d6459bda2698153 URL: https://github.com/kamailio/kamailio/commit/2802bd75cd03e16bf6541fde1d6459b… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-07-03T13:22:16-04:00 Revert "nathelper: add optional set_contact_alias([trim]) parameter" --- Modified: src/core/dset.c Modified: src/core/dset.h Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/2802bd75cd03e16bf6541fde1d6459b… Patch: https://github.com/kamailio/kamailio/commit/2802bd75cd03e16bf6541fde1d6459b…

1 0

git:master:339b94ce: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 03 Jul '20

03 Jul '20

Module: kamailio Branch: master Commit: 339b94ce713b2a3d3763d2c15c8d1437362f648e URL: https://github.com/kamailio/kamailio/commit/339b94ce713b2a3d3763d2c15c8d143… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-03T16:46:13+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/339b94ce713b2a3d3763d2c15c8d143… Patch: https://github.com/kamailio/kamailio/commit/339b94ce713b2a3d3763d2c15c8d143… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 4cfe36880b..7398c702a5 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -67,7 +67,7 @@ Ovidiu Sas 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) 5.8. handle_ruri_alias() - 5.9. set_contact_alias() + 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) 6. Exported Pseudo Variables @@ -158,7 +158,7 @@ Chapter 1. Admin Guide 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) 5.8. handle_ruri_alias() - 5.9. set_contact_alias() + 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) 6. Exported Pseudo Variables @@ -498,7 +498,7 @@ modparam("nathelper", "nat_addr_mode", 0) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) 5.8. handle_ruri_alias() - 5.9. set_contact_alias() + 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) 5.1. fix_nated_contact() @@ -700,13 +700,19 @@ if(is_rfc1918("$rd")) { }; ... -5.9. set_contact_alias() +5.9. set_contact_alias([trim]) Adds an “;alias=ip~port~transport” parameter to the contact URI containing the received ip, port, and transport protocol. The new contact URI is immediately visible to other modules in the way the fix_nated_contact() does it. + Meaning of parameters: + * trim - by default, set_contact_alias() will not detect and trim an + already existing alias parameter. If this optional parameter is set + to "1", set_contact_alias() will trim the existing alias before + adding a new one. + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE, and FAILURE_ROUTE.

1 0

git:master:07f2857f: Merge pull request #2388 from kamailio/nathelper-set_contact_alias-trim
by GitHub 03 Jul '20

03 Jul '20

Module: kamailio Branch: master Commit: 07f2857f76870f9f0fd360c6990df8f7cb0f5ffc URL: https://github.com/kamailio/kamailio/commit/07f2857f76870f9f0fd360c6990df8f… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-07-03T10:32:25-04:00 Merge pull request #2388 from kamailio/nathelper-set_contact_alias-trim nathelper: add optional set_contact_alias([trim]) parameter --- Modified: src/core/dset.c Modified: src/core/dset.h Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/07f2857f76870f9f0fd360c6990df8f… Patch: https://github.com/kamailio/kamailio/commit/07f2857f76870f9f0fd360c6990df8f…

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2020