sr-dev

sr-dev@lists.kamailio.org

16 participants
45399 discussions

[kamailio/kamailio] Cannot use environment variables in modparam() function (#2276)
by Mathias Brodala 27 Apr '20

27 Apr '20

### Description I tried to use the `$env(NAME)` pseudovariable as argument for `modparam()` calls but evidently the result was empty. ### Troubleshooting #### Reproduction Set up `auth_ephemeral` and add this to your configuration: ``` modparam("auth_ephemeral", "secret", "$env(AUTH_EPHEMERAL_SECRET)") ``` Now export `AUTH_EPHEMERAL_SECRET=something` and start Kamailio with sufficient debug output. You'll see that Kamailio literally uses `$env(AUTH_EPHEMERAL_SECRET)` as secret instead of inserting the value of the environment variable. #### Log Messages ``` kamailio_1 | 17(23) DEBUG: auth_ephemeral [authorize.c:136]: do_auth(): secret: $env(AUTH_EPHEMERAL_SECRET) (27) ``` ### Possible Solutions Replacement of environment variables should be supported in `modparams()`. (And possibly in *all* functions.) ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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: unknown compiled with gcc 5.3.1 ``` * **Operating System**: ``` $ uname -a Linux e2193249aa45 4.4.0-128-generic #154-Ubuntu SMP Fri May 25 14:15:18 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` (Using the Docker image `kamailio/kamailio:5.2.1-xenial` ATM.) -- 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/2276

2 5

git:master:65ab73a7: core: str - fixed wrong (undo'ed) version of STR_ZTOV() macro
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: 65ab73a7efabf4a55e913adfa604094c9ad88cdb URL: https://github.com/kamailio/kamailio/commit/65ab73a7efabf4a55e913adfa604094… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T15:24:23+02:00 core: str - fixed wrong (undo'ed) version of STR_ZTOV() macro --- Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/65ab73a7efabf4a55e913adfa604094… Patch: https://github.com/kamailio/kamailio/commit/65ab73a7efabf4a55e913adfa604094… --- diff --git a/src/core/str.h b/src/core/str.h index 83334b8c86..01b12ecb62 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -137,7 +137,7 @@ typedef struct _str str; if (v != '\0') { \ c = v; \ } \ - } + } while(0) /** @} */

1 0

Broken: kamailio/kamailio#8774 (master - 4d758d5)
by Travis CI 27 Apr '20

27 Apr '20

Build Update for kamailio/kamailio ------------------------------------- Build: #8774 Status: Broken Duration: 5 mins and 5 secs Commit: 4d758d5 (master) Author: Daniel-Constantin Mierla Message: ndb_redis: use the core macros for ending string value with '\0' and to restore View the changeset: https://github.com/kamailio/kamailio/compare/db7f10cf393a...4d758d525809 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/680087179?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:4d758d52: ndb_redis: use the core macros for ending string value with '\0' and to restore
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: 4d758d5258097760c09a762929c5893c14ac3eef URL: https://github.com/kamailio/kamailio/commit/4d758d5258097760c09a762929c5893… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T15:07:06+02:00 ndb_redis: use the core macros for ending string value with '\0' and to restore --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/4d758d5258097760c09a762929c5893… Patch: https://github.com/kamailio/kamailio/commit/4d758d5258097760c09a762929c5893… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index a4531801b4..edeee8d597 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -542,9 +542,7 @@ int redisc_append_cmd(str *srv, str *res, str *cmd, ...) LM_ERR("no redis reply id found: %.*s\n", res->len, res->s); goto error_cmd; } - - c = cmd->s[cmd->len]; - cmd->s[cmd->len] = '\0'; + STR_VTOZ(cmd->s[cmd->len], c); rsrv->piped.commands[rsrv->piped.pending_commands].len = redisvFormatCommand( &rsrv->piped.commands[rsrv->piped.pending_commands].s, cmd->s, @@ -557,7 +555,7 @@ int redisc_append_cmd(str *srv, str *res, str *cmd, ...) rsrv->piped.replies[rsrv->piped.pending_commands]=rpl; rsrv->piped.pending_commands++; - cmd->s[cmd->len] = c; + STR_ZTOV(cmd->s[cmd->len], c); va_end(ap); return 0; @@ -883,8 +881,7 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error; } - c = cmd->s[cmd->len]; - cmd->s[cmd->len] = '\0'; + STR_VTOZ(cmd->s[cmd->len], c); rsrv = redisc_get_server(srv); if(rsrv==NULL) @@ -949,7 +946,7 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) redis_count_err_and_disable(rsrv); LM_ERR("unable to reconnect to redis server: %.*s\n", srv->len, srv->s); - cmd->s[cmd->len] = c; + STR_ZTOV(cmd->s[cmd->len], c); goto error_exec; } } @@ -983,12 +980,12 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) } else { LM_ERR("unable to reconnect to redis server: %.*s\n", srv->len, srv->s); - cmd->s[cmd->len] = c; + STR_ZTOV(cmd->s[cmd->len], c); goto error_exec; } } } - cmd->s[cmd->len] = c; + STR_ZTOV(cmd->s[cmd->len], c); rsrv->disable.consecutive_errors = 0; va_end(ap); va_end(ap2); @@ -1000,12 +997,12 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) return 0; error_exec: - cmd->s[cmd->len] = c; + STR_ZTOV(cmd->s[cmd->len], c); ret = -1; goto error; srv_disabled: - cmd->s[cmd->len] = c; + STR_ZTOV(cmd->s[cmd->len], c); ret = -2; goto error;

1 0

git:master:d6e24bd0: core: str - helper macro to set ending zero with backup and restore from backup
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: d6e24bd089bbe27c54a7e851993ab99bf93e8c52 URL: https://github.com/kamailio/kamailio/commit/d6e24bd089bbe27c54a7e851993ab99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T15:07:06+02:00 core: str - helper macro to set ending zero with backup and restore from backup --- Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/d6e24bd089bbe27c54a7e851993ab99… Patch: https://github.com/kamailio/kamailio/commit/d6e24bd089bbe27c54a7e851993ab99…

1 0

git:5.2:fb937491: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 27 Apr '20

27 Apr '20

Module: kamailio Branch: 5.2 Commit: fb937491f4222960a7cddaa73853cb2dd08672f7 URL: https://github.com/kamailio/kamailio/commit/fb937491f4222960a7cddaa73853cb2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-27T14:31:53+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/fb937491f4222960a7cddaa73853cb2… Patch: https://github.com/kamailio/kamailio/commit/fb937491f4222960a7cddaa73853cb2… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 1afd177f59..56e9caecfe 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1860,13 +1860,6 @@ rtpengine_offer(); “direction=external” respectively. Useful for brevity or as legacy option if the RTP proxy only supports two network interfaces instead of multiple, arbitrarily named ones. - + auto-bridge - this flag an alternative to the “internal” and - “external” flags in order to do automatic bridging between - IPv4 on the "internal network" and IPv6 on the "external - network". Instead of explicitly instructing the RTP proxy to - select a particular address family, the distinction is done by - the given IP in the SDP body by the RTP proxy itself. Not - supported by Sipwise rtpengine. + address-family=... - instructs the RTP proxy that the recipient of this SDP body expects to see addresses of a particular family. Possible values are “IP4” and “IP6”. For

1 0

git:5.3:50cb164e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 27 Apr '20

27 Apr '20

Module: kamailio Branch: 5.3 Commit: 50cb164e805a8690288b36d02c94f23149e91922 URL: https://github.com/kamailio/kamailio/commit/50cb164e805a8690288b36d02c94f23… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-27T14:31:34+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/50cb164e805a8690288b36d02c94f23… Patch: https://github.com/kamailio/kamailio/commit/50cb164e805a8690288b36d02c94f23… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 29f3ac0811..f991ddd094 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1920,13 +1920,6 @@ rtpengine_offer(); “direction=external” respectively. Useful for brevity or as legacy option if the RTP proxy only supports two network interfaces instead of multiple, arbitrarily named ones. - + auto-bridge - this flag an alternative to the “internal” and - “external” flags in order to do automatic bridging between - IPv4 on the "internal network" and IPv6 on the "external - network". Instead of explicitly instructing the RTP proxy to - select a particular address family, the distinction is done by - the given IP in the SDP body by the RTP proxy itself. Not - supported by Sipwise rtpengine. + address-family=... - instructs the RTP proxy that the recipient of this SDP body expects to see addresses of a particular family. Possible values are “IP4” and “IP6”. For

1 0

git:master:db7f10cf: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: db7f10cf393a93f7fd989730f17a4da8dd4c505c URL: https://github.com/kamailio/kamailio/commit/db7f10cf393a93f7fd989730f17a4da… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-27T14:31:15+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/db7f10cf393a93f7fd989730f17a4da… Patch: https://github.com/kamailio/kamailio/commit/db7f10cf393a93f7fd989730f17a4da… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 638760ee09..3a6998f5af 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1926,13 +1926,6 @@ rtpengine_offer(); “direction=external” respectively. Useful for brevity or as legacy option if the RTP proxy only supports two network interfaces instead of multiple, arbitrarily named ones. - + auto-bridge - this flag an alternative to the “internal” and - “external” flags in order to do automatic bridging between - IPv4 on the "internal network" and IPv6 on the "external - network". Instead of explicitly instructing the RTP proxy to - select a particular address family, the distinction is done by - the given IP in the SDP body by the RTP proxy itself. Not - supported by Sipwise rtpengine. + address-family=... - instructs the RTP proxy that the recipient of this SDP body expects to see addresses of a particular family. Possible values are “IP4” and “IP6”. For

1 0

[kamailio/kamailio] rtpengine: Unknown flag encountered: 'auto-bridge' (#2301)
by sergey-safarov 27 Apr '20

27 Apr '20

### Description According Kamailio rtpengine module supported auto-bridge flag. I added this flag in Kamailio config and get rtpengine warning ``` Unknown flag encountered: 'auto-bridge' ``` Then I make search in rtpengine commit history and cannot and commits with auto-bridge string. Think need remove `'auto-bridge` flag from Kamailio rtpengine module. -- 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/2301

4 7

git:5.2:6bb5594f: rtpengine: remove obselete auto-bridge flag (GH #2301)
by Henning Westerholt 27 Apr '20

27 Apr '20

Module: kamailio Branch: 5.2 Commit: 6bb5594f23cf10fb149edbfaf044f7ca9de8f7b8 URL: https://github.com/kamailio/kamailio/commit/6bb5594f23cf10fb149edbfaf044f7c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-27T12:21:23Z rtpengine: remove obselete auto-bridge flag (GH #2301) (cherry picked from commit cf084881d79dc18d8272fc4a9f89c0bfc8e1fde0) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6bb5594f23cf10fb149edbfaf044f7c… Patch: https://github.com/kamailio/kamailio/commit/6bb5594f23cf10fb149edbfaf044f7c… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index f3a92412eb..74adc8ae8d 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2114,15 +2114,6 @@ rtpengine_offer(); supports two network interfaces instead of multiple, arbitrarily named ones. </para></listitem> <listitem><para> - <emphasis>auto-bridge</emphasis> - this flag an alternative to the - <quote>internal</quote> and <quote>external</quote> flags - in order to do automatic bridging between IPv4 on the - "internal network" and IPv6 on the "external network". Instead of - explicitly instructing the &rtp; proxy to select a particular address - family, the distinction is done by the given IP in the &sdp; body by - the &rtp; proxy itself. Not supported by Sipwise rtpengine. - </para></listitem> - <listitem><para> <emphasis>address-family=...</emphasis> - instructs the &rtp; proxy that the recipient of this &sdp; body expects to see addresses of a particular family. Possible values are <quote>IP4</quote> and <quote>IP6</quote>. For example,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev