sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
389 discussions

git:5.7:5879b5d1: core: copy the value between quotes for #!defexps

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.7 Commit: 5879b5d10d41f8a8a7b458873a4afaf7777fe27d URL: https://github.com/kamailio/kamailio/commit/5879b5d10d41f8a8a7b458873a4afaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T20:06:10+01:00 core: copy the value between quotes for #!defexps - GH #3631 (cherry picked from commit c26e9877419ac53fb109a24aefb3fcd711fae1d7) --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/5879b5d10d41f8a8a7b458873a4afaf… Patch: https://github.com/kamailio/kamailio/commit/5879b5d10d41f8a8a7b458873a4afaf… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index ba7c1263fab..262a7931cd2 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -523,7 +523,7 @@ char *pp_defexp_eval(char *exval, int exlen, int qmode) } if(qmode == 1) { res[0] = '"'; - memcpy(res, sval.s + 1, sval.len); + memcpy(res + 1, sval.s, sval.len); res[sval.len + 1] = '"'; res[sval.len + 2] = '\0'; LM_DBG("expression quoted string result: [%s]\n", res);

1 year

[kamailio/kamailio] config file: defexps not working in modparam (Issue #3631)

by space88man

### Description When an ID is defined using `!#defexps` it cannot be used in modparam ### Troubleshooting ``` #!define TEST1 "key=s:value" ## this works modparam("pv", "varset", TEST1) # in shell: export TEST2='key=s:value' #!defenvs TEST2 modparam("pv", "varset", TEST2) # this does not work #!defexps TEST3 "key=s:value" modparam("pv", "varset", TEST3) 0(2437437) CRITICAL: <core> [core/cfg.y:3900]: yyerror_at(): parse error in config file kamailio.cfg, line 85, column 26-32: syntax error ``` #### Reproduction * in config file, define ID with `#!defexps` then use in `modparam()` #### Debugging Data -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3631 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3631(a)github.com>

1 year

git:master:c26e9877: core: copy the value between quotes for #!defexps

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c26e9877419ac53fb109a24aefb3fcd711fae1d7 URL: https://github.com/kamailio/kamailio/commit/c26e9877419ac53fb109a24aefb3fcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T19:50:13+01:00 core: copy the value between quotes for #!defexps - GH #3631 --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/c26e9877419ac53fb109a24aefb3fcd… Patch: https://github.com/kamailio/kamailio/commit/c26e9877419ac53fb109a24aefb3fcd… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index ba7c1263fab..262a7931cd2 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -523,7 +523,7 @@ char *pp_defexp_eval(char *exval, int exlen, int qmode) } if(qmode == 1) { res[0] = '"'; - memcpy(res, sval.s + 1, sval.len); + memcpy(res + 1, sval.s, sval.len); res[sval.len + 1] = '"'; res[sval.len + 2] = '\0'; LM_DBG("expression quoted string result: [%s]\n", res);

1 year

git:master:996b61eb: kamctl: missing space from previous commit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 996b61ebfdabcae8729725b5d06f268aefcd33a4 URL: https://github.com/kamailio/kamailio/commit/996b61ebfdabcae8729725b5d06f268… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T18:26:27+01:00 kamctl: missing space from previous commit --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/996b61ebfdabcae8729725b5d06f268… Patch: https://github.com/kamailio/kamailio/commit/996b61ebfdabcae8729725b5d06f268… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 197c6e43035..47a96e1b488 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -44,7 +44,7 @@ if [ $RC_FILE_SOURCED = "false" ] && [ -f /etc/kamailio/kamctlrc -a -r /etc/kama . /etc/kamailio/kamctlrc RC_FILE_SOURCED="true" fi -if[ $RC_FILE_SOURCED = "false" ] && [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then +if [ $RC_FILE_SOURCED = "false" ] && [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc RC_FILE_SOURCED="true" fi

1 year

git:master:64cd9336: kamctl: Fix source order

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 64cd9336039bc05944fd9693e08edfab5fbd2f14 URL: https://github.com/kamailio/kamailio/commit/64cd9336039bc05944fd9693e08edfa… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T18:25:23+01:00 kamctl: Fix source order - Add check for already sourced rc file in kamctl --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/64cd9336039bc05944fd9693e08edfa… Patch: https://github.com/kamailio/kamailio/commit/64cd9336039bc05944fd9693e08edfa… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index ad4262b7fc0..197c6e43035 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -18,6 +18,7 @@ else fi ### include config files +RC_FILE_SOURCED="false" # check for rc file at same location with kamctl which greadlink >/dev/null 2>&1 @@ -39,11 +40,13 @@ if [ -n "$KAMCTLFULLPATH" ] ; then fi # check for rc file at standard locations -if [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then +if [ $RC_FILE_SOURCED = "false" ] && [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then . /etc/kamailio/kamctlrc + RC_FILE_SOURCED="true" fi -if [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then +if[ $RC_FILE_SOURCED = "false" ] && [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc + RC_FILE_SOURCED="true" fi if [ -f ~/.kamctlrc -a -r ~/.kamctlrc ]; then . ~/.kamctlrc @@ -3255,4 +3258,3 @@ case $1 in exit 1 ;; esac -

1 year

[kamailio/kamailio] kamctl: Source only one kamctlrc (PR #3594)

by Xenofon Karamanos

#### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  kamctl now sources the kamctlrc from only one location if available in this order: 1. same folder as kamctl, 2. {intstall_prefix}/etc/kamailio/, 3. ~/.kamctlrc 4. /etc/kamailio/. If no kamctlrc is found, it continues just like before. Should it stop? #### Issue description `kamctl` uses env variables from all the config files above, and retains the env value of the latest config that declares it. Let's say we have 3 kamctlrc files right now: ``` # first config file (same folder that kamctl resides) # {prefix_install}/sbin/kamctlrc ... SIP_DOMAIN=kamailio.org DBENGINE is commented ... ``` ``` # second config file # /etc/kamailio/kamctlrc ... SIP_DOMAIN=kam02.tst.nbg.gilawa.net DBENGINE=MYSQL ... ``` ``` # third config file # {prefix_install}/etc/kamailio/kamctlrc ... SIP_DOMAIN is commented DBENGINE=MYSQL ... ``` Running `{install_prefix}/sbin/kamctl` (before changes in order) it prints : ``` Loading config file /home/xenofon/kamailio-source-install/sbin/kamctlrc Loading config file /etc/kamailio/kamctlrc Loading config file /home/xenofon/kamailio-source-install/etc/kamailio//kamctlrc SIP_DOMAIN env var is kam02.tst.nbg.gilawa.net DBENGINE env var is MYSQL ``` suggesting that env variables from multiple sources are gathered and overwritten in cases. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3594 -- Commit Summary -- * kamctl: Source only one kamctlrc -- File Changes -- M utils/kamctl/kamctl (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3594.patch https://github.com/kamailio/kamailio/pull/3594.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3594 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3594(a)github.com>

1 year

Obsoleting unmaintained modules

by Daniel-Constantin Mierla

Hello, during the Kamailio Developers Meeting 2023 in Dusseldorf that took place last week, it was proposed to obsolete modules that seem to be unmaintained and no activity about them was noticed during the past years. It is quite some overhead in packaging them and trying to keep them compiling when they have external dependencies, therefore such step should spare some resources in the future. The list (see below) was built based on the options of those present at the meeting, now we want to discuss it on the larger communities of developers and users. If you are using any of these modules or you think any of them worth keeping, reply with the names of the modules that you want to be kept. The proposed action is to relocate the obsoleted modules to a new git repository "kamailio-obsolete" to still keep some visibility to them and in the eventually of future interest on any of them, it can be reintroduced in the main repository. Next is the initial list of modules proposed to be considered obsolete: - app_java - app_lua_sr - app_mono - app_python - app_sqlang - auth_identity - call_control - db2_ldap - db2_ops - db_cassandra - db_perldvdb - dnssec - domainpolicy - h350 - mediaproxy - osp - peering - print - print_lib - pua_xmpp - ratelimit - uid_auth_db - uid_avp_db - uid_domain - uid_gflags - uid_uri_db - uri_db - xmpp - xprint Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training -- asipto.com

1 year

git:master:06ce65a2: topos: detect direction for early dialog NOTIFY

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 06ce65a2bbea826b890a3712cf1ac4f8b53e54cd URL: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T17:39:11+01:00 topos: detect direction for early dialog NOTIFY --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… Patch: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 0e697e8580e..942629568b9 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -915,7 +915,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) | METHOD_NOTIFY)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ - if(metid & (METHOD_BYE | METHOD_UPDATE)) { + if(metid & (METHOD_BYE | METHOD_UPDATE | METHOD_NOTIFY)) { /* detect direction - via from-tag */ if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error;

1 year

git:5.7:3e979157: core: fix indentation on tcp_main.c

by Ovidiu Sas

Module: kamailio Branch: 5.7 Commit: 3e9791570645dee833737077b3326ca6acde6aef URL: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T11:29:18-05:00 core: fix indentation on tcp_main.c (cherry picked from commit 243951bc487c5c67c81062445d4f4d7ee725684f) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… Patch: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 49ad05a7fbb..d7bd4534d59 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3162,7 +3162,7 @@ int tcp_init(struct socket_info *sock_info) #if !defined(TCP_DONT_REUSEADDR) /* Stevens, "Network Programming", Section 7.5, "Generic Socket - * Options": "...server started,..a child continues..on existing + * Options": "...server started,..a child continues..on existing * connection..listening server is restarted...call to bind fails * ... ALL TCP servers should specify the SO_REUSEADDRE option * to allow the server to be restarted in this situation

1 year

git:master:243951bc: core: fix indentation on tcp_main.c

by Ovidiu Sas

Module: kamailio Branch: master Commit: 243951bc487c5c67c81062445d4f4d7ee725684f URL: https://github.com/kamailio/kamailio/commit/243951bc487c5c67c81062445d4f4d7… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T11:27:21-05:00 core: fix indentation on tcp_main.c --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/243951bc487c5c67c81062445d4f4d7… Patch: https://github.com/kamailio/kamailio/commit/243951bc487c5c67c81062445d4f4d7… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 7b46ccbafde..00a1796ec5a 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3162,7 +3162,7 @@ int tcp_init(struct socket_info *sock_info) #if !defined(TCP_DONT_REUSEADDR) /* Stevens, "Network Programming", Section 7.5, "Generic Socket - * Options": "...server started,..a child continues..on existing + * Options": "...server started,..a child continues..on existing * connection..listening server is restarted...call to bind fails * ... ALL TCP servers should specify the SO_REUSEADDRE option * to allow the server to be restarted in this situation

1 year

← Newer
1
...
26
27
28
29
30
31
32
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023