sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
271 discussions

git:5.3:76c052b2: auth_ephemeral: fix sha256/384/512
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: 5.3 Commit: 76c052b2dc86856e854c2ba1aad39a891bfb121e URL: https://github.com/kamailio/kamailio/commit/76c052b2dc86856e854c2ba1aad39a8… Author: Justin-lavelle <justinl(a)broadvoice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:32:20+01:00 auth_ephemeral: fix sha256/384/512 - sha256/384/512 broken due to use of sha1 password length, change to check and use proper lengths for each - sha384 mistakenly using sha256 method (cherry picked from commit de2bee1805c2c89565e9b28afb50fac375d0b5ba) (cherry picked from commit 52a01e54483c5e50fedec649689e5f142c16315a) (cherry picked from commit e04db74dc1e1706f4f3c8c2b6fcd3dba98534f04) --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/76c052b2dc86856e854c2ba1aad39a8… Patch: https://github.com/kamailio/kamailio/commit/76c052b2dc86856e854c2ba1aad39a8… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index bb92a4a2190..ff5012ade51 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -69,11 +69,11 @@ static inline int get_pass(str *_username, str *_secret, str *_password) break; case AUTHEPH_SHA384: hmac_len = SHA384_DIGEST_LENGTH; - if (HMAC(EVP_sha256(), _secret->s, _secret->len, + if (HMAC(EVP_sha384(), _secret->s, _secret->len, (unsigned char *) _username->s, _username->len, hmac_sha1, &hmac_len) == NULL) { - LM_ERR("HMAC-SHA256 failed\n"); + LM_ERR("HMAC-SHA384 failed\n"); return -1; } break; @@ -88,7 +88,7 @@ static inline int get_pass(str *_username, str *_secret, str *_password) } break; default: - LM_ERR("Inavlid SHA Algorithm\n"); + LM_ERR("Invalid SHA Algorithm\n"); return -1; } @@ -479,7 +479,26 @@ int autheph_proxy(struct sip_msg *_m, char *_realm, char *_p2) int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { - char generated_password[base64_enc_len(SHA_DIGEST_LENGTH)]; + unsigned int hmac_len = SHA_DIGEST_LENGTH; + switch(autheph_sha_alg) { + case AUTHEPH_SHA1: + hmac_len = SHA_DIGEST_LENGTH; + break; + case AUTHEPH_SHA256: + hmac_len = SHA256_DIGEST_LENGTH; + break; + case AUTHEPH_SHA384: + hmac_len = SHA384_DIGEST_LENGTH; + break; + case AUTHEPH_SHA512: + hmac_len = SHA512_DIGEST_LENGTH; + break; + default: + LM_ERR("Invalid SHA Algorithm\n"); + return AUTH_ERROR; + } + + char generated_password[base64_enc_len(hmac_len)]; str sgenerated_password; struct secret *secret_struct; @@ -515,14 +534,17 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) secret_struct = secret_list; while (secret_struct != NULL) { - LM_DBG("trying secret: %.*s\n", + LM_DBG("trying secret: %.*s (%i)\n", secret_struct->secret_key.len, - secret_struct->secret_key.s); + secret_struct->secret_key.s, + secret_struct->secret_key.len); if (get_pass(susername, &secret_struct->secret_key, &sgenerated_password) == 0) { - LM_DBG("generated password: %.*s\n", - sgenerated_password.len, sgenerated_password.s); + LM_DBG("generated password: %.*s (%i)\n", + sgenerated_password.len, + sgenerated_password.s, + sgenerated_password.len); if (spassword->len == sgenerated_password.len && strncmp(spassword->s, sgenerated_password.s, spassword->len) == 0)

1 0

