sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
242 discussions

by Daniel-Constantin Mierla

Hello, the branch 5.8 has been created, to be used for releasing v5.8.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-5.8 cd kamailio-5.8 git checkout -b 5.8 origin/5.8 Pushing commits in this branch: git push origin 5.8:5.8 Note that 5.8 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 5.8 branch: git cherry-pick -x COMMITID In few weeks, the first release from branch 5.8 will be out, respectively Kamailio v5.8.0. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

10 months

git:5.8:5af33b2e: pkg/docker: set branch 5.8 and refresh [skip ci]

by Victor Seva

Module: kamailio Branch: 5.8 Commit: 5af33b2e0ddc1098919008d44ab91959bc7dfb80 URL: https://github.com/kamailio/kamailio/commit/5af33b2e0ddc1098919008d44ab9195… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-23T21:24:19+01:00 pkg/docker: set branch 5.8 and refresh [skip ci] --- Modified: .gitmodules Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/5af33b2e0ddc1098919008d44ab9195… Patch: https://github.com/kamailio/kamailio/commit/5af33b2e0ddc1098919008d44ab9195… --- diff --git a/.gitmodules b/.gitmodules index 1d8f99966ed..9ea3c41fd05 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "pkg/docker"] path = pkg/docker url = https://github.com/kamailio/kamailio-ci.git + branch = 5.8 [submodule "src/modules/tls_wolfssl/lib/wolfssl"] path = misc/external/wolfssl/wolfssl url = https://github.com/wolfSSL/wolfssl.git diff --git a/pkg/docker b/pkg/docker index cf48a82c5f9..969a5dd0d65 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit cf48a82c5f9df67813d14e6619cc9a41ec9a683b +Subproject commit 969a5dd0d65dadce47049dc5e0dd145e9aff47b8

10 months

git:5.8:fbdca3da: github: set branch to 5.8 [skip ci]

by Victor Seva

Module: kamailio Branch: 5.8 Commit: fbdca3da6293aba548989e3ab9d600be338199b2 URL: https://github.com/kamailio/kamailio/commit/fbdca3da6293aba548989e3ab9d600b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-23T20:43:33+01:00 github: set branch to 5.8 [skip ci] --- Modified: .devcontainer/devcontainer.json Modified: .github/workflows/devcontainer.yaml Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/fbdca3da6293aba548989e3ab9d600b… Patch: https://github.com/kamailio/kamailio/commit/fbdca3da6293aba548989e3ab9d600b… --- diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2a0413eae4d..9a3e3a47449 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ */ "name": "Debian", "build": { - "cacheFrom": "ghcr.io/kamailio/kamailio-master-devcontainer", + "cacheFrom": "ghcr.io/kamailio/kamailio-5.8-devcontainer", "context": "../pkg/kamailio/deb", "dockerfile": "Dockerfile" }, diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index 2da1e56c742..f1549a9bca8 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -4,7 +4,7 @@ name: build devcontainer image 'on': push: branches: - - master + - 5.8 # Allows you to run this workflow manually from the Actions tab workflow_dispatch: inputs: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8b7ae03a271..145e9f8548f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: build 'on': push: branches: - - master + - 5.8 # Allows you to run this workflow manually from the Actions tab workflow_dispatch: jobs:

10 months

git:5.8:3566edd0: pkg/kamailio/deb: version set 5.8.0~rc0

by Victor Seva

Module: kamailio Branch: 5.8 Commit: 3566edd00ea729bb187b160a80b54fe92e2bbe4d URL: https://github.com/kamailio/kamailio/commit/3566edd00ea729bb187b160a80b54fe… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-23T20:05:34+01:00 pkg/kamailio/deb: version set 5.8.0~rc0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/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/3566edd00ea729bb187b160a80b54fe… Patch: https://github.com/kamailio/kamailio/commit/3566edd00ea729bb187b160a80b54fe…

10 months

git:5.8:faddcecb: Makefile.defs: version set to 5.8.0-rc0

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: faddcecbf04a0221aa4a2531141571246d043060 URL: https://github.com/kamailio/kamailio/commit/faddcecbf04a0221aa4a25311415712… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-23T19:35:27+01:00 Makefile.defs: version set to 5.8.0-rc0 - entering the phase to prepare releasing next major version series 5.8.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/faddcecbf04a0221aa4a25311415712… Patch: https://github.com/kamailio/kamailio/commit/faddcecbf04a0221aa4a25311415712… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index b195c7fe59d..62f1dd78273 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -rc0 # memory manager switcher # 0 - f_malloc (fast malloc)

10 months

git:master:48f4da34: Makefile.defs: version set to 5.9.0-dev0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 48f4da344bd96e9a19b7c99c37d9dfe29de78933 URL: https://github.com/kamailio/kamailio/commit/48f4da344bd96e9a19b7c99c37d9dfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-23T19:28:52+01:00 Makefile.defs: version set to 5.9.0-dev0 - master branch is open for new features to be part of the future major series, to be versioned 5.9.x or maybe 6.0.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/48f4da344bd96e9a19b7c99c37d9dfe… Patch: https://github.com/kamailio/kamailio/commit/48f4da344bd96e9a19b7c99c37d9dfe… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index b195c7fe59d..4165ca084fb 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 8 +PATCHLEVEL = 9 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

10 months

git:master:71631908: Makefile.defs: version set to 5.8.0-pre1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 716319089c3e7bbc4caf9a2454235d77c3a9f88b URL: https://github.com/kamailio/kamailio/commit/716319089c3e7bbc4caf9a2454235d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-23T19:24:55+01:00 Makefile.defs: version set to 5.8.0-pre1 - marking end of first phase of testing --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/716319089c3e7bbc4caf9a2454235d7… Patch: https://github.com/kamailio/kamailio/commit/716319089c3e7bbc4caf9a2454235d7… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 0b6086d0a3d..b195c7fe59d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

10 months

git:master:7e22636b: dispatcher: rename interal define to reflect better is a mix of matching

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7e22636bb2797f6ed9cac677678a7a1bfc4f2537 URL: https://github.com/kamailio/kamailio/commit/7e22636bb2797f6ed9cac677678a7a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-23T12:53:39+01:00 dispatcher: rename interal define to reflect better is a mix of matching - rather than a full address matching --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/7e22636bb2797f6ed9cac677678a7a1… Patch: https://github.com/kamailio/kamailio/commit/7e22636bb2797f6ed9cac677678a7a1… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0a609075a5e..9e27f998c25 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3605,9 +3605,9 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, if(ip_addr_cmp(pipaddr, ipa) && ((mode & DS_MATCH_NOPORT) || node->dlist[j].port == 0 || tport == node->dlist[j].port - || (mode & DS_MATCH_TRY_FULLADDRSOCK)) + || (mode & DS_MATCH_MIXSOCKPRPORT)) && ((mode & DS_MATCH_NOPROTO) || tproto == node->dlist[j].proto - || (mode & DS_MATCH_TRY_FULLADDRSOCK)) + || (mode & DS_MATCH_MIXSOCKPRPORT)) && (((mode & DS_MATCH_ACTIVE) && !ds_skip_dst(node->dlist[j].flags)) || !(mode & DS_MATCH_ACTIVE)) @@ -3615,7 +3615,7 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, && node->dlist[j].sock == _m->rcv.bind_address) || !node->dlist[j].sock || !(mode & DS_MATCH_SOCKET))) { - if(mode & DS_MATCH_TRY_FULLADDRSOCK) { + if(mode & DS_MATCH_MIXSOCKPRPORT) { node_strictness = DS_MATCHED_ADDR; if(node->dlist[j].port) { if(tport != node->dlist[j].port) @@ -3738,7 +3738,7 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) } - if(mode & DS_MATCH_TRY_FULLADDRSOCK) { + if(mode & DS_MATCH_MIXSOCKPRPORT) { ds_strictness = 0; ds_strictest_node = NULL; } @@ -3753,7 +3753,7 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) } } - if(rc == -1 && mode & DS_MATCH_TRY_FULLADDRSOCK && ds_strictest_node) { + if(rc == -1 && (mode & DS_MATCH_MIXSOCKPRPORT) && ds_strictest_node) { rc = ds_set_vars( _m, ds_strictest_node, ds_strictest_idx, group == -1 ? 1 : 0); } diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index a628a426a61..a887c555932 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -60,7 +60,7 @@ #define DS_MATCH_NOPROTO 2 #define DS_MATCH_ACTIVE 4 #define DS_MATCH_SOCKET 8 -#define DS_MATCH_TRY_FULLADDRSOCK 16 +#define DS_MATCH_MIXSOCKPRPORT 16 #define DS_SETOP_DSTURI 0 #define DS_SETOP_RURI 1

