sr-dev

sr-dev@lists.kamailio.org

16 participants
45405 discussions

git:master:6f52da52: keepalive: ignore delete_counter if it is set to 0
by Nacho Garcia Segovia 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: 6f52da5286b61c5c039070d20a6687ee02e4e762 URL: https://github.com/kamailio/kamailio/commit/6f52da5286b61c5c039070d20a6687e… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-04-28T14:08:19+02:00 keepalive: ignore delete_counter if it is set to 0 --- Modified: src/modules/keepalive/doc/keepalive_admin.xml Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/6f52da5286b61c5c039070d20a6687e… Patch: https://github.com/kamailio/kamailio/commit/6f52da5286b61c5c039070d20a6687e… --- diff --git a/src/modules/keepalive/doc/keepalive_admin.xml b/src/modules/keepalive/doc/keepalive_admin.xml index 5db99eee4a..98e55222ea 100644 --- a/src/modules/keepalive/doc/keepalive_admin.xml +++ b/src/modules/keepalive/doc/keepalive_admin.xml @@ -96,7 +96,7 @@ modparam("keepalive", "destination", "sip.provider.com") <section> <title><varname>delete_counter</varname>(int)</title> <para> - Unsuccesful attemps increase delete_counter . After passing it , keepalive module doesn't try to send options requests. + Unsuccesful attemps increase delete_counter. After passing it, keepalive module doesn't try to send options requests. Ignored if it's set to 0. </para> <para> <emphasis> diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index ff0bed3e8e..f641aceb1f 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -67,15 +67,14 @@ void ka_check_timer(unsigned int ticks, void *param) ka_dest = ka_dest->next) { LM_DBG("ka_check_timer dest:%.*s\n", ka_dest->uri.len, ka_dest->uri.s); + if(ka_counter_del > 0 && ka_dest->counter > ka_counter_del) { + continue; + } + /* Send ping using TM-Module. * int request(str* m, str* ruri, str* to, str* from, str* h, * str* b, str *oburi, * transaction_cb cb, void* cbp); */ - - if(ka_dest->counter>ka_counter_del){ - continue; - } - set_uac_req(&uac_r, &ka_ping_method, 0, 0, 0, TMCB_LOCAL_COMPLETED, ka_options_callback, (void *)ka_dest);

1 0

[kamailio/kamailio] core: do not use tcp id for lookup if not needed (#2305)
by Donato Sciarra 28 Apr '20

28 Apr '20

#### 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description In case the first lookup (with tcp id) is not successful, the second attempt should have been performed without a tcp id. Issue was introduced with dc43750644 (new global parameter tcp_connection_match) in 5.3. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2305 -- Commit Summary -- * core: do not use tcp id for lookup if not needed -- File Changes -- M src/core/tcp_main.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2305.patch https://github.com/kamailio/kamailio/pull/2305.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/2305

2 2

git:master:70929caa: Merge pull request #2305 from dsciarra/do-not-use-tcp-id-for-lookup
by GitHub 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: 70929caac33583ae1026234ca999cc90afcb6f4c URL: https://github.com/kamailio/kamailio/commit/70929caac33583ae1026234ca999cc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-28T15:57:29+02:00 Merge pull request #2305 from dsciarra/do-not-use-tcp-id-for-lookup core: do not use tcp id for lookup if not needed --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/70929caac33583ae1026234ca999cc9… Patch: https://github.com/kamailio/kamailio/commit/70929caac33583ae1026234ca999cc9… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e57a29d99e..89e3b56b7c 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1967,7 +1967,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, if (likely(port)){ /* try again w/o id */ if(tcp_connection_match==TCPCONN_MATCH_STRICT) { - c=tcpconn_lookup(dst->id, &ip, port, from, try_local_port, con_lifetime); + c=tcpconn_lookup(0, &ip, port, from, try_local_port, con_lifetime); } else { c=tcpconn_get(0, &ip, port, from, con_lifetime); }

1 0

git:master:24a3a172: core: do not use tcp id for lookup if not needed
by Donato Sciarra 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: 24a3a172dbdecb6e987df943a3ad1acb4da664b5 URL: https://github.com/kamailio/kamailio/commit/24a3a172dbdecb6e987df943a3ad1ac… Author: Donato Sciarra <donato.sciarra(a)bmw.de> Committer: Donato Sciarra <donato.sciarra(a)bmw.de> Date: 2020-04-28T10:33:23+02:00 core: do not use tcp id for lookup if not needed In case the first lookup (with tcp id) is not successfull, the second attempt should have been performed without a tcp id. Issue was introduced with dc43750644 (new global parameter tcp_connection_match) in 5.3. --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/24a3a172dbdecb6e987df943a3ad1ac… Patch: https://github.com/kamailio/kamailio/commit/24a3a172dbdecb6e987df943a3ad1ac… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e57a29d99e..89e3b56b7c 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1967,7 +1967,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, if (likely(port)){ /* try again w/o id */ if(tcp_connection_match==TCPCONN_MATCH_STRICT) { - c=tcpconn_lookup(dst->id, &ip, port, from, try_local_port, con_lifetime); + c=tcpconn_lookup(0, &ip, port, from, try_local_port, con_lifetime); } else { c=tcpconn_get(0, &ip, port, from, con_lifetime); }

1 0

git:master:c9468fe4: pv: use safer macros for temporarily making zero-ending strings
by Daniel-Constantin Mierla 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: c9468fe47a192428dac89862f9de50b3fdc32f30 URL: https://github.com/kamailio/kamailio/commit/c9468fe47a192428dac89862f9de50b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-28T09:42:13+02:00 pv: use safer macros for temporarily making zero-ending strings --- Modified: src/modules/pv/pv_branch.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_select.c --- Diff: https://github.com/kamailio/kamailio/commit/c9468fe47a192428dac89862f9de50b… Patch: https://github.com/kamailio/kamailio/commit/c9468fe47a192428dac89862f9de50b…

1 0

RFC: C standard requirements
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Hello, (cross-posting because it is relevant to know where users need to run Kamailio as well as what developers tend to use for coding, but replies can go to one or the other list). Somehow I tried to stay close to ANSI-C/C90 with C coding style, for the reason of being compatible as much as possible with old compiles and niche/embedded systems. But I noticed that there are couple of C99 extensions in the core, like inline functions, variadic macros (the debugging macros), use of 'long long' or line comments starting with "//" (not so many, but still such comment style is used). Although I haven't searched for occurrences in core, but I remember seeing designated initializers (or initializing a structure by field names). These are part of C99, as listed by: * https://en.wikipedia.org/wiki/C99#Design Although likely GCC had some of them like custom extensions before the standard was out. On the other hand, newer standard C11 made some of those extensions optional: * https://en.wikipedia.org/wiki/C11_(C_standard_revision)#Optional_features So, my email here is to figure out if we should consider C99 as the requirement for adding C code or be more restrictive because there are still cases of usage on very specific systems that do not have such C compiler. We can eventually make a list of what is accepted or not from the recent versions of C standard to stay as much as possible portable across Unix'es. >From develeopers perspective, it would be good to learn if they use (in other projects, etc.) extensions of the new standards that they found useful and simplify their programming work. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev