sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
247 discussions

git:master:48f4da34: Makefile.defs: version set to 5.9.0-dev0
by Daniel-Constantin Mierla 23 Feb '24

23 Feb '24

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)

1 0

git:master:71631908: Makefile.defs: version set to 5.8.0-pre1
by Daniel-Constantin Mierla 23 Feb '24

23 Feb '24

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)

1 0

git:master:7e22636b: dispatcher: rename interal define to reflect better is a mix of matching
by Daniel-Constantin Mierla 23 Feb '24

23 Feb '24

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

1 0

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 23 Feb '24

23 Feb '24

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…

1 0

git:master:6948a3cc: microhttpd: added the header return option for pv
by Daniel-Constantin Mierla 23 Feb '24

23 Feb '24

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);

1 0

[kamailio/kamailio] file_out: Add prefix support with PVs and refactor properties in structure. (PR #3763)
by Xenofon Karamanos 22 Feb '24

22 Feb '24

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR adds the support of using PVs in the `prefix` parameter. Also refactors the properties into a structure for each file. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3763 -- Commit Summary -- * file_out: Prefix can use PVs * file_out: Refactor -- File Changes -- M src/modules/file_out/file_out.c (140) M src/modules/file_out/types.c (38) M src/modules/file_out/types.h (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3763.patch https://github.com/kamailio/kamailio/pull/3763.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3763 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3763(a)github.com>

1 1

git:master:998a7905: file_out: Refactor
by Xenofon Karamanos 22 Feb '24

22 Feb '24

Module: kamailio Branch: master Commit: 998a790563fcba9d6263c18f83f59e9080c78af0 URL: https://github.com/kamailio/kamailio/commit/998a790563fcba9d6263c18f83f59e9… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-02-22T20:53:57+02:00 file_out: Refactor --- Modified: src/modules/file_out/file_out.c Modified: src/modules/file_out/types.c Modified: src/modules/file_out/types.h --- Diff: https://github.com/kamailio/kamailio/commit/998a790563fcba9d6263c18f83f59e9… Patch: https://github.com/kamailio/kamailio/commit/998a790563fcba9d6263c18f83f59e9…

1 0

git:master:06d0596e: file_out: Prefix can use PVs
by Xenofon Karamanos 22 Feb '24

22 Feb '24

Module: kamailio Branch: master Commit: 06d0596ef34f1c213cc28442594bb6f1ebae46b4 URL: https://github.com/kamailio/kamailio/commit/06d0596ef34f1c213cc28442594bb6f… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-02-22T20:53:57+02:00 file_out: Prefix can use PVs --- Modified: src/modules/file_out/file_out.c Modified: src/modules/file_out/types.c Modified: src/modules/file_out/types.h --- Diff: https://github.com/kamailio/kamailio/commit/06d0596ef34f1c213cc28442594bb6f… Patch: https://github.com/kamailio/kamailio/commit/06d0596ef34f1c213cc28442594bb6f…

1 0

[kamailio/kamailio] microhttpd: fixed typo in the documentation (PR #3761)
by falshunov 22 Feb '24

22 Feb '24

#### 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/3761 -- Commit Summary -- * microhttpd: fixed typo in the documentation -- File Changes -- M src/modules/microhttpd/doc/microhttpd_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3761.patch https://github.com/kamailio/kamailio/pull/3761.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3761 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3761(a)github.com>

2 2

git:master:ff8229b5: microhttpd: fixed typo in the documentation [skip ci]
by Victor Seva 22 Feb '24

22 Feb '24

Module: kamailio Branch: master Commit: ff8229b58d6f91bae527bc2f5912c7d291c55268 URL: https://github.com/kamailio/kamailio/commit/ff8229b58d6f91bae527bc2f5912c7d… Author: falshunov <37283637+falshunov(a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-22T10:28:11+01:00 microhttpd: fixed typo in the documentation [skip ci] --- Modified: src/modules/microhttpd/doc/microhttpd_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ff8229b58d6f91bae527bc2f5912c7d… Patch: https://github.com/kamailio/kamailio/commit/ff8229b58d6f91bae527bc2f5912c7d… --- diff --git a/src/modules/microhttpd/doc/microhttpd_admin.xml b/src/modules/microhttpd/doc/microhttpd_admin.xml index a50edb79818..1967c845b82 100644 --- a/src/modules/microhttpd/doc/microhttpd_admin.xml +++ b/src/modules/microhttpd/doc/microhttpd_admin.xml @@ -43,7 +43,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libmicrohhtpd</emphasis> - libmicrohttpd library + <emphasis>libmicrohttpd</emphasis> - libmicrohttpd library </para> </listitem> </itemizedlist>

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2024