10 months

git:master:17536b10: dispatcher: added two new flags to mode parameter of ds_is_from_list function for more strictly matching

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 17536b1064b40c305f28c4c19392504afc0b9701 URL: https://github.com/kamailio/kamailio/commit/17536b1064b40c305f28c4c19392504… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-23T12:36:20+01:00 dispatcher: added two new flags to mode parameter of ds_is_from_list function for more strictly matching - Two new flgs added: DS_MATCH_SOCKET (8) to take in account socket/sockname attribute of gw DS_MATCH_TRY_FULLADDRSOCK (16) try to find the most complete "address/protocol/port/local socket" combination for all dispatcher targets --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/17536b1064b40c305f28c4c19392504… Patch: https://github.com/kamailio/kamailio/commit/17536b1064b40c305f28c4c19392504…

10 months

git:master:6948a3cc: microhttpd: added the header return option for pv

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6948a3cc1f81cd468eae92518215d0fe9178b1e7 URL: https://github.com/kamailio/kamailio/commit/6948a3cc1f81cd468eae92518215d0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-23T12:18:07+01:00 microhttpd: added the header return option for pv --- Modified: src/modules/microhttpd/microhttpd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6948a3cc1f81cd468eae92518215d0f… Patch: https://github.com/kamailio/kamailio/commit/6948a3cc1f81cd468eae92518215d0f… --- diff --git a/src/modules/microhttpd/microhttpd_mod.c b/src/modules/microhttpd/microhttpd_mod.c index 692c9e752e2..f1ee8334b8b 100644 --- a/src/modules/microhttpd/microhttpd_mod.c +++ b/src/modules/microhttpd/microhttpd_mod.c @@ -236,6 +236,13 @@ int pv_parse_mhttpd_name(pv_spec_p sp, str *in) } break; default: + if(in->len > 2 && in->s[1] == ':' + && (in->s[0] == 'h' || in->s[0] == 'H')) { + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = PVT_HDR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + } goto error; } sp->pvp.pvn.type = PV_NAME_INTSTR; @@ -254,12 +261,23 @@ int pv_parse_mhttpd_name(pv_spec_p sp, str *in) int pv_get_mhttpd(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { struct sockaddr *srcaddr = NULL; + const char *hdrval = NULL; + if(param == NULL) { return -1; } if(_ksr_mhttpd_ctx.connection == NULL) { return pv_get_null(msg, param, res); } + if(param->pvn.u.isname.type == PVT_HDR) { + hdrval = MHD_lookup_connection_value(_ksr_mhttpd_ctx.connection, + MHD_HEADER_KIND, param->pvn.u.isname.name.s.s + 2); + if(hdrval == NULL) { + return pv_get_null(msg, param, res); + } + return pv_get_strzval(msg, param, res, (char *)hdrval); + } + switch(param->pvn.u.isname.name.n) { case 0: /* url */ return pv_get_strval(msg, param, res, &_ksr_mhttpd_ctx.url);

10 months

← Newer
1
...
7
8
9
10
11
12
13
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2024