sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
270 discussions

git:master:cd2f5d4c: core: enclose in quotes the value for #!defenvs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cd2f5d4ca2a3ec31c1e67cd08ad025a152241e35 URL: https://github.com/kamailio/kamailio/commit/cd2f5d4ca2a3ec31c1e67cd08ad025a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T10:41:41+01:00 core: enclose in quotes the value for #!defenvs --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/cd2f5d4ca2a3ec31c1e67cd08ad025a… Patch: https://github.com/kamailio/kamailio/commit/cd2f5d4ca2a3ec31c1e67cd08ad025a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 551cfab014..84f5630483 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2087,6 +2087,7 @@ int pp_define_env(const char *text, int len, int qmode) char *r; str defname; str defvalue; + str newval; r = strchr(text, '='); @@ -2115,6 +2116,13 @@ int pp_define_env(const char *text, int len, int qmode) LM_ERR("cannot set define name [%s]\n", (char*)text); return -1; } + if(qmode==KSR_PPDEF_QUOTED) { + if(pp_def_qvalue(&defvalue, &newval) < 0) { + LM_ERR("failed to enclose in quotes the value\n"); + return -1; + } + defvalue = newval; + } if(pp_define_set(defvalue.len, defvalue.s, qmode)<0) { LM_ERR("cannot set define value [%s]\n", (char*)text); return -1; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 67391557f8..3d91679df6 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -48,6 +48,31 @@ static pp_subst_rule_t *pp_subst_rules_tail = NULL; static int _pp_ifdef_level = 0; static str_list_t *_ksr_substdef_strlist = NULL; +int pp_def_qvalue(str *defval, str *outval) +{ + str newval; + str_list_t *sb; + + if(pv_get_buffer_size() < defval->len + 4) { + LM_ERR("defined value is too large\n"); + return -1; + } + newval.s = pv_get_buffer(); + newval.s[0] = '"'; + memcpy(newval.s + 1, defval->s, defval->len); + newval.s[defval->len + 1] = '"'; + newval.s[defval->len + 2] = '\0'; + newval.len = defval->len + 2; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to link quoted value [%.*s]\n", defval->len, defval->s); + return -1; + } + *outval = sb->s; + + return 0; +} + int pp_subst_add(char *data) { struct subst_expr* se; @@ -163,22 +188,11 @@ int pp_substdef_add(char *data, int mode) } } if(mode==KSR_PPDEF_QUOTED) { - if(pv_get_buffer_size() < defvalue.len + 4) { - LM_ERR("defined value is too large\n"); - return -1; - } - newval.s = pv_get_buffer(); - newval.s[0] = '"'; - memcpy(newval.s + 1, defvalue.s, defvalue.len); - newval.s[defvalue.len + 1] = '"'; - newval.s[defvalue.len + 2] = '\0'; - newval.len = defvalue.len + 2; - sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); - if(sb==NULL) { - LM_ERR("failed to handle substdef: [%s]\n", data); + if(pp_def_qvalue(&defvalue, &newval) < 0) { + LM_ERR("failed to enclose in quotes the value\n"); return -1; } - defvalue = sb->s; + defvalue = newval; } if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_QUOTED)<0) { LM_ERR("cannot set define value\n"); diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index a8d27f7083..d08884775c 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -34,6 +34,8 @@ typedef struct ksr_ppdefine { int dtype; } ksr_ppdefine_t; +int pp_def_qvalue(str *defval, str *outval); + str* pp_get_define_name(int idx); ksr_ppdefine_t* pp_get_define(int idx);

3 years

[kamailio/kamailio] rtpengine: Fix set selection (PR #2965)

by Stefan Mititelu

When set_rtpengine_set() config function is called.   #### 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 - [X] 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  After calling set_rtpengine_set(), the new set is not set for further rtpengine delete(). This is because active_rtpp_set is set to default_rtpp_set when msg id != current_msg_id (which is set once by set_rtpengine_set()) I've removed the msg id != current_msg_id condition, and initialized active_rtpp_set in mod_init(). Basically tested locally with 2 sets with 1 rtpengine each. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2965 -- Commit Summary -- * rtpengine: Fix set selection -- File Changes -- M src/modules/rtpengine/rtpengine.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2965.patch https://github.com/kamailio/kamailio/pull/2965.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/2965

3 years

git:master:02be5bef: pv: added $msg(lpart) - return last part of the message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 02be5bef89625a53b2f67f8ca8d3acd4073b6c2b URL: https://github.com/kamailio/kamailio/commit/02be5bef89625a53b2f67f8ca8d3acd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T15:17:11+01:00 pv: added $msg(lpart) - return last part of the message - headers and body (skips first line) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/02be5bef89625a53b2f67f8ca8d3acd… Patch: https://github.com/kamailio/kamailio/commit/02be5bef89625a53b2f67f8ca8d3acd… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index dc1f6a59a2..de5d5b41c8 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4114,6 +4114,8 @@ int pv_parse_msg_attrs_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else if(strncmp(in->s, "fpart", 5)==0) sp->pvp.pvn.u.isname.name.n = 7; + else if(strncmp(in->s, "lpart", 5)==0) + sp->pvp.pvn.u.isname.name.n = 9; else goto error; break; case 8: @@ -4210,6 +4212,12 @@ int pv_get_msg_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) s.len = msg->unparsed - s.s; trim(&s); return pv_get_sintval(msg, param, res, s.len); + case 9: /* last part - headers + body */ + if(msg->headers==NULL || msg->headers->name.s==NULL) + return pv_get_null(msg, param, res); + s.s = msg->headers->name.s; + s.len = msg->buf + msg->len - s.s; + return pv_get_strval(msg, param, res, &s); default: return pv_get_null(msg, param, res);

3 years

git:master:dfbeb92a: pkg/kamailio/deb: fix lintian warnings

by Victor Seva

Module: kamailio Branch: master Commit: dfbeb92a956009fc57070ac988cb0177f9c8192f URL: https://github.com/kamailio/kamailio/commit/dfbeb92a956009fc57070ac988cb017… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-08T11:21:20+01:00 pkg/kamailio/deb: fix lintian warnings --- Added: pkg/kamailio/deb/bionic/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-systemd-modules.lintian-overrides Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/copyright Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/copyright Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/copyright Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/copyright Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/dfbeb92a956009fc57070ac988cb017… Patch: https://github.com/kamailio/kamailio/commit/dfbeb92a956009fc57070ac988cb017…

3 years

Kamailio v5.3.9 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v5.3.9 stable release is out. This is a maintenance release of the old stable branch, 5.3, that includes fixes since the release of v5.3.8. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.3.x. Deployments running previous v5.3.x versions are strongly recommended to be upgraded to v5.3.9 or even better to v5.4.x or 5.5.x series. For more details about version 5.3.9 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/12/kamailio-v5-3-9-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the branch 5.3 is an old stable branch, v5.3.9 being the last planned release out of it, to mark the end of official maintenance. The maintained stable branches are now 5.4 and 5.5, at this time with v5.5.3 being the latest stable release. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 years

git:5.3:a5fd0a85: ChangeLog: content updated for v5.3.9

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: a5fd0a856717119ee53164ea2d8aa2892bc56b7a URL: https://github.com/kamailio/kamailio/commit/a5fd0a856717119ee53164ea2d8aa28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T10:15:16+01:00 ChangeLog: content updated for v5.3.9 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/a5fd0a856717119ee53164ea2d8aa28… Patch: https://github.com/kamailio/kamailio/commit/a5fd0a856717119ee53164ea2d8aa28…

3 years

git:5.3:91823791: Makefile.defs: set version to 5.3.9

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 91823791bf485d18edfd01fdf0f923fcb09f736b URL: https://github.com/kamailio/kamailio/commit/91823791bf485d18edfd01fdf0f923f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:41:06+01:00 Makefile.defs: set version to 5.3.9 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/91823791bf485d18edfd01fdf0f923f… Patch: https://github.com/kamailio/kamailio/commit/91823791bf485d18edfd01fdf0f923f… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 45db7086cc..f36fa6a7c4 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 3 -SUBLEVEL = 8 +SUBLEVEL = 9 EXTRAVERSION = # memory manager switcher

3 years

git:5.3:0cac7679: pkg/kamailio/deb: version set to 5.3.9

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 0cac76792652237f362428ffbc62b29e73365aac URL: https://github.com/kamailio/kamailio/commit/0cac76792652237f362428ffbc62b29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:40:15+01:00 pkg/kamailio/deb: version set to 5.3.9 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0cac76792652237f362428ffbc62b29… Patch: https://github.com/kamailio/kamailio/commit/0cac76792652237f362428ffbc62b29…

3 years

git:5.3:6a04f278: pkg: version set to 5.3.9 for rpm and alpine specs

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 6a04f278372864b0c0bfa4be78d0f97283df9909 URL: https://github.com/kamailio/kamailio/commit/6a04f278372864b0c0bfa4be78d0f97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:39:04+01:00 pkg: version set to 5.3.9 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/6a04f278372864b0c0bfa4be78d0f97… Patch: https://github.com/kamailio/kamailio/commit/6a04f278372864b0c0bfa4be78d0f97… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e8ee911c30..0476654b73 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.3.8 +pkgver=5.3.9 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 31d713b1f3..391ff883d0 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.3.8 +%define ver 5.3.9 %define rel dev1.0%{dist} %if 0%{?fedora}

3 years

git:5.3:76c052b2: auth_ephemeral: fix sha256/384/512

by Daniel-Constantin Mierla

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)

3 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021