git:5.4:e04db74d: auth_ephemeral: fix sha256/384/512
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: 5.4 Commit: e04db74dc1e1706f4f3c8c2b6fcd3dba98534f04 URL: https://github.com/kamailio/kamailio/commit/e04db74dc1e1706f4f3c8c2b6fcd3db… Author: Justin-lavelle <justinl(a)broadvoice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:31:41+01:00 auth_ephemeral: fix sha256/384/512 - sha256/384/512 broken due to use of sha1 password length, change to check and use proper lengths for each - sha384 mistakenly using sha256 method (cherry picked from commit de2bee1805c2c89565e9b28afb50fac375d0b5ba) (cherry picked from commit 52a01e54483c5e50fedec649689e5f142c16315a) --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/e04db74dc1e1706f4f3c8c2b6fcd3db… Patch: https://github.com/kamailio/kamailio/commit/e04db74dc1e1706f4f3c8c2b6fcd3db… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index bb92a4a2190..ff5012ade51 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -69,11 +69,11 @@ static inline int get_pass(str *_username, str *_secret, str *_password) break; case AUTHEPH_SHA384: hmac_len = SHA384_DIGEST_LENGTH; - if (HMAC(EVP_sha256(), _secret->s, _secret->len, + if (HMAC(EVP_sha384(), _secret->s, _secret->len, (unsigned char *) _username->s, _username->len, hmac_sha1, &hmac_len) == NULL) { - LM_ERR("HMAC-SHA256 failed\n"); + LM_ERR("HMAC-SHA384 failed\n"); return -1; } break; @@ -88,7 +88,7 @@ static inline int get_pass(str *_username, str *_secret, str *_password) } break; default: - LM_ERR("Inavlid SHA Algorithm\n"); + LM_ERR("Invalid SHA Algorithm\n"); return -1; } @@ -479,7 +479,26 @@ int autheph_proxy(struct sip_msg *_m, char *_realm, char *_p2) int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { - char generated_password[base64_enc_len(SHA_DIGEST_LENGTH)]; + unsigned int hmac_len = SHA_DIGEST_LENGTH; + switch(autheph_sha_alg) { + case AUTHEPH_SHA1: + hmac_len = SHA_DIGEST_LENGTH; + break; + case AUTHEPH_SHA256: + hmac_len = SHA256_DIGEST_LENGTH; + break; + case AUTHEPH_SHA384: + hmac_len = SHA384_DIGEST_LENGTH; + break; + case AUTHEPH_SHA512: + hmac_len = SHA512_DIGEST_LENGTH; + break; + default: + LM_ERR("Invalid SHA Algorithm\n"); + return AUTH_ERROR; + } + + char generated_password[base64_enc_len(hmac_len)]; str sgenerated_password; struct secret *secret_struct; @@ -515,14 +534,17 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) secret_struct = secret_list; while (secret_struct != NULL) { - LM_DBG("trying secret: %.*s\n", + LM_DBG("trying secret: %.*s (%i)\n", secret_struct->secret_key.len, - secret_struct->secret_key.s); + secret_struct->secret_key.s, + secret_struct->secret_key.len); if (get_pass(susername, &secret_struct->secret_key, &sgenerated_password) == 0) { - LM_DBG("generated password: %.*s\n", - sgenerated_password.len, sgenerated_password.s); + LM_DBG("generated password: %.*s (%i)\n", + sgenerated_password.len, + sgenerated_password.s, + sgenerated_password.len); if (spassword->len == sgenerated_password.len && strncmp(spassword->s, sgenerated_password.s, spassword->len) == 0)

1 0

git:5.5:52a01e54: auth_ephemeral: fix sha256/384/512
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: 5.5 Commit: 52a01e54483c5e50fedec649689e5f142c16315a URL: https://github.com/kamailio/kamailio/commit/52a01e54483c5e50fedec649689e5f1… Author: Justin-lavelle <justinl(a)broadvoice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:31:14+01:00 auth_ephemeral: fix sha256/384/512 - sha256/384/512 broken due to use of sha1 password length, change to check and use proper lengths for each - sha384 mistakenly using sha256 method (cherry picked from commit de2bee1805c2c89565e9b28afb50fac375d0b5ba) --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/52a01e54483c5e50fedec649689e5f1… Patch: https://github.com/kamailio/kamailio/commit/52a01e54483c5e50fedec649689e5f1… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index bb92a4a2190..ff5012ade51 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -69,11 +69,11 @@ static inline int get_pass(str *_username, str *_secret, str *_password) break; case AUTHEPH_SHA384: hmac_len = SHA384_DIGEST_LENGTH; - if (HMAC(EVP_sha256(), _secret->s, _secret->len, + if (HMAC(EVP_sha384(), _secret->s, _secret->len, (unsigned char *) _username->s, _username->len, hmac_sha1, &hmac_len) == NULL) { - LM_ERR("HMAC-SHA256 failed\n"); + LM_ERR("HMAC-SHA384 failed\n"); return -1; } break; @@ -88,7 +88,7 @@ static inline int get_pass(str *_username, str *_secret, str *_password) } break; default: - LM_ERR("Inavlid SHA Algorithm\n"); + LM_ERR("Invalid SHA Algorithm\n"); return -1; } @@ -479,7 +479,26 @@ int autheph_proxy(struct sip_msg *_m, char *_realm, char *_p2) int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { - char generated_password[base64_enc_len(SHA_DIGEST_LENGTH)]; + unsigned int hmac_len = SHA_DIGEST_LENGTH; + switch(autheph_sha_alg) { + case AUTHEPH_SHA1: + hmac_len = SHA_DIGEST_LENGTH; + break; + case AUTHEPH_SHA256: + hmac_len = SHA256_DIGEST_LENGTH; + break; + case AUTHEPH_SHA384: + hmac_len = SHA384_DIGEST_LENGTH; + break; + case AUTHEPH_SHA512: + hmac_len = SHA512_DIGEST_LENGTH; + break; + default: + LM_ERR("Invalid SHA Algorithm\n"); + return AUTH_ERROR; + } + + char generated_password[base64_enc_len(hmac_len)]; str sgenerated_password; struct secret *secret_struct; @@ -515,14 +534,17 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) secret_struct = secret_list; while (secret_struct != NULL) { - LM_DBG("trying secret: %.*s\n", + LM_DBG("trying secret: %.*s (%i)\n", secret_struct->secret_key.len, - secret_struct->secret_key.s); + secret_struct->secret_key.s, + secret_struct->secret_key.len); if (get_pass(susername, &secret_struct->secret_key, &sgenerated_password) == 0) { - LM_DBG("generated password: %.*s\n", - sgenerated_password.len, sgenerated_password.s); + LM_DBG("generated password: %.*s (%i)\n", + sgenerated_password.len, + sgenerated_password.s, + sgenerated_password.len); if (spassword->len == sgenerated_password.len && strncmp(spassword->s, sgenerated_password.s, spassword->len) == 0)

1 0

[kamailio/kamailio] auth_ephemeral broken for sha256/384/512 (Issue #2963)
by Justin LaVelle 08 Dec '21

08 Dec '21

### Description When using `auth_ephemeral` module I found that using anything other than the default sha1 would fail and crash Kamailio.  ### Troubleshooting #### Log Messages  ``` *** stack smashing detected ***: <unknown> terminated 13(85) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 15 0(65) ALERT: <core> [main.c:788]: handle_sigs(): child process 77 exited by a signal 6 0(65) ALERT: <core> [main.c:791]: handle_sigs(): core was generated ``` #### SIP Traffic  ``` N/A ``` ### Possible Solutions  I dug into the code and have a Pull Request to fix the issue. https://github.com/kamailio/kamailio/pull/2962 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.0-dev2 (x86_64/linux) 3c905e flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: 3c905e -dirty compiled on 11:02:49 Dec 4 2021 with gcc 8.3.0 ``` * **Operating System**:  ``` Docker debian:debian on MacOS Mojave 10.14 Linux 47b9de1080dc 5.10.47-linuxkit #1 SMP Sat Jul 3 21:51:47 UTC 2021 x86_64 GNU/Linux ``` -- 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/2963

2 2

[kamailio/kamailio] auth_ephemeral: fix sha256/384/512 (PR #2962)
by Justin LaVelle 08 Dec '21

08 Dec '21

- sha256/384/512 broken due to use of sha1 password length, change to check and use proper lengths for each - sha384 mistakenly using sha256 method - update logging to include length You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2962 -- Commit Summary -- * auth_ephemeral: fix sha256/384/512 -- File Changes -- M src/modules/auth_ephemeral/authorize.c (38) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2962.patch https://github.com/kamailio/kamailio/pull/2962.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/2962

3 4

git:master:de2bee18: auth_ephemeral: fix sha256/384/512
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: master Commit: de2bee1805c2c89565e9b28afb50fac375d0b5ba URL: https://github.com/kamailio/kamailio/commit/de2bee1805c2c89565e9b28afb50fac… Author: Justin-lavelle <justinl(a)broadvoice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:30:07+01:00 auth_ephemeral: fix sha256/384/512 - sha256/384/512 broken due to use of sha1 password length, change to check and use proper lengths for each - sha384 mistakenly using sha256 method --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/de2bee1805c2c89565e9b28afb50fac… Patch: https://github.com/kamailio/kamailio/commit/de2bee1805c2c89565e9b28afb50fac… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index bb92a4a2190..ff5012ade51 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -69,11 +69,11 @@ static inline int get_pass(str *_username, str *_secret, str *_password) break; case AUTHEPH_SHA384: hmac_len = SHA384_DIGEST_LENGTH; - if (HMAC(EVP_sha256(), _secret->s, _secret->len, + if (HMAC(EVP_sha384(), _secret->s, _secret->len, (unsigned char *) _username->s, _username->len, hmac_sha1, &hmac_len) == NULL) { - LM_ERR("HMAC-SHA256 failed\n"); + LM_ERR("HMAC-SHA384 failed\n"); return -1; } break; @@ -88,7 +88,7 @@ static inline int get_pass(str *_username, str *_secret, str *_password) } break; default: - LM_ERR("Inavlid SHA Algorithm\n"); + LM_ERR("Invalid SHA Algorithm\n"); return -1; } @@ -479,7 +479,26 @@ int autheph_proxy(struct sip_msg *_m, char *_realm, char *_p2) int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { - char generated_password[base64_enc_len(SHA_DIGEST_LENGTH)]; + unsigned int hmac_len = SHA_DIGEST_LENGTH; + switch(autheph_sha_alg) { + case AUTHEPH_SHA1: + hmac_len = SHA_DIGEST_LENGTH; + break; + case AUTHEPH_SHA256: + hmac_len = SHA256_DIGEST_LENGTH; + break; + case AUTHEPH_SHA384: + hmac_len = SHA384_DIGEST_LENGTH; + break; + case AUTHEPH_SHA512: + hmac_len = SHA512_DIGEST_LENGTH; + break; + default: + LM_ERR("Invalid SHA Algorithm\n"); + return AUTH_ERROR; + } + + char generated_password[base64_enc_len(hmac_len)]; str sgenerated_password; struct secret *secret_struct; @@ -515,14 +534,17 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) secret_struct = secret_list; while (secret_struct != NULL) { - LM_DBG("trying secret: %.*s\n", + LM_DBG("trying secret: %.*s (%i)\n", secret_struct->secret_key.len, - secret_struct->secret_key.s); + secret_struct->secret_key.s, + secret_struct->secret_key.len); if (get_pass(susername, &secret_struct->secret_key, &sgenerated_password) == 0) { - LM_DBG("generated password: %.*s\n", - sgenerated_password.len, sgenerated_password.s); + LM_DBG("generated password: %.*s (%i)\n", + sgenerated_password.len, + sgenerated_password.s, + sgenerated_password.len); if (spassword->len == sgenerated_password.len && strncmp(spassword->s, sgenerated_password.s, spassword->len) == 0)

1 0

git:master:743a9d33: src/Makefile.defs: link -lrt if glibc <= 2.17
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: master Commit: 743a9d33dcc3a6220bba217c14810dafb53355b2 URL: https://github.com/kamailio/kamailio/commit/743a9d33dcc3a6220bba217c14810da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:21:53+01:00 src/Makefile.defs: link -lrt if glibc <= 2.17 - GH #2921 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/743a9d33dcc3a6220bba217c14810da… Patch: https://github.com/kamailio/kamailio/commit/743a9d33dcc3a6220bba217c14810da… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index cde1faa6df..8fab3fd812 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1888,6 +1888,13 @@ ifeq ($(OS), linux) ifeq ($(NO_SELECT),) C_DEFS+=-DHAVE_SELECT endif + ifeq ($(CC_NAME), gcc) + # link librt for glibc <= 2.17 + GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) + LIBS+=-lrt + endif + endif endif ifeq ($(OS), gnu_kfreebsd)

1 0

Releasing Kamailio 5.3.9 - last in 5.3.x series
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Hello, it is time to mark the end of official packaging for 5.3.x releases, therefore during the next days I am going to cut the v5.3.9 release from branch 5.3, likely on Wednesday, Dec 8, 2021. In other words, if no major regression is detected shortly after this release, the v5.3.9 is going to be the last one from the 5.3 branch. It is strongly recommended to move to a series that is under active maintenance, respectively 5.5.x or 5.4.x. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Feb 21-24, 2022 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

[kamailio/kamailio] core: allow empty matches (#2869)
by Bastian Triller 07 Dec '21

07 Dec '21

Anchors like ^ and $ match beginning resp. ending of strings but their matches are zero length, which is ok. The anchors can be used to pre-/append a prefix/suffix via e.g. subst_hf("X-My-Header", "/^/prefix /", "a"); subst_hf("X-My-Header", "/$/ suffix/", "a");   #### 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) - [ ] 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/2869 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2869/commits/63190fb0f0580a276146…">core: allow empty matches</a> -- File Changes -- M src/core/data_lump.c (2) M src/core/re.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2869.patch https://github.com/kamailio/kamailio/pull/2869.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/2869

3 7

git:master:4d06b1e4: htable: Modify previous commit to create new API for RPC and keep old API for backwards compatibility
by Olle E. Johansson 07 Dec '21

07 Dec '21

Module: kamailio Branch: master Commit: 4d06b1e4bbd371d247301ece057a3c26ae876a9f URL: https://github.com/kamailio/kamailio/commit/4d06b1e4bbd371d247301ece057a3c2… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2021-12-07T10:12:32+01:00 htable: Modify previous commit to create new API for RPC and keep old API for backwards compatibility Thanks to @miconda for a hint! --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/4d06b1e4bbd371d247301ece057a3c2… Patch: https://github.com/kamailio/kamailio/commit/4d06b1e4bbd371d247301ece057a3c2… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 45623e0165..daf088d1f8 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -655,14 +655,33 @@ static void ht_cell_unlink(ht_t *ht, int idx, ht_cell_t *it) ht->entries[idx].esize--; } -/* Delete htable entry + +/* Delete entry in htable. +Return: + - 1 on error in argument + 0 otherwise +*/ +int ht_del_cell(ht_t *ht, str *name) +{ + int ret; + + ret = ht_del_cell_confirm(ht, name); + if (ret == -1) + return -1; + return 0; +} + +/* Delete htable entry with confirmation + +oldapi = 1 means to always return 0 +oldapi = 0 means to return 1 on successful deletion Return: -1 on error in argument 0 on entry not found 1 on entry found and deleted */ -int ht_del_cell(ht_t *ht, str *name) +int ht_del_cell_confirm(ht_t *ht, str *name) { unsigned int idx; unsigned int hid; diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index b9c1551180..4cee835325 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -91,6 +91,7 @@ int ht_init_tables(void); int ht_destroy(void); int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode); int ht_del_cell(ht_t *ht, str *name); +int ht_del_cell_confirm(ht_t *ht, str *name); ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, ht_cell_t *old); int ht_cell_exists(ht_t *ht, str *name); diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index 42e1847d30..6368fb0137 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -410,6 +410,10 @@ int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, return -1; } +/* Replay DMQ action + +Return 0 for non-error. Allt other returns are parsed as error. +*/ int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode) { diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index d491e2e767..78f151daf3 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1454,7 +1454,7 @@ static void htable_rpc_delete(rpc_t* rpc, void* c) { LM_ERR("dmq replication failed\n"); } - res = ht_del_cell(ht, &keyname); + res = ht_del_cell_confirm(ht, &keyname); if (res == -1) { rpc->fault(c, 500, "Internal error");

1 0

← Newer
1
...
20
21
22
23
24
25
26
27
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021