sr-dev May 2019

sr-dev@lists.kamailio.org

29 participants
306 discussions

git:master:5b9fb55b: htable: fix export of kemi sht_reset()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5b9fb55b6697bf3cd16727110a4b4bcb8350357d URL: https://github.com/kamailio/kamailio/commit/5b9fb55b6697bf3cd16727110a4b4bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-05T08:04:55+02:00 htable: fix export of kemi sht_reset() - GH #1941 --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/5b9fb55b6697bf3cd16727110a4b4bc… Patch: https://github.com/kamailio/kamailio/commit/5b9fb55b6697bf3cd16727110a4b4bc… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 7997865f4d..1320330f35 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -677,6 +677,11 @@ static int ht_reset_by_name(str *hname) } +static int ki_ht_reset_by_name(sip_msg_t* msg, str *hname) +{ + return ht_reset_by_name(hname); +} + static int ht_reset(struct sip_msg* msg, char* htname, char* foo) { str sname; @@ -1635,7 +1640,7 @@ static sr_kemi_t sr_kemi_htable_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_reset"), - SR_KEMIP_INT, ht_reset_by_name, + SR_KEMIP_INT, ki_ht_reset_by_name, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

5 years, 6 months

[kamailio/kamailio] core: fix timer typo (#1945)

by Seven Du

#### 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/1945 -- Commit Summary -- * core: fix timer typo -- File Changes -- M src/core/timer.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1945.patch https://github.com/kamailio/kamailio/pull/1945.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/1945

5 years, 6 months

git:master:0b9e0925: Merge pull request #1945 from seven1240/typo

by GitHub

Module: kamailio Branch: master Commit: 0b9e092579acbc3552a78b7f61186c3e47f71029 URL: https://github.com/kamailio/kamailio/commit/0b9e092579acbc3552a78b7f61186c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-05-04T08:46:14+02:00 Merge pull request #1945 from seven1240/typo core: fix timer typo --- Modified: src/core/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/0b9e092579acbc3552a78b7f61186c3… Patch: https://github.com/kamailio/kamailio/commit/0b9e092579acbc3552a78b7f61186c3… --- diff --git a/src/core/timer.c b/src/core/timer.c index 92e26ba5f1..8f6e305b24 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -405,7 +405,7 @@ inline static void adjust_ticks(void) diff_time_ticks=(ticks_t)((diff_time*TIMER_TICKS_HZ)/1000000LL); delta=(s_ticks_t)(diff_time_ticks-diff_ticks_raw); if (delta<-1){ - LM_WARN("our timer runs faster then real-time" + LM_WARN("our timer runs faster than real-time" " (%lu ms / %u ticks our time .->" " %lu ms / %u ticks real time)\n", (unsigned long)(diff_ticks_raw*1000L/TIMER_TICKS_HZ),

5 years, 6 months

git:master:c85ec2ee: core: fix timer typo

by Seven Du

Module: kamailio Branch: master Commit: c85ec2eed71c5d1bc3957437f27ffe9b6f18f4df URL: https://github.com/kamailio/kamailio/commit/c85ec2eed71c5d1bc3957437f27ffe9… Author: Seven Du <dujinfang(a)x-y-t.cn> Committer: Seven Du <dujinfang(a)x-y-t.cn> Date: 2019-05-04T07:30:23+08:00 core: fix timer typo --- Modified: src/core/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/c85ec2eed71c5d1bc3957437f27ffe9… Patch: https://github.com/kamailio/kamailio/commit/c85ec2eed71c5d1bc3957437f27ffe9… --- diff --git a/src/core/timer.c b/src/core/timer.c index 92e26ba5f1..8f6e305b24 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -405,7 +405,7 @@ inline static void adjust_ticks(void) diff_time_ticks=(ticks_t)((diff_time*TIMER_TICKS_HZ)/1000000LL); delta=(s_ticks_t)(diff_time_ticks-diff_ticks_raw); if (delta<-1){ - LM_WARN("our timer runs faster then real-time" + LM_WARN("our timer runs faster than real-time" " (%lu ms / %u ticks our time .->" " %lu ms / %u ticks real time)\n", (unsigned long)(diff_ticks_raw*1000L/TIMER_TICKS_HZ),

5 years, 6 months

git:5.2:7fd6ca67: auth_ephemeral: test the lenghts for compared passwords

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 7fd6ca67616077fb8aab4a279c8b251de94b4a95 URL: https://github.com/kamailio/kamailio/commit/7fd6ca67616077fb8aab4a279c8b251… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T11:54:46+02:00 auth_ephemeral: test the lenghts for compared passwords (cherry picked from commit 42129d35e4510092266322168f68f3019d28bdb8) --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/7fd6ca67616077fb8aab4a279c8b251… Patch: https://github.com/kamailio/kamailio/commit/7fd6ca67616077fb8aab4a279c8b251… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 745f12d7ab..a70d451814 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -511,8 +511,9 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { LM_DBG("generated password: %.*s\n", sgenerated_password.len, sgenerated_password.s); - if (strncmp(spassword->s, sgenerated_password.s, - spassword->len) == 0) + if (spassword->len == sgenerated_password.len + && strncmp(spassword->s, sgenerated_password.s, + spassword->len) == 0) { SECRET_UNLOCK; return AUTH_OK;

5 years, 6 months

git:master:42129d35: auth_ephemeral: test the lenghts for compared passwords

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 42129d35e4510092266322168f68f3019d28bdb8 URL: https://github.com/kamailio/kamailio/commit/42129d35e4510092266322168f68f30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T11:53:15+02:00 auth_ephemeral: test the lenghts for compared passwords --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/42129d35e4510092266322168f68f30… Patch: https://github.com/kamailio/kamailio/commit/42129d35e4510092266322168f68f30… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 216332b321..bb92a4a219 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -523,8 +523,9 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { LM_DBG("generated password: %.*s\n", sgenerated_password.len, sgenerated_password.s); - if (strncmp(spassword->s, sgenerated_password.s, - spassword->len) == 0) + if (spassword->len == sgenerated_password.len + && strncmp(spassword->s, sgenerated_password.s, + spassword->len) == 0) { SECRET_UNLOCK; return AUTH_OK;

5 years, 6 months

[kamailio/kamailio] KEMI: app_python and app_python3 handles function with 4 parameters and more incorrectly (#1944)

by Thomas Weber

### Description app_python and, in some places, app_python3 handles KEMI calls with 4 and more parameters incorrectly. It uses "or" operations instead of "and" and thus it will always tries to convert the call into a "str-str-str-str" invocation. Also it's missing a "ssii" variant for calling e.g. KSR.htable.sht_setxi() #### Reproduction Try to call KSR.htable.sht_setxs() or KSR.htable.sht_setxi() with app_python. #### Log Messages ``` ERROR: app_python [apy_kemi.c:342]: sr_apy_kemi_exec_func_ex(): unable to retrieve str-str-str-str params 4 ``` ### Possible Solutions Clean up app_python and app_python3 by changing "or" to "and" in lines like this one: ``` if(ket->ptypes[0]==SR_KEMIP_STR || ket->ptypes[1]==SR_KEMIP_STR || ket->ptypes[2]==SR_KEMIP_INT || ket->ptypes[3]==SR_KEMIP_INT) ``` Further, app_python lacks a "ssii" parameter handler so using KSR.htable.sht_setxi() is not possible. **I could contribute a pull request if no core developer has time to fix it.** ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` -- 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/issues/1944

5 years, 6 months

[kamailio/kamailio] KEMI: htable.sht_setxs() ignores expiration parameter on 5.2.2 (#1943)

by Thomas Weber

### Description The KEMI function htable.sht_setx() allows us to set a expiration parameter "exval": `int sht_setxs(str "htname", str "itname", str "itval", int exval)` Setting "exval" shows no effect, however. ### Possible Solutions It seems that the "exval" parameter is not passed into ht_set_cell() at all: `if(ht_set_cell(ht, itname, AVP_VAL_STR, &isval, 1)!=0) {` So it should be enough to fix this function call. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` -- 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/issues/1943

5 years, 6 months

git:5.2:290eafbd: htable: set expires for kemi htable.sht_setxs()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 290eafbdd9423219defdfdc56bad9eeabc036b80 URL: https://github.com/kamailio/kamailio/commit/290eafbdd9423219defdfdc56bad9ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T10:41:44+02:00 htable: set expires for kemi htable.sht_setxs() - GH #1943 (cherry picked from commit f64da295f6c3cfa3e340616fcc12564ae2689746) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/290eafbdd9423219defdfdc56bad9ee… Patch: https://github.com/kamailio/kamailio/commit/290eafbdd9423219defdfdc56bad9ee… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 8c4cdea09b..b35397f752 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1041,7 +1041,7 @@ static int ki_ht_setxs(sip_msg_t *msg, str *htname, str *itname, str *itval, } } isval.s = *itval; - if(ht_set_cell(ht, itname, AVP_VAL_STR, &isval, 1)!=0) { + if(ht_set_cell_ex(ht, itname, AVP_VAL_STR, &isval, 1, exval)!=0) { LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, itname->len, itname->s); return -1;

5 years, 6 months

git:master:f64da295: htable: set expires for kemi htable.sht_setxs()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f64da295f6c3cfa3e340616fcc12564ae2689746 URL: https://github.com/kamailio/kamailio/commit/f64da295f6c3cfa3e340616fcc12564… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T10:39:22+02:00 htable: set expires for kemi htable.sht_setxs() - GH #1943 --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f64da295f6c3cfa3e340616fcc12564… Patch: https://github.com/kamailio/kamailio/commit/f64da295f6c3cfa3e340616fcc12564… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 4d70d6e317..7997865f4d 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1041,7 +1041,7 @@ static int ki_ht_setxs(sip_msg_t *msg, str *htname, str *itname, str *itval, } } isval.s = *itval; - if(ht_set_cell(ht, itname, AVP_VAL_STR, &isval, 1)!=0) { + if(ht_set_cell_ex(ht, itname, AVP_VAL_STR, &isval, 1, exval)!=0) { LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, itname->len, itname->s); return -1;

5 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2019