- sr-dev - kamailio.org

git:master:4e881304: Merge pull request #2306 from NGSegovia/ngsegovia/keepalive_disable_delete_counter
by GitHub 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: 4e881304d33356a5fd3b93c15c0a9e06060049f7 URL: https://github.com/kamailio/kamailio/commit/4e881304d33356a5fd3b93c15c0a9e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-28T16:03:18+02:00 Merge pull request #2306 from NGSegovia/ngsegovia/keepalive_disable_delete_counter 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/4e881304d33356a5fd3b93c15c0a9e0… Patch: https://github.com/kamailio/kamailio/commit/4e881304d33356a5fd3b93c15c0a9e0… --- 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

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

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

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

27 Apr '20

Module: kamailio Branch: 5.3 Commit: be8a7c4c2857a24dc208f58f5ebfa7426f550633 URL: https://github.com/kamailio/kamailio/commit/be8a7c4c2857a24dc208f58f5ebfa74… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-27T12:21:00Z 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/be8a7c4c2857a24dc208f58f5ebfa74… Patch: https://github.com/kamailio/kamailio/commit/be8a7c4c2857a24dc208f58f5ebfa74… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index d4cd2e4fc1..cafd6b6ef4 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2163,15 +2163,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

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

27 Apr '20

Module: kamailio Branch: master Commit: cf084881d79dc18d8272fc4a9f89c0bfc8e1fde0 URL: https://github.com/kamailio/kamailio/commit/cf084881d79dc18d8272fc4a9f89c0b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-27T12:19:35Z rtpengine: remove obselete auto-bridge flag (GH #2301) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf084881d79dc18d8272fc4a9f89c0b… Patch: https://github.com/kamailio/kamailio/commit/cf084881d79dc18d8272fc4a9f89c0b… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index d9230209f6..8e91da5ae9 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2167,15 +2167,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

Custom kamailio modules
by Tyler Moore 27 Apr '20

27 Apr '20

Hey devs got a question about loading custom modules. This is my first kamailio module so if I am missing some gotchas please refer me to the proper documentation. I created a shared lib and included the module version info like so: #define NAME "kamailio" #define VERSION "5.3" #define ARCH "x86_64" #define OS_QUOTED "GNU/Linux" ... MODULE_VERSION I tried loading the module in a vanilla kamailio 5.3 install on debian 9 (stretch) and it seems sr_module.c can't find the module version info: ERROR: <core> [core/sr_module.c:325]: version_control(): no version info in module </usr/lib/x86_64-linux-gnu/kamailio/modules/dsiprouter.so>: /usr/lib/x86_64-linux-gnu/kamailio/modules/dsiprouter.so: undefined symbol: module_version But MODULE_VERSION should be defining this variable.. Running string on the shared lib shows it is being defined: > strings lib/dsiprouter.so | grep module_version module_version MODULE_VERSION char *module_version=SER_FULL_VERSION; char *module_flags=SER_COMPILE_FLAGS; unsigned int module_interface_ver=MODULE_INTERFACE_VER; module_version Is this a linking issue? Why does is seem that module_versino is referenced before being defined when i'm following the example from https://github.com/kamailio/kamailio/blob/5.1/src/modules/print/print.c ? Regards, *Tyler Moore* <https://devopsec.net/> Full Stack Software Engineer <http://www.google.com/search?q=full+stack+software+engineer+job+description> Flyball Labs <http://goflyball.com/> Office: 888-907-2085, ext: 34 <8889072085;ext=34> Cell: 248-909-2769 <2489092769> Email: tmoore(a)goflyball.com [image: FLYBALL TECHNICAL SOLUTIONS, LLC]

2 1

git:master:3366bf4f: app_python: use -fno-strict-aliasing for gcc
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: 3366bf4f3746285d9dc29e8a2461f53983f0acf0 URL: https://github.com/kamailio/kamailio/commit/3366bf4f3746285d9dc29e8a2461f53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T10:25:28+02:00 app_python: use -fno-strict-aliasing for gcc - python2 is known for not confirming strict aliasing - it is EoL and likely not going to be fixed - GH #2298 --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3366bf4f3746285d9dc29e8a2461f53… Patch: https://github.com/kamailio/kamailio/commit/3366bf4f3746285d9dc29e8a2461f53… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index 0d8bc98701..d22e63e6a4 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -29,5 +29,9 @@ endif DEFS+=-I${PYTHON_INCDIR} +ifeq ($(CC_NAME), gcc) +DEFS+= -fno-strict-aliasing +endif + include ../../Makefile.modules

1 0

git:master:86ebb4ee: pdb: covert byte-by-byte from buffer to short-int to avoid unalignment compile warning
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: 86ebb4eef482b37a3bb8bf033caa4d87fd8aeb87 URL: https://github.com/kamailio/kamailio/commit/86ebb4eef482b37a3bb8bf033caa4d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T10:47:48+02:00 pdb: covert byte-by-byte from buffer to short-int to avoid unalignment compile warning - GH #2298 --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/86ebb4eef482b37a3bb8bf033caa4d8… Patch: https://github.com/kamailio/kamailio/commit/86ebb4eef482b37a3bb8bf033caa4d8… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index b72ecf7f29..1ab15af2e7 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -189,6 +189,8 @@ static int pdb_msg_format_send(struct pdb_msg *msg, } +/* two chars to short-int without caring of memory alignment in char buffer */ +#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -199,7 +201,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct struct pdb_msg msg; struct timeval tstart, tnow; struct server_item_t *server; - short int carrierid, *_id; + short int carrierid, _id; short int _idv; char buf[sizeof(struct pdb_msg)]; size_t reqlen; @@ -345,8 +347,8 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = (short int *)&(msg.bdy.payload[reqlen]); /* make gcc happy */ - carrierid=ntohs(*_id); /* convert to host byte order */ + _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + carrierid=ntohs(_id); /* convert to host byte order */ goto found; } break; @@ -368,8 +370,8 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = (short int *)&(buf[reqlen]); - carrierid=ntohs(*_id); /* convert to host byte order */ + _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + carrierid=ntohs(_id); /* convert to host byte order */ goto found; } break;

1 0

git:master:e64b2914: Makefile.defs: expose CC_NAME variable
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: e64b29141afddf06bf7d5d68aa88679b54c5076c URL: https://github.com/kamailio/kamailio/commit/e64b29141afddf06bf7d5d68aa88679… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T10:25:06+02:00 Makefile.defs: expose CC_NAME variable --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e64b29141afddf06bf7d5d68aa88679… Patch: https://github.com/kamailio/kamailio/commit/e64b29141afddf06bf7d5d68aa88679… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9b36b0b56e..9efb93704a 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -2166,10 +2166,10 @@ export exported_vars # variable changeable only at configure time (once saved in config.mak they # cannot be overwritten from environment or command line, unless make cfg # is run) -saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ +saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ SRC_NAME RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ - CC_MKDEP_OPTS \ + CC_NAME CC_MKDEP_OPTS \ MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \ LIB_SUFFIX LIB_PREFIX \ LIBS \

1 0

git:master:f1de08ee: redis: init variables to get rid of compile warnings
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: f1de08eef86dc2cd98509c90fa8b28212d47ca37 URL: https://github.com/kamailio/kamailio/commit/f1de08eef86dc2cd98509c90fa8b282… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T09:36:36+02:00 redis: init variables to get rid of compile warnings - GH #2298 --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/f1de08eef86dc2cd98509c90fa8b282… Patch: https://github.com/kamailio/kamailio/commit/f1de08eef86dc2cd98509c90fa8b282… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index a35e7dc786..e59bd5ba29 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -496,13 +496,13 @@ int db_redis_parse_keys(km_redis_con_t *con) { str column_name; str version_code; - struct str_hash_entry *table_entry; - redis_table_t *table; - redis_type_t *type; - redis_type_t *type_target; - redis_key_t *key; - redis_key_t **key_target; - redis_key_t *key_location; + struct str_hash_entry *table_entry = NULL; + redis_table_t *table = NULL; + redis_type_t *type = NULL; + redis_type_t *type_target = NULL; + redis_key_t *key = NULL; + redis_key_t **key_target = NULL; + redis_key_t *key_location = NULL; enum { DBREDIS_KEYS_TABLE_ST, @@ -657,13 +657,13 @@ int db_redis_parse_schema(km_redis_con_t *con) { struct dirent* dent; char *dir_name; - str table_name; + str table_name = str_init(""); str column_name; str type_name; - struct str_hash_entry *table_entry; - struct str_hash_entry *column_entry; - redis_table_t *table; + struct str_hash_entry *table_entry = NULL; + struct str_hash_entry *column_entry = NULL; + redis_table_t *table = NULL; char full_path[_POSIX_PATH_MAX + 1]; int path_len;

1 0

Check if Kamailio is going to CANCEL branch
by Ivan Ribakov 27 Apr '20

27 Apr '20

Hi all, Recently I’ve asked the below question in the users mailing list but I didn’t get any response. I was wondering if someone in this mailing list could at least tell me whether what I’m trying to achieve is event doable or not so that I know whether I should invest more effort into finding out the “how” part? > Upon receiving a provisional response from callee in a branch route, is there a way of telling if Kamailio > is going to automatically CANCEL that branch because a final reply was received from another branch before that? > > The closest I got is finding “cancel_b_method” parameter of the TM module, but that is not what I’m after. > Previously I was recommended to debug via logging onreply_route but I’m not really sure what information may contain > hints of intention to send CANCEL. Does anyone have any suggestions/guesses in which direction I should be digging? Thanks in advance, Ivan

1 0

git:master:a0fb220a: db2_local: replace timelocal() with mktime()
by Daniel-Constantin Mierla 27 Apr '20

27 Apr '20

Module: kamailio Branch: master Commit: a0fb220a8b60b135cabf6741882437317116d868 URL: https://github.com/kamailio/kamailio/commit/a0fb220a8b60b135cabf67418824373… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-27T09:00:21+02:00 db2_local: replace timelocal() with mktime() - timelocal() is nonstandard GNU extension, not recommended to be used and mktime() should be equivalent: * https://linux.die.net/man/3/timegm - GH #2298 --- Modified: src/modules/db2_ldap/ld_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/a0fb220a8b60b135cabf67418824373… Patch: https://github.com/kamailio/kamailio/commit/a0fb220a8b60b135cabf67418824373… --- diff --git a/src/modules/db2_ldap/ld_fld.c b/src/modules/db2_ldap/ld_fld.c index 867c873e8f..7af731f077 100644 --- a/src/modules/db2_ldap/ld_fld.c +++ b/src/modules/db2_ldap/ld_fld.c @@ -270,7 +270,7 @@ static inline int ldap_gentime2db_datetime(time_t* dst, str* src) * of expiration by one hour when daylight saving is used */ time.tm_isdst = -1; - *dst = timelocal(&time); + *dst = mktime(&time); } return 0;

1 0

[kamailio/kamailio] sr_kemi_modules_add(sr_kemi_kazoo_exports) (#2302)
by hance2010 27 Apr '20

27 Apr '20

### Description // kamailio 5.3.3 // kazoo.c static sr_kemi_t sr_kemi_kazoo_exports[] = int mod_register(char *path, int *dlflags, void *p1, void *p2) { if(kz_tr_init_buffers()<0) { LM_ERR("failed to initialize transformations buffers\n"); return -1; } // sr_kemi_modules_add(sr_kemi_kazoo_exports); return register_trans_mod(path, mod_trans); }  ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**: Debian9  ``` (paste your output here) ``` -- 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/2302

2 2

git:master:d949907d: core: error.{c, h} - coherent use of camel case in error and reason texts
by Daniel-Constantin Mierla 26 Apr '20

26 Apr '20

Module: kamailio Branch: master Commit: d949907df4b0dd57d6b337c4ddbc968861e33536 URL: https://github.com/kamailio/kamailio/commit/d949907df4b0dd57d6b337c4ddbc968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-26T10:34:52+02:00 core: error.{c,h} - coherent use of camel case in error and reason texts - indentation and whitespacing --- Modified: src/core/error.c Modified: src/core/error.h --- Diff: https://github.com/kamailio/kamailio/commit/d949907df4b0dd57d6b337c4ddbc968… Patch: https://github.com/kamailio/kamailio/commit/d949907df4b0dd57d6b337c4ddbc968…

1 0

git:master:42285284: presence: consider watchers in active status when in no-db mode
by Daniel-Constantin Mierla 25 Apr '20

25 Apr '20

Module: kamailio Branch: master Commit: 42285284bcb941563f431046262c06dc1c8119d7 URL: https://github.com/kamailio/kamailio/commit/42285284bcb941563f431046262c06d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-25T12:27:39+02:00 presence: consider watchers in active status when in no-db mode - there is no persistent storage for watchers, status is lost on restart anyhow (similar to force active) --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/42285284bcb941563f431046262c06d… Patch: https://github.com/kamailio/kamailio/commit/42285284bcb941563f431046262c06d… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 3ab831f205..40421befb6 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -46,8 +46,8 @@ int get_stored_info( struct sip_msg *msg, subs_t *subs, int *error_ret, str *reply_str); int get_database_info( struct sip_msg *msg, subs_t *subs, int *error_ret, str *reply_str); -int get_db_subs_auth(subs_t *subs, int *found); -int insert_db_subs_auth(subs_t *subs); +static int ps_get_subs_auth(subs_t *subs, int *found); +static int ps_insert_subs_auth(subs_t *subs); static str su_200_rpl = str_init("OK"); static str pu_481_rpl = str_init("Subscription does not exist"); @@ -1069,8 +1069,9 @@ int handle_subscribe(struct sip_msg *msg, str watcher_user, str watcher_domain) reply_str = pu_400_rpl; goto error; } - } else + } else { goto bad_event; + } /* search event in the list */ parsed_event = (event_t *)msg->event->parsed; @@ -1149,11 +1150,11 @@ int handle_subscribe(struct sip_msg *msg, str watcher_user, str watcher_domain) subs.updated = NO_UPDATE_TYPE; subs.updated_winfo = NO_UPDATE_TYPE; - if(!event->req_auth) + if(!event->req_auth) { subs.status = ACTIVE_STATUS; - else { + } else { /* query in watchers_table */ - if(get_db_subs_auth(&subs, &found) < 0) { + if(ps_get_subs_auth(&subs, &found) < 0) { LM_ERR("getting subscription status from watchers table\n"); goto error; } @@ -1184,7 +1185,7 @@ int handle_subscribe(struct sip_msg *msg, str watcher_user, str watcher_domain) goto error; } - if(insert_db_subs_auth(&subs) < 0) { + if(ps_insert_subs_auth(&subs) < 0) { LM_ERR("while inserting record in watchers table\n"); goto error; } @@ -2668,7 +2669,7 @@ int restore_db_subs(void) return -1; } -int get_db_subs_auth(subs_t *subs, int *found) +static int ps_get_db_subs_auth(subs_t *subs, int *found) { db_key_t db_keys[5]; db_val_t db_vals[5]; @@ -2755,7 +2756,20 @@ int get_db_subs_auth(subs_t *subs, int *found) return -1; } -int insert_db_subs_auth(subs_t *subs) +static int ps_get_subs_auth(subs_t *subs, int *found) +{ + if(pa_db==NULL) { + /* expecting the cache only mode -- watchers considered active */ + subs->reason.s = NULL; + subs->status = ACTIVE_STATUS; + *found = 1; + return 0; + } else { + return ps_get_db_subs_auth(subs, found); + } +} + +static int ps_insert_db_subs_auth(subs_t *subs) { db_key_t db_keys[10]; db_val_t db_vals[10]; @@ -2837,6 +2851,17 @@ int insert_db_subs_auth(subs_t *subs) return -1; } +static int ps_insert_subs_auth(subs_t *subs) +{ + if(pa_db==NULL) { + /* expecting the cache only mode + * - no insert, watchers considered active */ + return 0; + } else { + return ps_insert_db_subs_auth(subs); + } +} + int get_subscribers_count_from_mem(struct sip_msg *msg, str pres_uri, str event) { subs_t *s;

1 0

git:master:a675ab88: dmq: test of if reply code and reason are set to send the response
by Daniel-Constantin Mierla 24 Apr '20

24 Apr '20

Module: kamailio Branch: master Commit: a675ab88fefac75145a7d563fee0431458630529 URL: https://github.com/kamailio/kamailio/commit/a675ab88fefac75145a7d563fee0431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-24T21:14:24+02:00 dmq: test of if reply code and reason are set to send the response --- Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/a675ab88fefac75145a7d563fee0431… Patch: https://github.com/kamailio/kamailio/commit/a675ab88fefac75145a7d563fee0431… --- diff --git a/src/modules/dmq/worker.c b/src/modules/dmq/worker.c index 38b49e4512..a2ccc636bf 100644 --- a/src/modules/dmq/worker.c +++ b/src/modules/dmq/worker.c @@ -126,12 +126,17 @@ void worker_loop(int id) } } /* send the reply */ - if(slb.freply(current_job->msg, peer_response.resp_code, - &peer_response.reason) - < 0) { - LM_ERR("error sending reply\n"); + if(peer_response.resp_code>0 && peer_response.reason.s!=NULL + && peer_response.reason.len>0) { + if(slb.freply(current_job->msg, peer_response.resp_code, + &peer_response.reason) + < 0) { + LM_ERR("error sending reply\n"); + } else { + LM_DBG("done sending reply\n"); + } } else { - LM_DBG("done sending reply\n"); + LM_WARN("no reply sent\n"); } worker->jobs_processed++;

1 0

git:master:7f618c2d: dmq: set 202 response for empty_peer_callback() handling
by Daniel-Constantin Mierla 24 Apr '20

24 Apr '20

Module: kamailio Branch: master Commit: 7f618c2d855ac268df905eb3d6e18733c8773047 URL: https://github.com/kamailio/kamailio/commit/7f618c2d855ac268df905eb3d6e1873… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-24T21:09:26+02:00 dmq: set 202 response for empty_peer_callback() handling --- Modified: src/modules/dmq/peer.c --- Diff: https://github.com/kamailio/kamailio/commit/7f618c2d855ac268df905eb3d6e1873… Patch: https://github.com/kamailio/kamailio/commit/7f618c2d855ac268df905eb3d6e1873… --- diff --git a/src/modules/dmq/peer.c b/src/modules/dmq/peer.c index 6c5ddf8954..7c2bf298e7 100644 --- a/src/modules/dmq/peer.c +++ b/src/modules/dmq/peer.c @@ -99,5 +99,11 @@ dmq_peer_t *find_peer(str peer_id) int empty_peer_callback( struct sip_msg *msg, peer_reponse_t *resp, dmq_node_t *dmq_node) { + static str _dmq_202_reason = str_init("Accepted DMQ"); + + memset(resp, 0, sizeof(peer_reponse_t)); + resp->resp_code = 202; + resp->reason = _dmq_202_reason; + return 0; }

1 0

git:5.3:cb4307c4: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Apr '20

24 Apr '20

Module: kamailio Branch: 5.3 Commit: cb4307c4d863537a5d9ffaba71e9f7680a9d7618 URL: https://github.com/kamailio/kamailio/commit/cb4307c4d863537a5d9ffaba71e9f76… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-24T14:31:57+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/cb4307c4d863537a5d9ffaba71e9f76… Patch: https://github.com/kamailio/kamailio/commit/cb4307c4d863537a5d9ffaba71e9f76…

1 0

git:5.3:4ba75bce: nathelper: docs - fix ending tags issues introduced with previous commit
by Henning Westerholt 24 Apr '20

24 Apr '20

Module: kamailio Branch: 5.3 Commit: 4ba75bce02fc7489462bfa1076313510612f7298 URL: https://github.com/kamailio/kamailio/commit/4ba75bce02fc7489462bfa107631351… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-24T12:29:29Z nathelper: docs - fix ending tags issues introduced with previous commit (cherry picked from commit 288f1f17cb36cd69ea2daed7afcaa859ccc72d58) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ba75bce02fc7489462bfa107631351… Patch: https://github.com/kamailio/kamailio/commit/4ba75bce02fc7489462bfa107631351… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 9aac37722e..64defce296 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -477,26 +477,26 @@ modparam("nathelper", "filter_server_id", 1) <itemizedlist> <listitem> <para>10.0.0.0/8</para> - <listitem> + </listitem> <listitem> <para>172.16.0.0/12</para> - <listitem> + </listitem> <listitem> <para>192.168.0.0/16</para> - <listitem> + </listitem> <listitem> <para>100.64.0.0/10 - RFC6598 - Carrier Grade NAT</para> - <listitem> + </listitem> <listitem> <para>192.0.0.0/29 - RFC7335 - IPv4 Service Continuity Prefix</para> - <listitem> - <itemizedlist> + </listitem> + </itemizedlist> <para>Reserved net addresses are:</para> <itemizedlist> <listitem> <para>192.0.0.0/24 - RFC7335 - IETF Protocol Assignments</para> - <listitem> - <itemizedlist> + </listitem> + </itemizedlist> <para> <emphasis> Default value is <quote>1</quote>.

1 0

git:5.3:e5262a61: nathelper: docs for nat_addr_mode parameter
by Henning Westerholt 24 Apr '20

24 Apr '20

Module: kamailio Branch: 5.3 Commit: e5262a61b7fcd87ef39d3cd08c78cffc7fa48011 URL: https://github.com/kamailio/kamailio/commit/e5262a61b7fcd87ef39d3cd08c78cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-24T12:29:11Z nathelper: docs for nat_addr_mode parameter (cherry picked from commit 9721922e2e47f3e8403bc540ecd73b55f41d5d91) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e5262a61b7fcd87ef39d3cd08c78cff… Patch: https://github.com/kamailio/kamailio/commit/e5262a61b7fcd87ef39d3cd08c78cff… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 2ab9f00ff8..9aac37722e 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -466,6 +466,52 @@ modparam("nathelper", "filter_server_id", 1) </example> </section> + <section id="nathelper.p.nat_addr_mode"> + <title><varname>nat_addr_mode</varname> (int)</title> + <para> + If set to 0, only default private net addresses are checked by + nat_uac_test(). If set to 1, other reserved net addresses are + checked by nat_uac_test() as well. + </para> + <para>Default private net addresses are:</para> + <itemizedlist> + <listitem> + <para>10.0.0.0/8</para> + <listitem> + <listitem> + <para>172.16.0.0/12</para> + <listitem> + <listitem> + <para>192.168.0.0/16</para> + <listitem> + <listitem> + <para>100.64.0.0/10 - RFC6598 - Carrier Grade NAT</para> + <listitem> + <listitem> + <para>192.0.0.0/29 - RFC7335 - IPv4 Service Continuity Prefix</para> + <listitem> + <itemizedlist> + <para>Reserved net addresses are:</para> + <itemizedlist> + <listitem> + <para>192.0.0.0/24 - RFC7335 - IETF Protocol Assignments</para> + <listitem> + <itemizedlist> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>nat_addr_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "nat_addr_mode", 0) +... +</programlisting> + </example> + </section> + </section>

1 0

git:5.3:657ac663: nathelper: new parameter nat_addr_mode
by Henning Westerholt 24 Apr '20

24 Apr '20

Module: kamailio Branch: 5.3 Commit: 657ac663b973ef769dea21f9983ff0e2cf8e2444 URL: https://github.com/kamailio/kamailio/commit/657ac663b973ef769dea21f9983ff0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-24T12:29:00Z nathelper: new parameter nat_addr_mode - if set to 0, default private net addresses are checked by nat_uac_test() - if set to 1, other reserved net addresses are checked by nat_uac_test() - default 1 (reserved addresses are considered not routable) - related at GH #2277 (cherry picked from commit a10e7652f24bc7ed8e74ff27d16da5d77689b6ac) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/657ac663b973ef769dea21f9983ff0e… Patch: https://github.com/kamailio/kamailio/commit/657ac663b973ef769dea21f9983ff0e… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index e77c9470a8..7d326508c8 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -138,13 +138,16 @@ static int cblen = 0; static int natping_interval = 0; struct socket_info *force_socket = 0; +static int nh_nat_addr_mode = 1; /* clang-format off */ -static struct { +typedef struct nh_netaddr { const char *cnetaddr; uint32_t netaddr; uint32_t mask; -} nets_1918[] = { +} nh_netaddr_t; + +static nh_netaddr_t nh_nets_1918[] = { {"10.0.0.0", 0, 0xffffffffu << 24}, {"172.16.0.0", 0, 0xffffffffu << 20}, {"192.168.0.0", 0, 0xffffffffu << 16}, @@ -152,6 +155,11 @@ static struct { {"192.0.0.0", 0, 0xffffffffu << 3}, /* rfc7335 - IPv4 Service Continuity Prefix */ {NULL, 0, 0} }; + +static nh_netaddr_t nh_nets_extra[] = { + {"192.0.0.0", 0, 0xffffffffu << 8}, /* rfc7335 - IETF Protocol Assignments */ + {NULL, 0, 0} +}; /* clang-format on */ /* @@ -250,6 +258,7 @@ static param_export_t params[] = { {"udpping_from_path", INT_PARAM, &udpping_from_path }, {"append_sdp_oldmediaip", INT_PARAM, &sdp_oldmediaip }, {"filter_server_id", INT_PARAM, &nh_filter_srvid }, + {"nat_addr_mode", INT_PARAM, &nh_nat_addr_mode }, {0, 0, 0} }; @@ -528,10 +537,17 @@ static int mod_init(void) } /* Prepare 1918 networks list */ - for(i = 0; nets_1918[i].cnetaddr != NULL; i++) { - if(inet_aton(nets_1918[i].cnetaddr, &addr) != 1) + for(i = 0; nh_nets_1918[i].cnetaddr != NULL; i++) { + if(inet_aton(nh_nets_1918[i].cnetaddr, &addr) != 1) abort(); - nets_1918[i].netaddr = ntohl(addr.s_addr) & nets_1918[i].mask; + nh_nets_1918[i].netaddr = ntohl(addr.s_addr) & nh_nets_1918[i].mask; + } + + /* Prepare reserved/extra networks list */ + for(i = 0; nh_nets_extra[i].cnetaddr != NULL; i++) { + if(inet_aton(nh_nets_extra[i].cnetaddr, &addr) != 1) + abort(); + nh_nets_extra[i].netaddr = ntohl(addr.s_addr) & nh_nets_extra[i].mask; } register_select_table(sel_declaration); @@ -1260,11 +1276,18 @@ static inline int is1918addr_n(uint32_t netaddr) uint32_t hl; hl = ntohl(netaddr); - for(i = 0; nets_1918[i].cnetaddr != NULL; i++) { - if((hl & nets_1918[i].mask) == nets_1918[i].netaddr) { + for(i = 0; nh_nets_1918[i].cnetaddr != NULL; i++) { + if((hl & nh_nets_1918[i].mask) == nh_nets_1918[i].netaddr) { return 1; } } + if(nh_nat_addr_mode==1) { + for(i = 0; nh_nets_extra[i].cnetaddr != NULL; i++) { + if((hl & nh_nets_extra[i].mask) == nh_nets_extra[i].netaddr) { + return 1; + } + } + } return 0; }

1 0

[kamailio/kamailio] db_redis: warning: 'table_name.len' may be used uninitialized (#2169)
by sergey-safarov 23 Apr '20

23 Apr '20

``` CC (gcc) [M db_redis.so] redis_table.o CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o In file included from ../../lib/srdb1/../../core/ut.h:42, from ../../lib/srdb1/db_key.h:31, from ../../lib/srdb1/db.h:43, from db_redis_mod.h:26, from redis_table.c:25: redis_table.c: In function 'db_redis_parse_keys': ../../lib/srdb1/../../core/dprint.h:303:8: warning: 'table_name.len' may be used uninitialized in this function [-Wmaybe-uninitialized] 303 | fprintf(stderr, "%2d(%d) %s: %.*s%s" fmt, \ | ^~~~~~~ redis_table.c:494:9: note: 'table_name.len' was declared here 494 | str table_name; | ^~~~~~~~~~ In file included from ../../lib/srdb1/../../core/ut.h:42, from ../../lib/srdb1/db_key.h:31, from ../../lib/srdb1/db.h:43, from db_redis_mod.h:26, from redis_table.c:25: ../../lib/srdb1/../../core/dprint.h:303:8: warning: 'table_name.s' may be used uninitialized in this function [-Wmaybe-uninitialized] 303 | fprintf(stderr, "%2d(%d) %s: %.*s%s" fmt, \ | ^~~~~~~ redis_table.c:494:9: note: 'table_name.s' was declared here 494 | str table_name; | ^~~~~~~~~~ redis_table.c:581:38: warning: 'table' may be used uninitialized in this function [-Wmaybe-uninitialized] 581 | table->types = type_target = type; | ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ CC (gcc) [M db_redis.so] redis_dbase.o make[3]: 'libsrdb2.so.1.0' is up to date. make[3]: 'libsrdb1.so.1.0' is up to date. ``` -- 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/2169

4 12

[kamailio/kamailio] dispatcher module not adding additional destinations to destination set when maxload=0 (#2297)
by kdanderso 23 Apr '20

23 Apr '20

#2057 # Description The documentation for the dispatcher module indicates that maxload = 0 indicates no call limit for the call load distribution algorithm. However, when filling in the XAVP list for additional destinations, mode 10 does not handle the case where maxload = 0, so there are never any additional destinations in this case. This means that there is no failover if the original destination fails. Issue #800 also addressed a maxload = 0 issue, but did not address the XAVP list. ### Possible Solutions The following patch resolves the issue for me: ```diff diff -ru a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c --- a/modules/dispatcher/dispatch.c 2020-04-23 10:41:32.414130450 -0500 +++ b/modules/dispatcher/dispatch.c 2020-04-23 10:42:11.738154578 -0500 @@ -2273,6 +2273,7 @@ } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; } @@ -2294,6 +2295,7 @@ } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; } ``` ### Additional Information I am using the following version. The issue appears to still exist in the master branch. version: kamailio 5.3.2 (arm6/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED 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 on 17:22:09 Mar 18 2020 with gcc 8.3.0 Thank you. -- 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/2297

2 2

git:5.3:0df6a220: dispatcher: handle the case of maxload 0 for call load distribution
by Daniel-Constantin Mierla 23 Apr '20

23 Apr '20

Module: kamailio Branch: 5.3 Commit: 0df6a22015d48a57a91ac4b34411fad0a7272179 URL: https://github.com/kamailio/kamailio/commit/0df6a22015d48a57a91ac4b34411fad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-23T19:06:18+02:00 dispatcher: handle the case of maxload 0 for call load distribution - GH #2297 (cherry picked from commit 0115d3424c0f8780a661882527f39b2b39d0e74e) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/0df6a22015d48a57a91ac4b34411fad… Patch: https://github.com/kamailio/kamailio/commit/0df6a22015d48a57a91ac4b34411fad… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index ecbfa71433..aaa7b4a2d5 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2247,6 +2247,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; } @@ -2268,6 +2269,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; }

1 0

git:master:0115d342: dispatcher: handle the case of maxload 0 for call load distribution
by Daniel-Constantin Mierla 23 Apr '20

23 Apr '20

Module: kamailio Branch: master Commit: 0115d3424c0f8780a661882527f39b2b39d0e74e URL: https://github.com/kamailio/kamailio/commit/0115d3424c0f8780a661882527f39b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-23T19:04:58+02:00 dispatcher: handle the case of maxload 0 for call load distribution - GH #2297 --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/0115d3424c0f8780a661882527f39b2… Patch: https://github.com/kamailio/kamailio/commit/0115d3424c0f8780a661882527f39b2… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 6ded012085..004bb0cfae 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2273,6 +2273,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; } @@ -2294,6 +2295,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; }

1 0

[info] matrix chat room for kamailio
by Daniel-Constantin Mierla 23 Apr '20

23 Apr '20

Thanks to the efforts made by Fred Posner, a matrix.org server has been installed on Kamailio project infrastructure (matrix.kamailio.dev - server sponsored by lod.com), which enables us to create chat rooms as we need for our community of users and developers. It tries to be an alternative to the existing IRC #kamailio channel, given that a while ago freenode.net had to enforce user registration to join the channels on their service (not complaining about it, they did it for good reasons to protect against spammers and D/DoS attacks). The #kamailio channel on freenode.net will still be in use by the people that like it, there is no plan to consider it obsolete. One of the main benefits of running own matrix server is the ability to allow guest access during the devel online meetings, so people that do not want to create an account can still participate by using a web browser. Also, it offers modern encryption and privacy, along with richer collaboration features (e.g., file sharing), many considering it a viable open source alternative to Slack or other private team collaboration services. The first room created is #kamailio:matrix.kamailio.dev : * https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev The matrix server is federated, so you can join if you have an account on any other public federated matrix server or one that you can host yourself. The server on matrix.kamailio.dev is not allowing public registrations. If you are a registered developer (have git commit access) and need a matrix account, let us know and we will find solutions. It is the first phase now and based on the interest from the community, its usage can be increased (e.g., creating rooms for development notifications (commits, pull requests, issue); bridge to irc channel; etc...) or the server can be shut down if proves not useful. We will try to do the next online devel meeting (scheduled for Wednesday, April 29, 2020, at 14:00UTC) on the matrix chat room mentioned above. More details at: * https://www.kamailio.org/w/2020/04/matrix-chat-room-for-kamailio/ Stay safe and healthy! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:1292e40c: ims_usrloc_pcscf: fix value array size and compile warnings
by Daniel-Constantin Mierla 23 Apr '20

23 Apr '20

Module: kamailio Branch: master Commit: 1292e40c5260fa77d34db91abf7aacf47549d5e2 URL: https://github.com/kamailio/kamailio/commit/1292e40c5260fa77d34db91abf7aacf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-23T10:21:22+02:00 ims_usrloc_pcscf: fix value array size and compile warnings --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/1292e40c5260fa77d34db91abf7aacf… Patch: https://github.com/kamailio/kamailio/commit/1292e40c5260fa77d34db91abf7aacf… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 1ac55734d7..e597a0daf4 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -123,8 +123,9 @@ void free_security(security_t* _p) return; } - if(_p->sec_header.s) + if(_p->sec_header.s) { shm_free(_p->sec_header.s); + } switch (_p->type) { @@ -144,8 +145,9 @@ void free_security(security_t* _p) break; case SECURITY_TLS: - if(_p->data.tls) + if(_p->data.tls) { shm_free(_p->data.tls); + } break; case SECURITY_NONE: diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.c b/src/modules/ims_usrloc_pcscf/usrloc_db.c index ba71673e44..ca57a2b4b3 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.c @@ -213,7 +213,7 @@ int db_update_pcontact(pcontact_t* _c) int db_delete_pcontact(pcontact_t* _c) { LM_DBG("Trying to delete contact: aor[%.*s], received port %u\n", _c->aor.len, _c->aor.s, _c->received_port); - db_val_t values[1]; + db_val_t values[2]; db_key_t match_keys[2] = { &aor_col, &received_port_col }; VAL_TYPE(values) = DB1_STR;

1 0

git:master:b9b177cc: db_redis: var initialization and safety check to avoid compiler warnings
by Daniel-Constantin Mierla 23 Apr '20

23 Apr '20

Module: kamailio Branch: master Commit: b9b177ccffd58b11cf460764514486d29637dd55 URL: https://github.com/kamailio/kamailio/commit/b9b177ccffd58b11cf460764514486d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-23T09:57:05+02:00 db_redis: var initialization and safety check to avoid compiler warnings --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/b9b177ccffd58b11cf460764514486d… Patch: https://github.com/kamailio/kamailio/commit/b9b177ccffd58b11cf460764514486d… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index 4bed4e1c6d..a35e7dc786 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -491,7 +491,7 @@ int db_redis_parse_keys(km_redis_con_t *con) { char *start; char *end; - str table_name; + str table_name = str_init(""); str type_name; str column_name; str version_code; @@ -550,7 +550,8 @@ int db_redis_parse_keys(km_redis_con_t *con) { table_entry = str_hash_get(&con->tables, table_name.s, table_name.len); if (!table_entry) { - LM_ERR("No table schema found for table '%.*s', fix config by adding one to the 'schema' mod-param!\n", + LM_ERR("No table schema found for table '%.*s', fix config" + " by adding one to the 'schema' mod-param!\n", table_name.len, table_name.s); goto err; } @@ -558,6 +559,10 @@ int db_redis_parse_keys(km_redis_con_t *con) { table->version_code = version_code; break; case DBREDIS_KEYS_TYPE_ST: + if(!table) { + LM_ERR("invalid definition, table not set\n"); + goto err; + } while(p != end && *p != ':') ++p; if (p == end) { @@ -631,8 +636,6 @@ int db_redis_parse_keys(km_redis_con_t *con) { case DBREDIS_KEYS_END_ST: LM_DBG("done parsing keys definition\n"); return 0; - - } } while (p != end);

1 0

Release schedule
by Jeremy Kister 23 Apr '20

23 Apr '20

Victor recently fixed a problem I reported in #2288 and triggered a builds for kamailio-[dev|5.3|5.2|5.1]-nightly Is there a release schedule that shows me when I can expect the change in kamailio-53 ? apt considers the nightly release "5.3.3+0~20200417092406.72+bionic" as a downgrade from "5.3.3+bionic". -- Jeremy Kister https://jeremy.kister.net./

2 1

[kamailio/kamailio] build errors with GCC 10 (#2293)
by Victor Seva 22 Apr '20

22 Apr '20

> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957395 >Package: src:kamailio >Version: 5.3.2-1 >[..] >The package fails to build in a test rebuild on at least amd64 with >gcc-10/g++-10, but succeeds to build with gcc-9/g++-9. The >severity of this report will be raised before the bullseye release, >so nothing has to be done for the buster release. > >The full build log can be found at: >http://people.debian.org/~doko/logs/gcc10-20200225/kamailio_5.3.2-1_unstabl… >The last lines of the build log are at the end of this report. > ``` [...] /usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: warning: ‘__builtin_strncpy’ specified bound depends on the length of the source argument [-Wstringop-overflow=] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/cfg.tab.c: In function ‘yyparse’: core/cfg.y:669:48: note: length computed here 669 | strncpy($$, $1, strlen($1)+1); | ^ In file included from /usr/include/string.h:495, from core/cfg.y:40: In function ‘strncpy’, inlined from ‘yyparse’ at core/cfg.y:659:6: /usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: warning: ‘__builtin_strncpy’ specified bound depends on the length of the source argument [-Wstringop-overflow=] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/cfg.tab.c: In function ‘yyparse’: core/cfg.y:659:35: note: length computed here 659 | strncpy($$, tmp, strlen(tmp)+1); | ^~~ ``` ``` gcc -fPIC -DPIC -funroll-loops -Wcast-align -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.3.2"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 0.0.1"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5003002 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -DMOD_NAME='"corex"' -c corex_rpc.c -o corex_rpc.o gcc -shared -Wl,-O2 -Wl,-E -Wl,-z,relro -Wl,-z,now -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions corex_var.o corex_nio.o corex_mod.o corex_lib.o corex_rpc.o -o corex.so /usr/bin/ld: corex_mod.o:./src/modules/corex/corex_nio.h:36: multiple definition of `nio_min_msg_len'; corex_nio.o:./src/modules/corex/corex_nio.h:36: first defined here /usr/bin/ld: corex_mod.o:./src/modules/corex/corex_nio.h:39: multiple definition of `nio_msg_avp_param'; corex_nio.o:./src/modules/corex/corex_nio.h:39: first defined here /usr/bin/ld: corex_mod.o:./src/modules/corex/corex_nio.h:41: multiple definition of `nio_msg_avp_type'; corex_nio.o:./src/modules/corex/corex_nio.h:41: first defined here /usr/bin/ld: corex_mod.o:./src/modules/corex/corex_nio.h:40: multiple definition of `nio_msg_avp_name'; corex_nio.o:./src/modules/corex/corex_nio.h:40: first defined here /usr/bin/ld: corex_mod.o:./src/modules/corex/corex_nio.h:37: multiple definition of `nio_is_incoming'; corex_nio.o:./src/modules/corex/corex_nio.h:37: first defined here /usr/bin/ld: corex_mod.o:./src/modules/corex/corex_nio.h:35: multiple definition of `nio_route_no'; corex_nio.o:./src/modules/corex/corex_nio.h:35: first defined here collect2: error: ld returned 1 exit status make[4]: *** [../../Makefile.rules:191: corex.so] Error 1 make[3]: *** [Makefile:513: modules] Error 1 make[3]: Leaving directory '/<<PKGBUILDDIR>>/src' make[2]: *** [Makefile:34: all] Error 2 make[2]: Leaving directory '/<<PKGBUILDDIR>>' make[1]: *** [debian/rules:146: override_dh_auto_build] Error 2 make[1]: Leaving directory '/<<PKGBUILDDIR>>' make: *** [debian/rules:130: build] Error 2 dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 ``` -- 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/2293

3 4

[kamailio/kamailio] Kamailio 5.3.0 crashed when exec module tried to execute external program (#2165)
by Konstantin 22 Apr '20

22 Apr '20

### Description  In some cases we need to call zabbix_sender utility to notify that some failure happens. At this time we move our configs from Kamailio 4.4.7 to Kamailio 5.3.0 and during testing we meet this issue. We configured exec module to kill the program after 20 seconds ``` modparam("exec", "time_to_kill", 20) .... exec_avp("/usr/bin/zabbix_sender --config ZABBIX_AGENT_CONFIG_PATH --key ecsp_no_telephony --value 1"); ``` zabbix_sender could not connect to server and were hanged up. Kamailio probably tried to kill it and crashed. ### Troubleshooting #### Reproduction  #### Debugging Data  ``` Dec 5 12:25:08 sip-proxy01 /usr/ecsp/sbin/kamailio[12458]: NOTICE: <script>: zabbix_sender (ecsp_no_telephony) Dec 5 12:25:09 sip-proxy01 /usr/ecsp/sbin/kamailio[12417]: ALERT: <core> [main.c:767]: handle_sigs(): child process 12458 exited by a signal 11 Dec 5 12:25:09 sip-proxy01 /usr/ecsp/sbin/kamailio[12466]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 50 Dec 5 12:25:09 sip-proxy01 /usr/ecsp/sbin/kamailio[12417]: ALERT: <core> [main.c:770]: handle_sigs(): core was generated ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0 (x86_64/linux) 4cc67a flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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: 4cc67a compiled on 14:01:24 Nov 28 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` Linux sip-proxy01 3.10.0-1062.4.1.el7.x86_64 #1 SMP Fri Oct 18 17:15:30 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux CentOS Linux release 7.7.1908 (Core) ``` -- 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/2165

3 15

git:master:74f50796: presence: implemented more functions to work with in-memory presentity records
by Daniel-Constantin Mierla 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 74f50796e28d5ae408ec4bac68c2f03263c1132c URL: https://github.com/kamailio/kamailio/commit/74f50796e28d5ae408ec4bac68c2f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-22T21:02:50+02:00 presence: implemented more functions to work with in-memory presentity records --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/notify.c Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/74f50796e28d5ae408ec4bac68c2f03… Patch: https://github.com/kamailio/kamailio/commit/74f50796e28d5ae408ec4bac68c2f03…

1 0

git:5.2:d27586c5: auth: log correct variable name in nonce-count error message
by Henning Westerholt 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.2 Commit: d27586c58acbee65aacce511907317cd3ac91f30 URL: https://github.com/kamailio/kamailio/commit/d27586c58acbee65aacce511907317c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-22T16:16:20Z auth: log correct variable name in nonce-count error message (cherry picked from commit 75ef2a31ee3abd9e840788a3389cedfac8767cd0) --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d27586c58acbee65aacce511907317c… Patch: https://github.com/kamailio/kamailio/commit/d27586c58acbee65aacce511907317c… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index 00d1166a77..a68bded2dc 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -344,7 +344,7 @@ static int mod_init(void) } #ifdef USE_NC else{ - LM_INFO("qop set, but nonce-count (nc_enabled) support" + LM_INFO("qop set, but nonce-count (nonce_count) support" " disabled\n"); } #endif

1 0

git:5.3:d055ccbc: auth: log correct variable name in nonce-count error message
by Henning Westerholt 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.3 Commit: d055ccbc845291b64b73064853663f80f3da7aa9 URL: https://github.com/kamailio/kamailio/commit/d055ccbc845291b64b73064853663f8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-22T16:15:56Z auth: log correct variable name in nonce-count error message (cherry picked from commit 75ef2a31ee3abd9e840788a3389cedfac8767cd0) --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d055ccbc845291b64b73064853663f8… Patch: https://github.com/kamailio/kamailio/commit/d055ccbc845291b64b73064853663f8… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index f9b7097c14..cc16643eb4 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -342,7 +342,7 @@ static int mod_init(void) } #ifdef USE_NC else{ - LM_INFO("qop set, but nonce-count (nc_enabled) support" + LM_INFO("qop set, but nonce-count (nonce_count) support" " disabled\n"); } #endif

1 0

git:master:75ef2a31: auth: log correct variable name in nonce-count error message
by Henning Westerholt 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 75ef2a31ee3abd9e840788a3389cedfac8767cd0 URL: https://github.com/kamailio/kamailio/commit/75ef2a31ee3abd9e840788a3389cedf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-22T16:14:54Z auth: log correct variable name in nonce-count error message --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/75ef2a31ee3abd9e840788a3389cedf… Patch: https://github.com/kamailio/kamailio/commit/75ef2a31ee3abd9e840788a3389cedf… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index f9b7097c14..cc16643eb4 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -342,7 +342,7 @@ static int mod_init(void) } #ifdef USE_NC else{ - LM_INFO("qop set, but nonce-count (nc_enabled) support" + LM_INFO("qop set, but nonce-count (nonce_count) support" " disabled\n"); } #endif

1 0

git:master:737d92bb: presence: function to search presentity items for in memory subscriptions
by Daniel-Constantin Mierla 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 737d92bbc0ceb53bade20cbf82868e219cd7c6e8 URL: https://github.com/kamailio/kamailio/commit/737d92bbc0ceb53bade20cbf82868e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-22T16:57:56+02:00 presence: function to search presentity items for in memory subscriptions --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/737d92bbc0ceb53bade20cbf82868e2… Patch: https://github.com/kamailio/kamailio/commit/737d92bbc0ceb53bade20cbf82868e2…

1 0

git:5.2:6fdeb31a: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.2 Commit: 6fdeb31a535e63fe39509398ad641ccbad8d3686 URL: https://github.com/kamailio/kamailio/commit/6fdeb31a535e63fe39509398ad641cc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-22T15:01:42+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/6fdeb31a535e63fe39509398ad641cc… Patch: https://github.com/kamailio/kamailio/commit/6fdeb31a535e63fe39509398ad641cc… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 2e09145288..f348a7f7a9 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -12,16 +12,10 @@ Edited by Maxim Sobolev -Edited by - Bogdan-Andrei Iancu -Edited by - Juha Heinanen -Edited by - Ovidiu Sas Copyright © 2003-2008 Sippy Software, Inc. @@ -279,11 +273,11 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) - If this parameter is set to 1 then only contacts that have “behind_NAT” - flag in user location database set will get ping. + If this parameter is set to 1 then only contacts that have the behind + NAT “nat_bflag” flag in user location database set will get ping. - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is + sent to all contacts. If it is 0 and sipping_bflag parameter is set, then SIP-request-based pinging is sent to all contacts. Default value is 0. @@ -762,35 +756,35 @@ Chapter 2. Frequently Asked Questions 2.1. - What happened with “rtpproxy_disable” parameter? + What happened with “rtpproxy_disable” parameter? - It was removed as it became obsolete - now “rtpproxy_sock” can take - empty value to disable the rtpproxy functionality. + It was removed as it became obsolete - now “rtpproxy_sock” can take + empty value to disable the rtpproxy functionality. 2.2. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at https://www.kamailio.org/. + Take a look at https://www.kamailio.org/. 2.3. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.kamailio.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.kamailio.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.kamailio.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.kamailio.org>. 2.4. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - https://github.com/kamailio/kamailio/issues. + Please follow the guidelines provided at: + https://github.com/kamailio/kamailio/issues.

1 0

git:5.3:781a20ab: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.3 Commit: 781a20ab23738d8a3639f3b973bb07df41b0735f URL: https://github.com/kamailio/kamailio/commit/781a20ab23738d8a3639f3b973bb07d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-22T15:01:26+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/781a20ab23738d8a3639f3b973bb07d… Patch: https://github.com/kamailio/kamailio/commit/781a20ab23738d8a3639f3b973bb07d… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 048372ae96..7cafc18603 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -273,11 +273,11 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) - If this parameter is set to 1 then only contacts that have “behind_NAT” - flag in user location database set will get ping. + If this parameter is set to 1 then only contacts that have the behind + NAT “nat_bflag” flag in user location database set will get ping. - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is + sent to all contacts. If it is 0 and sipping_bflag parameter is set, then SIP-request-based pinging is sent to all contacts. Default value is 0.

1 0

git:master:0b207f62: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 0b207f621cf5e245ece384fa4f31d34ffd1b82db URL: https://github.com/kamailio/kamailio/commit/0b207f621cf5e245ece384fa4f31d34… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-22T15:01:12+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/0b207f621cf5e245ece384fa4f31d34… Patch: https://github.com/kamailio/kamailio/commit/0b207f621cf5e245ece384fa4f31d34… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 40c5d7142e..4cfe36880b 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -280,11 +280,11 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) - If this parameter is set to 1 then only contacts that have “behind_NAT” - flag in user location database set will get ping. + If this parameter is set to 1 then only contacts that have the behind + NAT “nat_bflag” flag in user location database set will get ping. - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is + sent to all contacts. If it is 0 and sipping_bflag parameter is set, then SIP-request-based pinging is sent to all contacts. Default value is 0.

1 0

git:5.3:a82c6a6c: nathelper: update flag documenation
by Henning Westerholt 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.3 Commit: a82c6a6c4d7836e6cac586872bdc384abb657c60 URL: https://github.com/kamailio/kamailio/commit/a82c6a6c4d7836e6cac586872bdc384… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-22T12:53:41Z nathelper: update flag documenation (cherry picked from commit 95fa98e254ae85b29fa80a8cddde3442b69ca9dc) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a82c6a6c4d7836e6cac586872bdc384… Patch: https://github.com/kamailio/kamailio/commit/a82c6a6c4d7836e6cac586872bdc384… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index b5a5b08167..2ab9f00ff8 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -173,13 +173,13 @@ modparam("nathelper", "natping_interval", 10) <title><varname>ping_nated_only</varname> (integer)</title> <para> If this parameter is set to 1 then only contacts that have - <quote>behind_NAT</quote> flag in user location database set will - get ping. + the behind NAT <quote>nat_bflag</quote> flag in user location + database set will get ping. </para> <para> - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, then - SIP-request-based pinging is sent to all contacts. + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping + is sent to all contacts. If it is 0 and sipping_bflag parameter + is set, then SIP-request-based pinging is sent to all contacts. </para> <para> <emphasis>

1 0

git:5.2:befc5dcc: nathelper: update flag documenation
by Henning Westerholt 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.2 Commit: befc5dcc3607eda3b837197109faeda411bcb549 URL: https://github.com/kamailio/kamailio/commit/befc5dcc3607eda3b837197109faeda… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-22T12:53:15Z nathelper: update flag documenation (cherry picked from commit 95fa98e254ae85b29fa80a8cddde3442b69ca9dc) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/befc5dcc3607eda3b837197109faeda… Patch: https://github.com/kamailio/kamailio/commit/befc5dcc3607eda3b837197109faeda… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index e3c47e2d70..591bdc54cd 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -173,13 +173,13 @@ modparam("nathelper", "natping_interval", 10) <title><varname>ping_nated_only</varname> (integer)</title> <para> If this parameter is set to 1 then only contacts that have - <quote>behind_NAT</quote> flag in user location database set will - get ping. + the behind NAT <quote>nat_bflag</quote> flag in user location + database set will get ping. </para> <para> - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, then - SIP-request-based pinging is sent to all contacts. + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping + is sent to all contacts. If it is 0 and sipping_bflag parameter + is set, then SIP-request-based pinging is sent to all contacts. </para> <para> <emphasis>

1 0

git:master:95fa98e2: nathelper: update flag documenation
by Henning Westerholt 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 95fa98e254ae85b29fa80a8cddde3442b69ca9dc URL: https://github.com/kamailio/kamailio/commit/95fa98e254ae85b29fa80a8cddde344… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-22T12:52:12Z nathelper: update flag documenation --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/95fa98e254ae85b29fa80a8cddde344… Patch: https://github.com/kamailio/kamailio/commit/95fa98e254ae85b29fa80a8cddde344… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 27b2ef3dbd..c188694d53 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -173,13 +173,13 @@ modparam("nathelper", "natping_interval", 10) <title><varname>ping_nated_only</varname> (integer)</title> <para> If this parameter is set to 1 then only contacts that have - <quote>behind_NAT</quote> flag in user location database set will - get ping. + the behind NAT <quote>nat_bflag</quote> flag in user location + database set will get ping. </para> <para> - If it is 0 and sipping_flag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_flag parameter is set, then - SIP-request-based pinging is sent to all contacts. + If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping + is sent to all contacts. If it is 0 and sipping_bflag parameter + is set, then SIP-request-based pinging is sent to all contacts. </para> <para> <emphasis>

1 0

git:5.3:3333d76e: siptrace: siptrace: fix memory leak in fake replies tracing
by Federico Cabiddu 22 Apr '20

22 Apr '20

Module: kamailio Branch: 5.3 Commit: 3333d76e57c637b6d6dd7617ba4a51892a836d04 URL: https://github.com/kamailio/kamailio/commit/3333d76e57c637b6d6dd7617ba4a518… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-22T14:17:14+02:00 siptrace: siptrace: fix memory leak in fake replies tracing --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/3333d76e57c637b6d6dd7617ba4a518… Patch: https://github.com/kamailio/kamailio/commit/3333d76e57c637b6d6dd7617ba4a518… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index ccd0b72508..e49946e525 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1496,6 +1496,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) siptrace_data_t sto; siptrace_info_t* info; int faked = 0; + int parsed_f = 0; struct sip_msg *msg; struct sip_msg *req; struct ip_addr to_ip; @@ -1534,6 +1535,11 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if(msg == NULL || msg == FAKED_REPLY) { msg = t->uas.request; faked = 1; + /* check if from header has been already parsed. + * If not we have to parse it in pkg memory and free it at the end. + */ + if (msg->from && msg->from->parsed == NULL) + parsed_f = 1; } if(sip_trace_prepare(msg) < 0) @@ -1617,10 +1623,16 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if (info->uriState == STRACE_RAW_URI) { LM_BUG("uriState must be either UNUSED or PARSED here! must be a bug! Message won't be traced!\n"); - return; + goto end; } sip_trace_store(&sto, info->uriState == STRACE_PARSED_URI ? &info->u.dest_info : NULL, NULL); + +end: + if (faked && parsed_f) { + free_from(msg->from->parsed); + msg->from->parsed = NULL; + } } static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps)

1 0

[kamailio/kamailio] siptrace: siptrace: fix memory leak in fake replies tracing (#2295)
by Federico Cabiddu 22 Apr '20

22 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:  - [X] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When tracing a faked reply (like 200 for CANCEL), the sip msg used to retrieve the tracing parameters is the transaction's uas one (uas.request) which might have the from header parsed or not, depending on the routing script actions (by default, if I'm not wrong, it is not parsed). If the header is not parsed, calling get_from in trace_onreply_out function will lead to a memory leak, beacause the header is parsed in pkg memory not freed when the transaction is deleted. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2295 -- Commit Summary -- * siptrace: siptrace: fix memory leak in fake replies tracing -- File Changes -- M src/modules/siptrace/siptrace.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2295.patch https://github.com/kamailio/kamailio/pull/2295.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/2295

2 12

git:master:673f25e0: Merge pull request #2295 from kamailio/grumvalski/siptrace_memleak_fix
by GitHub 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 673f25e0961cc49ad1804bb524b8e371adc39ff2 URL: https://github.com/kamailio/kamailio/commit/673f25e0961cc49ad1804bb524b8e37… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-22T14:05:26+02:00 Merge pull request #2295 from kamailio/grumvalski/siptrace_memleak_fix siptrace: siptrace: fix memory leak in fake replies tracing --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/673f25e0961cc49ad1804bb524b8e37… Patch: https://github.com/kamailio/kamailio/commit/673f25e0961cc49ad1804bb524b8e37… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 3bd1f5a98c..5b4c064bec 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1383,7 +1383,7 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) } if(sip_trace_msg_attrs(msg, &sto) < 0) { - return; + return; } if(ps->send_buf.len > 0) { @@ -1569,6 +1569,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) siptrace_data_t sto; siptrace_info_t* info; int faked = 0; + int parsed_f = 0; struct sip_msg *msg; struct sip_msg *req; struct ip_addr to_ip; @@ -1607,10 +1608,15 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if(msg == NULL || msg == FAKED_REPLY) { msg = t->uas.request; faked = 1; + /* check if from header has been already parsed. + * If not we have to parse it in pkg memory and free it at the end. + */ + if (msg->from && msg->from->parsed == NULL) + parsed_f = 1; } if(sip_trace_msg_attrs(msg, &sto) < 0) { - return; + goto end; } if(faked == 0) { @@ -1656,7 +1662,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) sto.status.s = int2strbuf(ps->code, statusbuf, INT2STR_MAX_LEN, &sto.status.len); if(sto.status.s == 0) { LM_ERR("failure to get the status string\n"); - return; + goto end; } memset(&to_ip, 0, sizeof(struct ip_addr)); @@ -1686,10 +1692,16 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if (info->uriState == STRACE_RAW_URI) { LM_BUG("uriState must be either UNUSED or PARSED here! must be a bug! Message won't be traced!\n"); - return; + goto end; } sip_trace_store(&sto, info->uriState == STRACE_PARSED_URI ? &info->u.dest_info : NULL, NULL); + +end: + if (faked && parsed_f) { + free_from(msg->from->parsed); + msg->from->parsed = NULL; + } } static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps)

1 0

git:master:ee7496f1: siptrace: siptrace: fix memory leak in fake replies tracing
by Federico Cabiddu 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: ee7496f18b626a6c5dff10753db5b546759f6f7b URL: https://github.com/kamailio/kamailio/commit/ee7496f18b626a6c5dff10753db5b54… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-22T10:54:29+02:00 siptrace: siptrace: fix memory leak in fake replies tracing --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ee7496f18b626a6c5dff10753db5b54… Patch: https://github.com/kamailio/kamailio/commit/ee7496f18b626a6c5dff10753db5b54… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 3bd1f5a98c..26e9323ec7 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1569,6 +1569,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) siptrace_data_t sto; siptrace_info_t* info; int faked = 0; + int parsed_f = 0; struct sip_msg *msg; struct sip_msg *req; struct ip_addr to_ip; @@ -1607,6 +1608,11 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if(msg == NULL || msg == FAKED_REPLY) { msg = t->uas.request; faked = 1; + /* check if from header has been already parsed. + * If not we have to parse it in pkg memory and free it at the end. + */ + if (msg->from && msg->from->parsed == NULL) + parsed_f = 1; } if(sip_trace_msg_attrs(msg, &sto) < 0) { @@ -1686,10 +1692,16 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if (info->uriState == STRACE_RAW_URI) { LM_BUG("uriState must be either UNUSED or PARSED here! must be a bug! Message won't be traced!\n"); - return; + goto end; } sip_trace_store(&sto, info->uriState == STRACE_PARSED_URI ? &info->u.dest_info : NULL, NULL); + +end: + if (faked && parsed_f) { + free_from(msg->from->parsed); + msg->from->parsed = NULL; + } } static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps)

1 0

git:master:0f461ee2: siptrace: free parsed from in case of errors
by Federico Cabiddu 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 0f461ee26fa72d1d2f4f6777f3e0d233619dc3fb URL: https://github.com/kamailio/kamailio/commit/0f461ee26fa72d1d2f4f6777f3e0d23… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-22T12:17:18+02:00 siptrace: free parsed from in case of errors --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/0f461ee26fa72d1d2f4f6777f3e0d23… Patch: https://github.com/kamailio/kamailio/commit/0f461ee26fa72d1d2f4f6777f3e0d23… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 26e9323ec7..5b4c064bec 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1383,7 +1383,7 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) } if(sip_trace_msg_attrs(msg, &sto) < 0) { - return; + return; } if(ps->send_buf.len > 0) { @@ -1616,7 +1616,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) } if(sip_trace_msg_attrs(msg, &sto) < 0) { - return; + goto end; } if(faked == 0) { @@ -1662,7 +1662,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) sto.status.s = int2strbuf(ps->code, statusbuf, INT2STR_MAX_LEN, &sto.status.len); if(sto.status.s == 0) { LM_ERR("failure to get the status string\n"); - return; + goto end; } memset(&to_ip, 0, sizeof(struct ip_addr)); @@ -1700,7 +1700,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) end: if (faked && parsed_f) { free_from(msg->from->parsed); - msg->from->parsed = NULL; + msg->from->parsed = NULL; } }

1 0

[kamailio/kamailio] async_http_client crash (#2286)
by Alex Balashov 22 Apr '20

22 Apr '20

Version: 5.3.3 `065668` Platform: CentOS 7 (3.10.0-862.14.4.el7.x86_64) I seem to have a persistent intermittent crash on all five gateways which use `http_async_client` to query an HTTP API. In all cases, the crash is on attempt to access or reference an AVP called `$avp(is_subscribe)`: ``` Program terminated with signal 11, Segmentation fault. #0 0x00000000005d479b in match_by_name (avp=0xabcdefed, id=45, name=0x7fff9379c668) at core/usr_avp.c:378 378 if (id==avp->id && avp->flags&AVP_NAME_STR && hMissing separate debuginfos, use: debuginfo-install libuuid-2.23.2-52.el7_5.1.x86_64 nss-pem-1.0.3-4.el7.x86_64 (gdb) where #0 0x00000000005d479b in match_by_name (avp=0xabcdefed, id=45, name=0x7fff9379c668) at core/usr_avp.c:378 #1 0x00000000005d54bf in search_next_avp (s=0x7fff9379c660, val=0x7fff9379c630) at core/usr_avp.c:499 #2 0x00000000005d4f04 in search_avp (ident=..., val=0x7fff9379c630, state=0x7fff9379c660) at core/usr_avp.c:465 #3 0x00000000005d4913 in search_first_avp (flags=1, name=..., val=0x7fff9379c630, s=0x7fff9379c660) at core/usr_avp.c:414 #4 0x00007f3f6ba529fd in ops_is_avp_set (msg=0xb04f60 <_faked_msg>, ap=0x7f3f73296ed8) at avpops_impl.c:1821 #5 0x00007f3f6ba60d47 in w_is_avp_set (msg=0xb04f60 <_faked_msg>, param=0x7f3f73296ed8 "", op=0x0) at avpops.c:1059 #6 0x0000000000480f3d in do_action (h=0x7fff9379ce70, a=0x7f3f732a8b30, msg=0xb04f60 <_faked_msg>) at core/action.c:1077 #7 0x000000000048da7c in run_actions (h=0x7fff9379ce70, a=0x7f3f732a8b30, msg=0xb04f60 <_faked_msg>) at core/action.c:1576 #8 0x000000000048e13d in run_actions_safe (h=0x7fff9379dae0, a=0x7f3f732a8b30, msg=0xb04f60 <_faked_msg>) at core/action.c:1640 #9 0x0000000000438ff3 in rval_get_int (h=0x7fff9379dae0, msg=0xb04f60 <_faked_msg>, i=0x7fff9379d318, rv=0x7f3f732a8d70, cache=0x0) at core/rvalue.c:915 #10 0x000000000043d5a3 in rval_expr_eval_int (h=0x7fff9379dae0, msg=0xb04f60 <_faked_msg>, res=0x7fff9379d318, rve=0x7f3f732a8d68) at core/rvalue.c:1913 #11 0x000000000043d9f6 in rval_expr_eval_int (h=0x7fff9379dae0, msg=0xb04f60 <_faked_msg>, res=0x7fff9379d7cc, rve=0x7f3f732a9598) at core/rvalue.c:1921 #12 0x000000000048097b in do_action (h=0x7fff9379dae0, a=0x7f3f732aa9c0, msg=0xb04f60 <_faked_msg>) at core/action.c:1047 #13 0x000000000048da7c in run_actions (h=0x7fff9379dae0, a=0x7f3f732aa9c0, msg=0xb04f60 <_faked_msg>) at core/action.c:1576 #14 0x000000000048e205 in run_top_route (a=0x7f3f732aa9c0, msg=0xb04f60 <_faked_msg>, c=0x0) at core/action.c:1661 #15 0x00007f3f705f7d0e in async_http_cb (reply=0x7f3f2b7ee620, param=0x7f3f2b7eca18) at async_http.c:256 #16 0x00007f3f705f0dab in check_multi_info (g=0x7f3f2abeb9e8) at http_multi.c:597 #17 0x00007f3f705e84ec in event_cb (fd=6, kind=2, userp=0x1d7cdf0) at http_multi.c:145 #18 0x00007f3f70131a14 in event_process_active_single_queue (activeq=0x1c6f820, base=0x1d3ad90) at event.c:1350 #19 event_process_active (base=<optimized out>) at event.c:1420 #20 event_base_loop (base=0x1d3ad90, flags=0) at event.c:1621 #21 0x00007f3f705f490f in async_http_run_worker (worker=0x7f3f2abd1bb0) at async_http.c:92 #22 0x00007f3f705dcb17 in child_init (rank=0) at http_async_client_mod.c:366 #23 0x000000000057a810 in init_mod_child (m=0x7f3f73245168, rank=0) at core/sr_module.c:780 #24 0x000000000057a4ac in init_mod_child (m=0x7f3f73245d58, rank=0) at core/sr_module.c:776 #25 0x000000000057a4ac in init_mod_child (m=0x7f3f73246340, rank=0) at core/sr_module.c:776 #26 0x000000000057a4ac in init_mod_child (m=0x7f3f732467f8, rank=0) at core/sr_module.c:776 #27 0x000000000057a4ac in init_mod_child (m=0x7f3f73246e38, rank=0) at core/sr_module.c:776 #28 0x000000000057a4ac in init_mod_child (m=0x7f3f73247210, rank=0) at core/sr_module.c:776 #29 0x000000000057a4ac in init_mod_child (m=0x7f3f73247978, rank=0) at core/sr_module.c:776 #30 0x000000000057a4ac in init_mod_child (m=0x7f3f73247da0, rank=0) at core/sr_module.c:776 #31 0x000000000057af5a in init_child (rank=0) at core/sr_module.c:825 #32 0x0000000000426bc1 in main_loop () at main.c:1753 #33 0x000000000042e63a in main (argc=13, argv=0x7fff9379edb8) at main.c:2802 ``` Most recently, it is here: ``` route { $avp(is_subscribe) = 0; ... $http_req(method) = 'GET'; $http_req(suspend) = 1; $http_req(hdr) = "x-api-key: " + $sel(cfg_get.api.whitelist_key); t_newtran(); http_async_query("https://some_host/check_ip_in_whi telist?ip=$(si{s.escape.common})", "WHITELIST_CHECK"); } ... route[WHITELIST_CHECK] { if(!is_avp_set("$avp(is_subscribe)")) { xlog("L_INFO", "[R-HTTP-REPLY:$ci] !> AVP is_subscribe is undefined -- cannot process further\n"); sl_send_reply("500", "Internal Server Error"); exit; } ``` However, adding `is_avp_set()` was my attempt to put a safe-guard around unsafe access of this AVP. It didn't work: ``` (gdb) print *name $1 = {s = 0x7f3f73261835 "is_subscribe)", len = 12} (gdb) print avp $2 = (avp_t *) 0xabcdefed (gdb) print avp->id Cannot access memory at address 0xabcdefed ``` Note that I am making the assumption above that AVPs created in the main request route will be available in the `http_async_client` callback, because it is just a suspended TM transaction underneath -- right? So, transaction-persistent variables such as AVP should be visible throughout the lifetime of the transaction just as for a conventional async TM transaction, I would think. Digging further into the mesage being handled in `async_http_cb()`, it is always a normal HTTP `200 OK` reply: ``` (gdb) set print elements 0 (gdb) frame 15 #15 0x00007f3f705f7d0e in async_http_cb (reply=0x7f3f2b7ee620, param=0x7f3f2b7eca18) at async_http.c:256 256 if (run_top_route(act, fmsg, 0)<0) { (gdb) print *reply $5 = {retcode = 200, result = 0x7f3f2b7ec560, error = '\000' <repeats 255 times>} (gdb) print *(reply->result) $6 = { s = 0x7f3f2b7ee798 "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\nContent-Length: 16\r\nConnection: keep-alive\r\nDate: Wed, 15 Apr 2020 15:06:52 GMT\r\nx-amzn-RequestId: d3a44941-e0c4-4cb9-9144-ea54d929c300\r\nx-amz-apigw-id: LCJqBF7CIAMFXCw=\r\nX-Amzn-Trace-Id: Root=1-5e97230c-4fe1af7d072275d95c231a4c;Sampled=0\r\nX-Cache: Miss from cloudfront\r\nHia: 1.1 ade18dc841d2e1cc8ef49611c5d4c93e.cloudfront.net (CloudFront)\r\nX-Amz-Cf-Pop: IAD89-C2\r\nX-Amz-Cf-Id: 3s1S2kvOgL7L4ZKMlWwQnfIxHmWFGz0PHbcNFefYA1tZ1j0AGy3JHg==\r\n\r\n{\"status\":false}\300\300\300\300", len = 504} ``` Any insights would be appreciated! These crashes are happening basically hourly from nowhere, after over a year of undisturbed operation. -- 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/2286

5 15

git:master:a59dbb7a: presence: safety checks in timer callbacks to cope with storage modes
by Daniel-Constantin Mierla 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: a59dbb7a81ea7909cd542acbba85d231ccd519a4 URL: https://github.com/kamailio/kamailio/commit/a59dbb7a81ea7909cd542acbba85d23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-22T08:42:48+02:00 presence: safety checks in timer callbacks to cope with storage modes --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/presence.c Modified: src/modules/presence/publish.c Modified: src/modules/presence/publish.h Modified: src/modules/presence/subscribe.c Modified: src/modules/presence/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/a59dbb7a81ea7909cd542acbba85d23… Patch: https://github.com/kamailio/kamailio/commit/a59dbb7a81ea7909cd542acbba85d23…

1 0

git:master:eb5c1a41: presence: use separate structure to match presentity to replace or update
by Daniel-Constantin Mierla 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: eb5c1a41ced14f502648c6bda9ae0ef585b0cb37 URL: https://github.com/kamailio/kamailio/commit/eb5c1a41ced14f502648c6bda9ae0ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-22T08:11:36+02:00 presence: use separate structure to match presentity to replace or update --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/eb5c1a41ced14f502648c6bda9ae0ef… Patch: https://github.com/kamailio/kamailio/commit/eb5c1a41ced14f502648c6bda9ae0ef…

1 0

git:master:8077f387: presence: init pres and subs hash tables for non db-only mode and memory index
by Daniel-Constantin Mierla 22 Apr '20

22 Apr '20

Module: kamailio Branch: master Commit: 8077f387f9253a486a980c65a776507a7ad6ee7f URL: https://github.com/kamailio/kamailio/commit/8077f387f9253a486a980c65a776507… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T22:42:12+02:00 presence: init pres and subs hash tables for non db-only mode and memory index --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/8077f387f9253a486a980c65a776507… Patch: https://github.com/kamailio/kamailio/commit/8077f387f9253a486a980c65a776507… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index cbbc23feb3..7120dd7951 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -350,10 +350,11 @@ static int mod_init(void) } if(publ_cache_mode==PS_PCACHE_HYBRID || publ_cache_mode==PS_PCACHE_RECORD) { - if(phtable_size < 1) + if(phtable_size < 1) { phtable_size = 256; - else + } else { phtable_size = 1 << phtable_size; + } } if(publ_cache_mode==PS_PCACHE_RECORD) { @@ -362,6 +363,28 @@ static int mod_init(void) } } + if(pres_subs_dbmode != DB_ONLY) { + if(shtable_size < 1) { + shtable_size = 512; + } else { + shtable_size = 1 << shtable_size; + } + + subs_htable = new_shtable(shtable_size); + if(subs_htable == NULL) { + LM_ERR(" initializing subscribe hash table\n"); + goto dberror; + } + } + + if(publ_cache_mode==PS_PCACHE_HYBRID) { + pres_htable = new_phtable(); + if(pres_htable == NULL) { + LM_ERR("initializing presentity hash table\n"); + goto dberror; + } + } + if(publ_cache_mode != PS_PCACHE_RECORD || pres_subs_dbmode != NO_DB) { if(pres_db_url.s == NULL) { LM_ERR("database url not set!\n"); @@ -405,17 +428,8 @@ static int mod_init(void) goto dberror; } + if(pres_subs_dbmode != DB_ONLY) { - if(shtable_size < 1) - shtable_size = 512; - else - shtable_size = 1 << shtable_size; - - subs_htable = new_shtable(shtable_size); - if(subs_htable == NULL) { - LM_ERR(" initializing subscribe hash table\n"); - goto dberror; - } if(restore_db_subs() < 0) { LM_ERR("restoring subscribe info from database\n"); goto dberror; @@ -423,13 +437,7 @@ static int mod_init(void) } if(publ_cache_mode==PS_PCACHE_HYBRID) { - pres_htable = new_phtable(); - if(pres_htable == NULL) { - LM_ERR("initializing presentity hash table\n"); - goto dberror; - } - - if(pres_htable_restore() < 0) { + if(pres_htable_db_restore() < 0) { LM_ERR("filling in presentity hash table from database\n"); goto dberror; }

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

@eschmidbauer I created a dedicated issue on tracker for troubleshooting related issues to in-memory presentity records, let's continue there: * https://github.com/kamailio/kamailio/issues/2294 Attach there the output for `bt full` taken from core file with gdb. Also, add the parameters you set for presence* modules. -- 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/commit/f917318c1e5fefa4106eaaf46123506…

1 0

git:master:174cc5e8: presence: delete expired in-memory presentity records
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 174cc5e8d1800312eaa6d1bc4fea8df7934c5b55 URL: https://github.com/kamailio/kamailio/commit/174cc5e8d1800312eaa6d1bc4fea8df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T19:45:01+02:00 presence: delete expired in-memory presentity records --- Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/174cc5e8d1800312eaa6d1bc4fea8df… Patch: https://github.com/kamailio/kamailio/commit/174cc5e8d1800312eaa6d1bc4fea8df… --- diff --git a/src/modules/presence/publish.c b/src/modules/presence/publish.c index 4662965f50..dfa37c07e8 100644 --- a/src/modules/presence/publish.c +++ b/src/modules/presence/publish.c @@ -265,7 +265,6 @@ void ps_ptable_timer_clean(unsigned int ticks, void *param) if(ptlist==NULL) { return; } - for(ptn = ptlist; ptn != NULL; ptn = ptn->next) { memset(&pres, 0, sizeof(presentity_t)); @@ -316,6 +315,12 @@ void ps_ptable_timer_clean(unsigned int ticks, void *param) } error: + for(ptn = ptlist; ptn != NULL; ptn = ptn->next) { + if(ps_ptable_remove(ptn) <0) { + LM_ERR("failed deleting presentity item\n"); + } + } + if(ptlist != NULL) { ps_presentity_list_free(ptlist, 1); }

1 0

git:master:7ada66b1: presence: user core macro for hash slot index
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 7ada66b12254b809faaf265d21e75e7f347f695d URL: https://github.com/kamailio/kamailio/commit/7ada66b12254b809faaf265d21e75e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T17:31:44+02:00 presence: user core macro for hash slot index --- Modified: src/modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/7ada66b12254b809faaf265d21e75e7… Patch: https://github.com/kamailio/kamailio/commit/7ada66b12254b809faaf265d21e75e7… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index dc72a366ac..f6abcdcc79 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -992,7 +992,7 @@ int ps_ptable_insert(ps_presentity_t *pt) return -1; } - idx = ptn->hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptn->hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); if(_ps_ptable->slots[idx].plist == NULL) { @@ -1028,7 +1028,7 @@ int ps_ptable_replace(ps_presentity_t *pt) ptc.ruid = pres_sruid.uid; } - idx = ptc.hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptc.hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1090,7 +1090,7 @@ int ps_ptable_update(ps_presentity_t *pt) ptc.ruid = pres_sruid.uid; } - idx = ptc.hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptc.hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1146,7 +1146,7 @@ int ps_ptable_remove(ps_presentity_t *pt) memcpy(&ptc, pt, sizeof(ps_presentity_t)); ptc.hashid = core_case_hash(&pt->user, &pt->domain, 0); - idx = ptc.hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptc.hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1189,7 +1189,7 @@ ps_presentity_t *ps_ptable_get_list(str *user, str *domain) ptc.user = *user; ptc.domain = *domain; ptc.hashid = core_case_hash(&ptc.user, &ptc.domain, 0); - idx = ptc.hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptc.hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1236,7 +1236,7 @@ ps_presentity_t *ps_ptable_get_item(str *user, str *domain, str *event, str *eta ptc.event = *event; ptc.etag = *etag; ptc.hashid = core_case_hash(&ptc.user, &ptc.domain, 0); - idx = ptc.hashid & (_ps_ptable->ssize - 1); + idx = core_hash_idx(ptc.hashid, _ps_ptable->ssize); lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist;

1 0

git:master:d4f8674d: core: hashes - small helper macro to compute hash slot index
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: d4f8674d0068a31bed7097804f37b6bff5fe21fb URL: https://github.com/kamailio/kamailio/commit/d4f8674d0068a31bed7097804f37b6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T17:30:37+02:00 core: hashes - small helper macro to compute hash slot index --- Modified: src/core/hashes.h --- Diff: https://github.com/kamailio/kamailio/commit/d4f8674d0068a31bed7097804f37b6b… Patch: https://github.com/kamailio/kamailio/commit/d4f8674d0068a31bed7097804f37b6b… --- diff --git a/src/core/hashes.h b/src/core/hashes.h index 5b8e2f2773..2afb8361c8 100644 --- a/src/core/hashes.h +++ b/src/core/hashes.h @@ -27,7 +27,7 @@ #include "str.h" - +#define core_hash_idx(hid, hsize) ((hid)&(hsize-1)) /** internal use: hash update * params: char* s - string start,

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Emmanuel Schmidbauer 21 Apr '20

21 Apr '20

update, if i set `modparam("presence", "subs_db_mode", 3)` there is no segfault -- 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/commit/f917318c1e5fefa4106eaaf46123506…

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Emmanuel Schmidbauer 21 Apr '20

21 Apr '20

here is a trace from the coredump: ``` Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f12607da547 in atomic_cmpxchg_int (var=0x8, old=0, new_v=1) at ../../core/mem/../atomic/atomic_x86.h:224 224 ATOMIC_FUNC_CMPXCHG(cmpxchg, "cmpxchgl %2, %1", int , int) (gdb) up #1 0x00007f12607da57b in futex_get (lock=0x8) at ../../core/mem/../futexlock.h:99 99 v=atomic_cmpxchg(lock, 0, 1); /* lock if 0 */ (gdb) #2 0x00007f12607fe0d0 in update_db_subs_timer_dbnone (no_lock=0) at subscribe.c:2079 2079 lock_get(&subs_htable[i].lock); (gdb) up #3 0x00007f1260802121 in timer_db_update (ticks=61825161, param=0x0) at subscribe.c:2441 2441 update_db_subs_timer_dbnone(no_lock); (gdb) up #4 0x00005568ade05b2e in sr_wtimer_exec (ticks=61825161, param=0x0) at core/timer_proc.c:433 433 wt->f(ticks, wt->param); (gdb) up #5 0x00005568ade04b58 in fork_sync_timer (child_id=-1, desc=0x5568ae01a3a1 "secondary timer", make_sock=1, f=0x5568ade057a8 <sr_wtimer_exec>, param=0x0, interval=1000) at core/timer_proc.c:267 267 f(TICKS_TO_S(ts1), param); /* ticks in sec for compatibility with old (gdb) up #6 0x00005568ade05ece in sr_wtimer_start () at core/timer_proc.c:459 459 if(fork_sync_timer(-1 /*PROC_TIMER*/, "secondary timer", 1, (gdb) up #7 0x00005568adc05e24 in main_loop () at main.c:1452 1452 if(sr_wtimer_start()<0) { (gdb) up #8 0x00005568adc123e7 in main (argc=9, argv=0x7ffd9501a8a8) at main.c:2845 2845 ret=main_loop(); (gdb) up ``` -- 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/commit/f917318c1e5fefa4106eaaf46123506…

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Emmanuel Schmidbauer 21 Apr '20

21 Apr '20

getting coredump and seeing this in log: ``` 3(5514) DEBUG: presence [subscribe.c:711]: msg_watchers_clean(): cleaning pending subscriptions 0(5505) ALERT: <core> [main.c:775]: handle_sigs(): child process 5514 exited by a signal 11 0(5505) ALERT: <core> [main.c:778]: handle_sigs(): core was generated 0(5505) INFO: <core> [main.c:798]: handle_sigs(): dont_fork turned on, living on ``` -- 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/commit/f917318c1e5fefa4106eaaf46123506…

1 0

git:master:4e49c0e2: presence: rpc presence.presentity_list is returning an array
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 4e49c0e21747b9c4344acb16e0013c178ec45dff URL: https://github.com/kamailio/kamailio/commit/4e49c0e21747b9c4344acb16e0013c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T15:25:25+02:00 presence: rpc presence.presentity_list is returning an array --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/4e49c0e21747b9c4344acb16e0013c1… Patch: https://github.com/kamailio/kamailio/commit/4e49c0e21747b9c4344acb16e0013c1… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 84997b4230..cbbc23feb3 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1932,7 +1932,7 @@ rpc_export_t presence_rpc[] = { {"presence.updateWatchers", rpc_presence_update_watchers, rpc_presence_update_watchers_doc, 0}, {"presence.presentity_list", rpc_presence_presentity_list, - rpc_presence_presentity_list_doc, 0}, + rpc_presence_presentity_list_doc, RET_ARRAY}, {0, 0, 0, 0} };

1 0

git:master:814af22c: presence: use unsigned int for presentity hash id
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 814af22ca48b2e1a57052b6e92cbf786cf2d99f8 URL: https://github.com/kamailio/kamailio/commit/814af22ca48b2e1a57052b6e92cbf78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T15:09:01+02:00 presence: use unsigned int for presentity hash id --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/814af22ca48b2e1a57052b6e92cbf78… Patch: https://github.com/kamailio/kamailio/commit/814af22ca48b2e1a57052b6e92cbf78…

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Emmanuel Schmidbauer 21 Apr '20

21 Apr '20

> @eschmidbauer - can you help testing somehow? Not having the possibility to test properly here, working mainly from home these days I can't use many devices. First would be to make sure existing your existing config is still working fine. I tried to be very non-intrusive as much as possible in the old code and operation mode. > > Then, to test in-memory only presentity records, set: > > ``` > modparam("presence", "publ_cache", 2) > ``` > > You have to use latest master branch. I did basic tests with baresip for handling the PUBLISH requests and I could see they are in database presentity table if publ_cache!=2 as well as in memory via rpc command if publ_cache==2. > > You can set also subscription records in memory with: > > ``` > modparam("presence", "subs_db_mode", 0) > ``` yes- i'll see what i can do and report back to you. im assuming i'll have to compile master branch for these features. -- 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/commit/f917318c1e5fefa4106eaaf46123506…

1 0

git:master:b3e01c14: pv: fixes for KEMI pvx.xavp_getd
by Victor Seva 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: b3e01c149433c26e8792f1caf77b189d85378055 URL: https://github.com/kamailio/kamailio/commit/b3e01c149433c26e8792f1caf77b189… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-21T13:27:38+02:00 pv: fixes for KEMI pvx.xavp_getd --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/b3e01c149433c26e8792f1caf77b189… Patch: https://github.com/kamailio/kamailio/commit/b3e01c149433c26e8792f1caf77b189… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 2574148c04..511a0e3b29 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1402,7 +1402,7 @@ sr_kemi_dict_item_t* ki_xavp_dict(sr_xavp_t *xavp); /** * SR_KEMIP_ARRAY with values of xavp=>name */ -sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str name) +sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str *name) { sr_kemi_dict_item_t *ini = NULL; sr_kemi_dict_item_t *val; @@ -1416,7 +1416,7 @@ sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str name) } memset(ini, 0, sizeof(sr_kemi_xval_t)); ini->vtype = SR_KEMIP_ARRAY; - while(avp!=NULL&&!STR_EQ(avp->name,name)) + while(avp!=NULL&&!STR_EQ(avp->name,*name)) { avp = avp->next; } @@ -1467,8 +1467,8 @@ sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str name) last->next = val; } else { ini->v.dict = val; - last = val; } + last = val; avp = xavp_get_next(avp); } return ini; @@ -1509,13 +1509,13 @@ sr_kemi_dict_item_t* ki_xavp_dict(sr_xavp_t *xavp) val->vtype = SR_KEMIP_DICT; val->name.s = keys->s.s; val->name.len = keys->s.len; - val->v.dict = ki_xavp_dict_name(avp, keys->s); + val->v.dict = ki_xavp_dict_name(avp, &keys->s); if(last) { last->next = val; } else { ini = val; - last = ini; } + last = val; k = keys; keys = keys->next; pkg_free(k);

1 0

git:master:55c6f775: presence: compute presentity table slot index using correct structure
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 55c6f7751c81c8d738409e8c9470224ab9924cb7 URL: https://github.com/kamailio/kamailio/commit/55c6f7751c81c8d738409e8c9470224… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T12:55:17+02:00 presence: compute presentity table slot index using correct structure --- Modified: src/modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/55c6f7751c81c8d738409e8c9470224… Patch: https://github.com/kamailio/kamailio/commit/55c6f7751c81c8d738409e8c9470224… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index 6d868e165d..6767f8e007 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -1024,7 +1024,7 @@ int ps_ptable_replace(ps_presentity_t *pt) ptc.ruid = pres_sruid.uid; } - idx = ptn->hashid % _ps_ptable->ssize; + idx = ptc.hashid % _ps_ptable->ssize; lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1082,7 +1082,7 @@ int ps_ptable_update(ps_presentity_t *pt) ptc.ruid = pres_sruid.uid; } - idx = ptn->hashid % _ps_ptable->ssize; + idx = ptc.hashid % _ps_ptable->ssize; lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1138,7 +1138,7 @@ int ps_ptable_remove(ps_presentity_t *pt) memcpy(&ptc, pt, sizeof(ps_presentity_t)); ptc.hashid = core_case_hash(&pt->user, &pt->domain, 0); - idx = ptn->hashid % _ps_ptable->ssize; + idx = ptc.hashid % _ps_ptable->ssize; lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist;

1 0

[kamailio/kamailio] ims_registrar_scscf: fix aor generating in lookup() (#2287)
by alexyosifov 21 Apr '20

21 Apr '20

- If uri contains some parameters before '@' as phone context, till now the function strips everything after that. With the fix all parameters before and after '@' are stripped and the domain remaining.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2287 -- Commit Summary -- * ims_registrar_scscf: fix aor generating in lookup() -- File Changes -- M src/modules/ims_registrar_scscf/lookup.c (62) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2287.patch https://github.com/kamailio/kamailio/pull/2287.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/2287

2 6

[kamailio/kamailio] ims_registrar_scscf: fix multiple contacts in NOTIFY (#2246)
by alexyosifov 21 Apr '20

21 Apr '20

- Prevent multiple contacts for NOTIFY message in Message body <registration> tag after RE-REGISTRATION procedure.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2246 -- Commit Summary -- * ims_registrar_scscf: fix multiple contacts in NOTIFY -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (86) M src/modules/ims_registrar_scscf/registrar_notify.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2246.patch https://github.com/kamailio/kamailio/pull/2246.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/2246

5 16

git:master:058edd77: Merge pull request #2246 from alexyosifov/ims_registrar_scscf_notify_fix
by GitHub 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 058edd7730436c0e7aa3cea7f0b9ec5bd47cff5b URL: https://github.com/kamailio/kamailio/commit/058edd7730436c0e7aa3cea7f0b9ec5… Author: ng-voice GmbH <carsten(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-21T11:52:27+02:00 Merge pull request #2246 from alexyosifov/ims_registrar_scscf_notify_fix ims_registrar_scscf: fix multiple contacts in NOTIFY --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/058edd7730436c0e7aa3cea7f0b9ec5… Patch: https://github.com/kamailio/kamailio/commit/058edd7730436c0e7aa3cea7f0b9ec5…

1 0

git:master:fa8b7941: ims_registrar_scscf: fix multiple contacts in NOTIFY
by Aleksandar Yosifov 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: fa8b7941c4d14625beadd4943d89e898543c7377 URL: https://github.com/kamailio/kamailio/commit/fa8b7941c4d14625beadd4943d89e89… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-04-21T12:24:48+03:00 ims_registrar_scscf: fix multiple contacts in NOTIFY - Prevent multiple contacts for NOTIFY message in Message body <registration> tag after RE-REGISTRATION procedure. --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/fa8b7941c4d14625beadd4943d89e89… Patch: https://github.com/kamailio/kamailio/commit/fa8b7941c4d14625beadd4943d89e89…

1 0

git:master:7e9fe7f0: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 7e9fe7f03ef6914364e8147325515f6a4d3870f1 URL: https://github.com/kamailio/kamailio/commit/7e9fe7f03ef6914364e8147325515f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-21T10:16:25+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/7e9fe7f03ef6914364e8147325515f6… Patch: https://github.com/kamailio/kamailio/commit/7e9fe7f03ef6914364e8147325515f6… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index c4ba8ca1b1..9a73e47262 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -85,6 +85,7 @@ Juha Heinanen 5.1. presence.cleanup 5.2. presence.refreshWatchers 5.3. presence.updateWatchers + 5.4. presence.presentity_list 6. Exported Variables @@ -232,6 +233,7 @@ Chapter 1. Admin Guide 5.1. presence.cleanup 5.2. presence.refreshWatchers 5.3. presence.updateWatchers + 5.4. presence.presentity_list 6. Exported Variables @@ -1045,6 +1047,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); 5.1. presence.cleanup 5.2. presence.refreshWatchers 5.3. presence.updateWatchers + 5.4. presence.presentity_list 5.1. presence.cleanup @@ -1106,6 +1109,23 @@ kamcmd presence.refreshWatchers sip:test@kamailio.org presence 1 kamcmd presence.updateWatchers sip:alice@domain.com presence ... +5.4. presence.presentity_list + + List the presentity records stored in memory. + + Name: presence.presentity_list + + Parameters: + * mode - (optional) it can be 'full' to print all the fields of + presentity record. If missine, only a selected set of fields are + printed in the response. + + RPC Command Format: +... +kamctl rpc presence.presentity_list +kamctl rpc presence.presentity_list full +... + 6. Exported Variables 6.1. $subs(attr)

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

@eschmidbauer - can you help testing somehow? Not having the possibility to test properly here, working mainly from home these days I can't use many devices. First would be to make sure existing your existing config is still working fine. I tried to be very non-intrusive as much as possible in the old code and operation mode. Then, to test in-memory only presentity records, set: ``` modparam("presence", "publ_cache", 2) ``` You have to use latest master branch. I did basic tests with baresip for handling the PUBLISH requests and I could see they are in database presentity table if publ_cache!=2 as well as in memory via rpc command if publ_cache==2. You can set also subscription records in memory with: ``` modparam("presence", "subs_db_mode", 0) ``` -- 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/commit/f917318c1e5fefa4106eaaf46123506…

1 0

git:master:58bb516e: presence: docs for rpc command presence.presentity_list
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 58bb516e4fe1b098bc574d75bef32af9d2ae61b8 URL: https://github.com/kamailio/kamailio/commit/58bb516e4fe1b098bc574d75bef32af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T10:04:49+02:00 presence: docs for rpc command presence.presentity_list --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/58bb516e4fe1b098bc574d75bef32af… Patch: https://github.com/kamailio/kamailio/commit/58bb516e4fe1b098bc574d75bef32af… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 850e929f67..32b67d6c6b 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1346,6 +1346,33 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... </programlisting> </section> + <section id="presence.rpc.presentity_list"> + <title>presence.presentity_list</title> + <para> + List the presentity records stored in memory. + </para> + <para> + Name: <emphasis>presence.presentity_list</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>mode - (optional) it can be 'full' to print all the + fields of presentity record. If missine, only a selected + set of fields are printed in the response.</para> + </listitem> + </itemizedlist> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +kamctl rpc presence.presentity_list +kamctl rpc presence.presentity_list full +... + </programlisting> + </section> + </section> <section>

1 0

git:master:c62e411b: presence: implemented rpc command to list presententy records in memory
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: c62e411b116db7f9b9227b9decd37866e62f4378 URL: https://github.com/kamailio/kamailio/commit/c62e411b116db7f9b9227b9decd3786… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T09:57:30+02:00 presence: implemented rpc command to list presententy records in memory - presence.presentity_list [mode] - mode is optional and can be 'full' to print all attributes of the presentity record --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/c62e411b116db7f9b9227b9decd3786… Patch: https://github.com/kamailio/kamailio/commit/c62e411b116db7f9b9227b9decd3786… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index 7a58fe5309..6d868e165d 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -705,6 +705,11 @@ int update_phtable(presentity_t *presentity, str *pres_uri, str *body) static ps_ptable_t *_ps_ptable = NULL; +ps_ptable_t *ps_ptable_get(void) +{ + return _ps_ptable; +} + #define PS_PRESENTITY_FIELD_COPY(field) do { \ if (pt->field.s) { \ ptn->field.s = p; \ @@ -945,6 +950,7 @@ void ps_ptable_destroy(void) } for(i=0; i<_ps_ptable->ssize; i++) { lock_destroy(&_ps_ptable->slots[i].lock); + pt = _ps_ptable->slots[i].plist; while(pt!=NULL) { ptn = pt->next; ps_presentity_free(pt, 0); diff --git a/src/modules/presence/hash.h b/src/modules/presence/hash.h index 96621efe5b..45732426f5 100644 --- a/src/modules/presence/hash.h +++ b/src/modules/presence/hash.h @@ -180,5 +180,6 @@ int ps_ptable_remove(ps_presentity_t *pt); ps_presentity_t *ps_ptable_get_list(str *user, str *domain); ps_presentity_t *ps_ptable_get_item(str *user, str *domain, str *event, str *etag); ps_presentity_t *ps_ptable_get_expired(int eval); +ps_ptable_t *ps_ptable_get(void); #endif diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index c0e1912ecd..84997b4230 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1847,6 +1847,83 @@ static const char *rpc_presence_cleanup_doc[3] = { 0 }; +/*! \brief + * rpc cmd: presence.presentity_list + * \mode - output attributes control + * * */ +void rpc_presence_presentity_list(rpc_t *rpc, void *ctx) +{ + str omode = {0, 0}; + int imode = 0; + int i = 0; + ps_ptable_t *ptb = NULL; + ps_presentity_t *ptn = NULL; + void* th = NULL; + str pempty = str_init(""); + + LM_DBG("listing in memory presentity records\n"); + + imode = rpc->scan(ctx, "*S", &omode); + if(imode < 1) { + imode = 0; + } else { + if(omode.len == 4 && strncmp(omode.s, "full", 4)==0) { + imode = 1; + } else { + imode = 0; + } + } + ptb = ps_ptable_get(); + if(ptb == NULL) { + return; + } + + for(i=0; i<ptb->ssize; i++) { + lock_get(&ptb->slots[i].lock); + ptn = ptb->slots[i].plist; + while(ptn!=NULL) { + /* add record node */ + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating rpc"); + lock_release(&ptb->slots[i].lock); + return; + } + /* add common fields */ + if(rpc->struct_add(th, "SSSSSd", + "user", &ptn->user, + "domain", &ptn->domain, + "event", &ptn->event, + "etag", &ptn->etag, + "sender", (ptn->sender.s)?&ptn->sender:&pempty, + "expires", ptn->expires)<0) { + rpc->fault(ctx, 500, "Internal error adding item"); + lock_release(&ptb->slots[i].lock); + return; + } + if(imode==1) { + /* add extra fields */ + if(rpc->struct_add(th, "ddSSd", + "received_time", ptn->received_time, + "priority", ptn->priority, + "ruid", (ptn->ruid.s)?&ptn->ruid:&pempty, + "body", (ptn->body.s)?&ptn->body:&pempty, + "hashid", ptn->hashid)<0) { + rpc->fault(ctx, 500, "Internal error adding item"); + lock_release(&ptb->slots[i].lock); + return; + } + } + ptn = ptn->next; + } + lock_release(&ptb->slots[i].lock); + } + return; +} + +static const char *rpc_presence_presentity_list_doc[2] = { + "Trigger update of watchers", + 0 +}; rpc_export_t presence_rpc[] = { {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, @@ -1854,6 +1931,8 @@ rpc_export_t presence_rpc[] = { rpc_presence_refresh_watchers_doc, 0}, {"presence.updateWatchers", rpc_presence_update_watchers, rpc_presence_update_watchers_doc, 0}, + {"presence.presentity_list", rpc_presence_presentity_list, + rpc_presence_presentity_list_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:318c6a06: presence: increased the array size for rpc cleanup doc
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 318c6a068916b478f16702c6f05b16eb8b64ac20 URL: https://github.com/kamailio/kamailio/commit/318c6a068916b478f16702c6f05b16e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T09:15:48+02:00 presence: increased the array size for rpc cleanup doc - reformatted the static structure for coherence --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/318c6a068916b478f16702c6f05b16e… Patch: https://github.com/kamailio/kamailio/commit/318c6a068916b478f16702c6f05b16e… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index dd9b43f3ea..c0e1912ecd 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1780,7 +1780,9 @@ void rpc_presence_refresh_watchers(rpc_t *rpc, void *ctx) } static const char *rpc_presence_refresh_watchers_doc[2] = { - "Trigger refresh of watchers", 0}; + "Trigger refresh of watchers", + 0 +}; /*! \brief * rpc cmd: presence.updateWatchers @@ -1822,7 +1824,9 @@ void rpc_presence_update_watchers(rpc_t *rpc, void *ctx) } static const char *rpc_presence_update_watchers_doc[2] = { - "Trigger update of watchers", 0}; + "Trigger update of watchers", + 0 +}; void rpc_presence_cleanup(rpc_t *rpc, void *c) @@ -1837,18 +1841,21 @@ void rpc_presence_cleanup(rpc_t *rpc, void *c) return; } -static const char *rpc_presence_cleanup_doc[2] = { - "Manually triggers the cleanup functions for the active_watchers, " - "presentity, and watchers tables.", - 0}; +static const char *rpc_presence_cleanup_doc[3] = { + "Manually triggers the cleanup functions for the active_watchers, " + "presentity, and watchers tables.", + 0 +}; + rpc_export_t presence_rpc[] = { - {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, - {"presence.refreshWatchers", rpc_presence_refresh_watchers, - rpc_presence_refresh_watchers_doc, 0}, - {"presence.updateWatchers", rpc_presence_update_watchers, - rpc_presence_update_watchers_doc, 0}, - {0, 0, 0, 0}}; + {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, + {"presence.refreshWatchers", rpc_presence_refresh_watchers, + rpc_presence_refresh_watchers_doc, 0}, + {"presence.updateWatchers", rpc_presence_update_watchers, + rpc_presence_update_watchers_doc, 0}, + {0, 0, 0, 0} +}; static int presence_init_rpc(void) {

1 0

[kamailio/kamailio] TLS module compiled with outdated OpenSSL version for Ubuntu bionic (#2) (#2288)
by Jeremy Kister 20 Apr '20

20 Apr '20

### Description Much of this issue is repeated from [#2018](https://github.com/kamailio/kamailio/issues/2018). Since it's closed and has no activity, I'm opening this issue. Kamailio 5.3.3 won't start when using `kamailio-tls-modules` on Ubuntu/18.04.4 unless `tls_force_run` is set in kamailio.cfg ``` $ grep CRITICAL /var/log/kamailio/kamailio Apr 14 17:18:39 kam-01 /usr/sbin/kamailio[22073]: CRITICAL: tls [tls_init.c:677]: init_tls_h(): installed openssl library version is too different from the library the kamailio tls module was compiled with: installed "OpenSSL 1.1.1 11 Sep 2018" (0x1010100f), compiled "OpenSSL 1.1.0g 2 Nov 2017" (0x1010007f).#012 Please make sure a compatible version is used (tls_force_run in kamailio.cfg will override this check) Apr 14 17:18:39 kam-01 /usr/sbin/kamailio[22073]: CRITICAL: <core> [main.c:2768]: main(): could not initialize tls, exiting... ``` ``` $ cat /etc/apt/sources.list.d/kamailio.list deb http://deb.kamailio.org/kamailio53 bionic main deb-src http://deb.kamailio.org/kamailio53 bionic main $ $ dpkg -l | awk '/kam/ { print $2 " " $3 }' kamailio 5.3.3+bionic kamailio-extra-modules:amd64 5.3.3+bionic kamailio-mysql-modules:amd64 5.3.3+bionic kamailio-snmpstats-modules:amd64 5.3.3+bionic kamailio-tls-modules:amd64 5.3.3+bionic kamailio-websocket-modules:amd64 5.3.3+bionic $ $ /usr/sbin/kamailio -v version: kamailio 5.3.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED 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 7.3.0 $ $ /usr/bin/openssl version OpenSSL 1.1.1 11 Sep 2018 ``` -- 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/2288

2 6

git:master:0b873ae9: presence: correct value for PS_PCACHE_RECORD
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: 0b873ae96063b7f7b5da834fd634874b02a01b32 URL: https://github.com/kamailio/kamailio/commit/0b873ae96063b7f7b5da834fd634874… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T18:00:04+02:00 presence: correct value for PS_PCACHE_RECORD --- Modified: src/modules/presence/presence.h --- Diff: https://github.com/kamailio/kamailio/commit/0b873ae96063b7f7b5da834fd634874… Patch: https://github.com/kamailio/kamailio/commit/0b873ae96063b7f7b5da834fd634874… --- diff --git a/src/modules/presence/presence.h b/src/modules/presence/presence.h index f5713898d5..e0e3495be6 100644 --- a/src/modules/presence/presence.h +++ b/src/modules/presence/presence.h @@ -54,7 +54,7 @@ #define PS_PCACHE_NONE 0 #define PS_PCACHE_HYBRID 1 -#define PS_PCACHE_RECORD 1 +#define PS_PCACHE_RECORD 2 /** TM bind */ extern struct tm_binds tmb;

1 0

git:master:79d07fe0: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: 79d07fe00af8e30910a4e1b23b641ebcc96f0895 URL: https://github.com/kamailio/kamailio/commit/79d07fe00af8e30910a4e1b23b641eb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-20T17:31:14+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/79d07fe00af8e30910a4e1b23b641eb… Patch: https://github.com/kamailio/kamailio/commit/79d07fe00af8e30910a4e1b23b641eb… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index d0f3e6fa1a..c4ba8ca1b1 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -604,12 +604,18 @@ modparam("presence", "subs_db_mode", 1) 3.19. publ_cache (int) - To improve performance, the presence module holds by default a publish - cache that says if a certain publication exists in database. This is - only a list of URI + event, so it does not use much memory. The cache - is used when a Subscription is received to check if there is any - published state in database. This way unnecessary queries in presentity - table are avoided. + To improve performance, the presence module can operate in a couple of + modes related to how PUBLISH data is stored. If publ_cache is 0, then + no information is store in memory. + + If publ_cache is 1, then the module keeps in memory an index of the + records stored in database, In this mode it keeps only the list of URIs + and events, so it does not use much memory. The cache is used when a + Subscription is received to check if there is any published state in + database. This way unnecessary queries in presentity table are avoided. + + If publ_cache is 2, then the module keeps everything related to PUBLISH + requests in memory, not storing anything in the database. Setting this parameter to 0 will disable the usage of the publish cache. This is desirable when you have more servers sharing the same

1 0

git:master:6aafae5d: presence: updated docs for publ_cache parameter
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: 6aafae5d2803387abe4d634c7d0e740386ca20b4 URL: https://github.com/kamailio/kamailio/commit/6aafae5d2803387abe4d634c7d0e740… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T17:21:08+02:00 presence: updated docs for publ_cache parameter --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6aafae5d2803387abe4d634c7d0e740… Patch: https://github.com/kamailio/kamailio/commit/6aafae5d2803387abe4d634c7d0e740… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 8f65c394e2..850e929f67 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -525,12 +525,20 @@ modparam("presence", "subs_db_mode", 1) <section id="presence.p.publ_cache"> <title><varname>publ_cache</varname> (int)</title> <para> - To improve performance, the presence module holds by default a - publish cache that says if a certain publication exists in database. - This is only a list of URI + event, so it does not use much memory. - The cache is used when a Subscription is received to check if there - is any published state in database. This way unnecessary queries in - presentity table are avoided. + To improve performance, the presence module can operate in a couple of + modes related to how PUBLISH data is stored. If publ_cache is 0, + then no information is store in memory. + </para> + <para> + If publ_cache is 1, then the module keeps in memory an index of the + records stored in database, In this mode it keeps only the list of URIs + and events, so it does not use much memory. The cache is used when a + Subscription is received to check if there is any published state in + database. This way unnecessary queries in presentity table are avoided. + </para> + <para> + If publ_cache is 2, then the module keeps everything related to PUBLISH + requests in memory, not storing anything in the database. </para> <para> Setting this parameter to 0 will disable the usage of the publish

1 0

git:master:59ca0190: presence: do not init db connection when everything is stored in memory
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: 59ca0190d2341cfeb3cf88db6ea7423f279a460a URL: https://github.com/kamailio/kamailio/commit/59ca0190d2341cfeb3cf88db6ea7423… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T17:21:08+02:00 presence: do not init db connection when everything is stored in memory --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/59ca0190d2341cfeb3cf88db6ea7423… Patch: https://github.com/kamailio/kamailio/commit/59ca0190d2341cfeb3cf88db6ea7423…

1 0

git:master:be088c53: presence: handle publish with full records stored in cache
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: be088c5305d4e32e1d6c4db65d57e86f9fabc081 URL: https://github.com/kamailio/kamailio/commit/be088c5305d4e32e1d6c4db65d57e86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T17:21:08+02:00 presence: handle publish with full records stored in cache --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presentity.c Modified: src/modules/presence/publish.c Modified: src/modules/presence/publish.h --- Diff: https://github.com/kamailio/kamailio/commit/be088c5305d4e32e1d6c4db65d57e86… Patch: https://github.com/kamailio/kamailio/commit/be088c5305d4e32e1d6c4db65d57e86…

1 0

git:5.2:b6f40ec3: http_async_client: do not set global avp lists from t on async callback
by Federico Cabiddu 20 Apr '20

20 Apr '20

Module: kamailio Branch: 5.2 Commit: b6f40ec3016961d9e2f97b40bc6a05c752780b4f URL: https://github.com/kamailio/kamailio/commit/b6f40ec3016961d9e2f97b40bc6a05c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-20T09:51:59+02:00 http_async_client: do not set global avp lists from t on async callback - they are done by fake_env() used inside t_continue() - they were set without reset, living in the process context, resulting in invalid access when async callback was executed with faked_msg - related to #2286 (cherry picked from commit 1bc3bbd010705ee247345c1ed9b36210bb8d9ed1) --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/b6f40ec3016961d9e2f97b40bc6a05c… Patch: https://github.com/kamailio/kamailio/commit/b6f40ec3016961d9e2f97b40bc6a05c… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index c459d564a8..2aa6681a7d 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -212,7 +212,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) } strncpy(q_id, aq->id, strlen(aq->id)); - + q_id[strlen(aq->id)] = '\0'; cfg_update(); @@ -227,16 +227,10 @@ void async_http_cb(struct http_m_reply *reply, void *param) free_async_query(aq); return; } - // we bring the list of AVPs of the transaction to the current context - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); - - if (t) + + if (t) { tmb.unref_cell(t); + } LM_DBG("resuming transaction (%d:%d)\n", tindex, tlabel);

1 0

git:5.3:ff48cc53: http_async_client: do not set global avp lists from t on async callback
by Federico Cabiddu 20 Apr '20

20 Apr '20

Module: kamailio Branch: 5.3 Commit: ff48cc5311d55176118ad57cf2d4417a2d229766 URL: https://github.com/kamailio/kamailio/commit/ff48cc5311d55176118ad57cf2d4417… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-20T09:51:42+02:00 http_async_client: do not set global avp lists from t on async callback - they are done by fake_env() used inside t_continue() - they were set without reset, living in the process context, resulting in invalid access when async callback was executed with faked_msg - related to #2286 (cherry picked from commit 1bc3bbd010705ee247345c1ed9b36210bb8d9ed1) --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/ff48cc5311d55176118ad57cf2d4417… Patch: https://github.com/kamailio/kamailio/commit/ff48cc5311d55176118ad57cf2d4417… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index e468a955dc..5edf67ee5d 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -212,7 +212,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) } strncpy(q_id, aq->id, strlen(aq->id)); - + q_id[strlen(aq->id)] = '\0'; cfg_update(); @@ -227,16 +227,10 @@ void async_http_cb(struct http_m_reply *reply, void *param) free_async_query(aq); return; } - // we bring the list of AVPs of the transaction to the current context - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); - - if (t) + + if (t) { tmb.unref_cell(t); + } LM_DBG("resuming transaction (%d:%d)\n", tindex, tlabel);

1 0

[kamailio/kamailio] tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) (#2289)
by Armen Babikyan 20 Apr '20

20 Apr '20

* New Feature * Changes Tested Locally This sel variable allows a kam script to get access to not just the peer certificate (at index 0), but when a certificate is successfully verified, the entire chain of certificates that were used to verify the peer certificate (at index 1, 2, 3, etc). This functionality is provided by OpenSSL's SSL_get0_verified_chain() function, which is only available in OpenSSL 1.1.0+ (which is why there is an #if for this feature) This is important when a server trusts many CAs - without this addition, I don't think that it is definitively possible to tell which CA signed the verified certificate, leading to security issues if one of the trusted CAs was compromised and was used to sign certificates that look like they were signed by another issuing CA. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2289 -- Commit Summary -- * tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) -- File Changes -- M src/modules/tls/tls_select.c (121) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2289.patch https://github.com/kamailio/kamailio/pull/2289.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/2289

2 3

git:master:94942eb7: tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) (#2289)
by GitHub 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: 94942eb788872f00c2d77e7373fbb416af667a2b URL: https://github.com/kamailio/kamailio/commit/94942eb788872f00c2d77e7373fbb41… Author: Armen Babikyan <armenb(a)mit.edu> Committer: GitHub <noreply(a)github.com> Date: 2020-04-20T09:51:26+02:00 tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) (#2289) * tls: add sel for tls verified cert chain (requires OpenSSL 1.1+) * remove extra tcpconn_put() call Co-authored-by: Armen Babikyan <armen(a)firespotter.com> --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/94942eb788872f00c2d77e7373fbb41… Patch: https://github.com/kamailio/kamailio/commit/94942eb788872f00c2d77e7373fbb41…

1 0

git:master:f2c65b4c: presence: define modes for publ_cache parameter
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: f2c65b4cc919fe066e11e08b4739b786177557d7 URL: https://github.com/kamailio/kamailio/commit/f2c65b4cc919fe066e11e08b4739b78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T09:12:24+02:00 presence: define modes for publ_cache parameter --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/f2c65b4cc919fe066e11e08b4739b78… Patch: https://github.com/kamailio/kamailio/commit/f2c65b4cc919fe066e11e08b4739b78…

1 0

git:master:ff174bb6: presence: init and destroy full presentity caching table
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: ff174bb6432b3bb971f8b291c9420545c858ef19 URL: https://github.com/kamailio/kamailio/commit/ff174bb6432b3bb971f8b291c942054… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T09:12:24+02:00 presence: init and destroy full presentity caching table --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/ff174bb6432b3bb971f8b291c942054… Patch: https://github.com/kamailio/kamailio/commit/ff174bb6432b3bb971f8b291c942054… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 779a6016fd..4100de87a1 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -406,12 +406,14 @@ static int mod_init(void) } } - if(publ_cache_mode==PS_PCACHE_HYBRID) { + if(publ_cache_mode==PS_PCACHE_HYBRID || publ_cache_mode==PS_PCACHE_RECORD) { if(phtable_size < 1) phtable_size = 256; else phtable_size = 1 << phtable_size; + } + if(publ_cache_mode==PS_PCACHE_HYBRID) { pres_htable = new_phtable(); if(pres_htable == NULL) { LM_ERR("initializing presentity hash table\n"); @@ -422,6 +424,10 @@ static int mod_init(void) LM_ERR("filling in presentity hash table from database\n"); goto dberror; } + } else if(publ_cache_mode==PS_PCACHE_RECORD) { + if(ps_ptable_init(phtable_size) < 0) { + goto dberror; + } } pres_startup_time = (int)time(NULL); @@ -594,19 +600,25 @@ static void destroy(void) timer_db_update(0, 0); } - if(subs_htable) + if(subs_htable) { destroy_shtable(subs_htable, shtable_size); + } - if(pres_htable) + if(pres_htable) { destroy_phtable(); + } - if(pa_db && pa_dbf.close) + if(pa_db && pa_dbf.close) { pa_dbf.close(pa_db); + } - if(pres_notifier_id != NULL) + if(pres_notifier_id != NULL) { shm_free(pres_notifier_id); + } destroy_evlist(); + + ps_ptable_destroy(); } static int fixup_presence(void **param, int param_no)

1 0

git:master:4b6d4fc2: presence: in-memory presentity update function
by Daniel-Constantin Mierla 20 Apr '20

20 Apr '20

Module: kamailio Branch: master Commit: 4b6d4fc2d733032391dc8575b594c3e29d06b93e URL: https://github.com/kamailio/kamailio/commit/4b6d4fc2d733032391dc8575b594c3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-20T09:12:24+02:00 presence: in-memory presentity update function - more functions exposed in the header file --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/4b6d4fc2d733032391dc8575b594c3e… Patch: https://github.com/kamailio/kamailio/commit/4b6d4fc2d733032391dc8575b594c3e… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index 01313a002e..43fcf05eee 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -1001,6 +1001,56 @@ int ps_ptable_insert(ps_presentity_t *pt) */ int ps_ptable_update(ps_presentity_t *pt) { + ps_presentity_t ptc; + ps_presentity_t *ptn = NULL; + int idx = 0; + + /* copy struct to fill in missing fields */ + memcpy(&ptc, pt, sizeof(ps_presentity_t)); + + ptc.hashid = core_case_hash(&pt->user, &pt->domain, 0); + + if(ptc.ruid.s == NULL) { + if(sruid_next(&pres_sruid) < 0) { + return -1; + } + ptc.ruid = pres_sruid.uid; + } + + idx = ptn->hashid % _ps_ptable->ssize; + + lock_get(&_ps_ptable->slots[idx].lock); + ptn = _ps_ptable->slots[idx].plist; + while(ptn!=NULL) { + if(ps_presentity_match(ptn, &ptc, 0)==1) { + if(ptn->next) { + ptn->next->prev = ptn->prev; + } + if(ptn->prev) { + ptn->prev->next = ptn->next; + } else { + _ps_ptable->slots[idx].plist = ptn->next; + } + break; + } + ptn = ptn->next; + } + + ptn = ps_presentity_new(&ptc, 0); + if(ptn==NULL) { + lock_release(&_ps_ptable->slots[idx].lock); + return -1; + } + + if(_ps_ptable->slots[idx].plist == NULL) { + _ps_ptable->slots[idx].plist = ptn; + } else { + _ps_ptable->slots[idx].plist->prev = ptn; + ptn->next = _ps_ptable->slots[idx].plist; + _ps_ptable->slots[idx].plist = ptn; + } + lock_release(&_ps_ptable->slots[idx].lock); + return 0; } diff --git a/src/modules/presence/hash.h b/src/modules/presence/hash.h index 26514af276..29753e6228 100644 --- a/src/modules/presence/hash.h +++ b/src/modules/presence/hash.h @@ -167,6 +167,10 @@ typedef struct ps_ptable { ps_pslot_t *slots; } ps_ptable_t; +ps_presentity_t *ps_presentity_new(ps_presentity_t *pt, int mtype); +void ps_presentity_free(ps_presentity_t *pt, int mtype); +void ps_presentity_list_free(ps_presentity_t *pt, int mtype); +int ps_presentity_match(ps_presentity_t *pta, ps_presentity_t *ptb, int mmode); int ps_ptable_init(int ssize); void ps_ptable_destroy(void); int ps_ptable_insert(ps_presentity_t *pt);

1 0

[kamailio/kamailio] tls: fix raw vs urlencoded behavior in sel_ssl_cert() (#2291)
by Armen Babikyan 19 Apr '20

19 Apr '20

* Small bugfix * Changes Tested locally In addressing Daniel's comments on https://github.com/kamailio/kamailio/pull/2268#issuecomment-609935161, I realized that I misunderstood how select variables get resolved to data structures. This patch fixes the sel_ssl_cert() implementation so that $sel((a)tls.my.raw_cert), $sel((a)tls.my.urlencoded_cert), $sel((a)tls.peer.raw_cert), and $sel((a)tls.peer.urlencoded_cert) all evaluate to expected outputs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2291 -- Commit Summary -- * tls: fix raw vs urlencoded behavior in sel_ssl_cert() -- File Changes -- M src/modules/tls/tls_select.c (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2291.patch https://github.com/kamailio/kamailio/pull/2291.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/2291

2 2

git:master:e5d2ac2c: tls: fix raw vs urlencoded behavior in sel_ssl_cert()
by Henning Westerholt 19 Apr '20

19 Apr '20

Module: kamailio Branch: master Commit: e5d2ac2c925757b37fd0a8e25839b7d5bd5299b0 URL: https://github.com/kamailio/kamailio/commit/e5d2ac2c925757b37fd0a8e25839b7d… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-19T12:36:56+02:00 tls: fix raw vs urlencoded behavior in sel_ssl_cert() --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/e5d2ac2c925757b37fd0a8e25839b7d… Patch: https://github.com/kamailio/kamailio/commit/e5d2ac2c925757b37fd0a8e25839b7d… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index d7bd9002ed..f899bef370 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -756,16 +756,18 @@ static int get_ssl_cert(str* res, int local, int urlencoded, sip_msg_t* msg) static int sel_ssl_cert(str* res, select_t* s, sip_msg_t* msg) { - int local=0, urlencoded=0; + int i, local = 0, urlencoded = 0; - switch(s->params[s->n - 2].v.i) { - case CERT_PEER: local = 0; break; - case CERT_LOCAL: local = 1; break; - case CERT_RAW: urlencoded = 0; break; - case CERT_URLENCODED: urlencoded = 1; break; - default: - BUG("Bug in call to sel_ssl_cert\n"); - return -1; + for(i = 1; i <= s->n - 1; i++) { + switch(s->params[i].v.i) { + case CERT_PEER: local = 0; break; + case CERT_LOCAL: local = 1; break; + case CERT_RAW: urlencoded = 0; break; + case CERT_URLENCODED: urlencoded = 1; break; + default: + BUG("Bug in call to sel_ssl_cert\n"); + return -1; + } } return get_ssl_cert(res, local, urlencoded, msg); @@ -1201,10 +1203,10 @@ select_row_t tls_sel[] = { { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("version"), sel_cert_version, 0}, - { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("rawCert"), sel_ssl_cert, CERT_RAW}, - { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("raw_cert"), sel_ssl_cert, CERT_RAW}, - { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("URLEncodedCert"), sel_ssl_cert, CERT_URLENCODED}, - { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("urlencoded_cert"), sel_ssl_cert, CERT_URLENCODED}, + { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("rawCert"), sel_ssl_cert, DIVERSION | CERT_RAW}, + { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("raw_cert"), sel_ssl_cert, DIVERSION | CERT_RAW}, + { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("URLEncodedCert"), sel_ssl_cert, DIVERSION | CERT_URLENCODED}, + { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("urlencoded_cert"), sel_ssl_cert, DIVERSION | CERT_URLENCODED}, { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("sn"), sel_sn, 0}, { sel_cert, SEL_PARAM_STR, STR_STATIC_INIT("serialNumber"), sel_sn, 0},

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Emmanuel Schmidbauer 17 Apr '20

17 Apr '20

This is cool! much needed improvement. As always, great work @miconda ! -- 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/commit/f917318c1e5fefa4106eaaf46123506…

1 0

git:master:1bc3bbd0: http_async_client: do not set global avp lists from t on async callback
by Daniel-Constantin Mierla 17 Apr '20

17 Apr '20

Module: kamailio Branch: master Commit: 1bc3bbd010705ee247345c1ed9b36210bb8d9ed1 URL: https://github.com/kamailio/kamailio/commit/1bc3bbd010705ee247345c1ed9b3621… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-17T19:04:16+02:00 http_async_client: do not set global avp lists from t on async callback - they are done by fake_env() used inside t_continue() - they were set without reset, living in the process context, resulting in invalid access when async callback was executed with faked_msg - related to #2286 --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/1bc3bbd010705ee247345c1ed9b3621… Patch: https://github.com/kamailio/kamailio/commit/1bc3bbd010705ee247345c1ed9b3621… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index e468a955dc..5edf67ee5d 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -212,7 +212,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) } strncpy(q_id, aq->id, strlen(aq->id)); - + q_id[strlen(aq->id)] = '\0'; cfg_update(); @@ -227,16 +227,10 @@ void async_http_cb(struct http_m_reply *reply, void *param) free_async_query(aq); return; } - // we bring the list of AVPs of the transaction to the current context - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); - - if (t) + + if (t) { tmb.unref_cell(t); + } LM_DBG("resuming transaction (%d:%d)\n", tindex, tlabel);

1 0

git:master:f917318c: presence: functions to keep presentity records in memory
by Daniel-Constantin Mierla 17 Apr '20

17 Apr '20

Module: kamailio Branch: master Commit: f917318c1e5fefa4106eaaf46123506d77dc02ba URL: https://github.com/kamailio/kamailio/commit/f917318c1e5fefa4106eaaf46123506… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-17T18:44:06+02:00 presence: functions to keep presentity records in memory - work in progress to have in-memory only records, without database storage --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/f917318c1e5fefa4106eaaf46123506… Patch: https://github.com/kamailio/kamailio/commit/f917318c1e5fefa4106eaaf46123506…

1 0

git:master:c26f40bc: tls: renamed tls hooks callbacks to highlight their purpose
by Daniel-Constantin Mierla 17 Apr '20

17 Apr '20

Module: kamailio Branch: master Commit: c26f40bc0c0a410ece7203c680b57a5c587ec1aa URL: https://github.com/kamailio/kamailio/commit/c26f40bc0c0a410ece7203c680b57a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-17T12:57:26+02:00 tls: renamed tls hooks callbacks to highlight their purpose --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_init.h Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_server.c Modified: src/modules/tls/tls_server.h --- Diff: https://github.com/kamailio/kamailio/commit/c26f40bc0c0a410ece7203c680b57a5… Patch: https://github.com/kamailio/kamailio/commit/c26f40bc0c0a410ece7203c680b57a5…

1 0

Re: [sr-dev] Unable to make SIP Calls (403 Forbidden - Domain Not Served)
by Pafel 17 Apr '20

17 Apr '20

Hi, Most likely this is because of the change. Revert back the changes (uncomment the section I told you), turn on debug in scscf.cfg, restart all nodes and test once again. Then have a look on the scscf logs. Regards, Pavel Siderov

3 8

Kamailio in osm
by Pavithra M 17 Apr '20

17 Apr '20

Hi, Do anybody have worked orchestrating kamailio as an IMS server through osm by launching vnfs in openstack . If so kindly reply me as I need some inputs on that.

1 0

[kamailio/kamailio] Support for 192.0.0.0/29 as NATed source (follow-up) (#2277)
by Sergiu Pojoga 17 Apr '20

17 Apr '20

### Description Follow-up to previous closed PR https://github.com/kamailio/kamailio/pull/1488 Had a chance to catch a live call involving rfc7335 private IPs. It seems like either nat_uac_test() or more likely fix_nated_sdp() doesn't catch the 192.0.0.0/29 subnet as private. ### Troubleshooting #### Reproduction route[NATMANAGE] { ... if (nat_uac_test("8")) fix_nated_sdp("15"); ... } #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` U 2020/04/07 10:36:02.572802 135.19.155.163:17669 -> 65.39.1.1:5060 INVITE sip:8007777777@client.mydomain.net:5060 SIP/2.0 Via: SIP/2.0/UDP 192.0.0.254:11198;branch=z9hG4bK1066155396 From: "ME" sip:2213@client.mydomain.net:5060;tag=3901872054 To: sip:8007777777@client.mydomain.net:5060 Call-ID: 6_327133011(a)192.168.0.78 CSeq: 1 INVITE Contact: sip:2213@192.0.0.254:11198 Content-Type: application/sdp Allow: INVITE, INFO, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE Max-Forwards: 70 User-Agent: Yealink SIP-T46S 66.84.0.10 Allow-Events: talk,hold,conference,refer,check-sync Supported: replaces Content-Length: 305 v=0 o=- 22668 22668 IN IP4 192.168.0.78 s=SDP data c=IN IP4 192.0.0.254 t=0 0 m=audio 22936 RTP/AVP 9 0 8 18 101 a=rtpmap:9 G722/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:18 G729/8000 a=fmtp:18 annexb=no a=ptime:20 a=sendrecv a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 U 2020/04/07 10:36:02.573384 65.39.1.1:5060 -> 135.19.155.163:17669 SIP/2.0 100 Trying Via: SIP/2.0/UDP 192.0.0.254:11198;branch=z9hG4bK1066155396;rport=17669;received=135.19.155.163 From: "ME" sip:2213@client.mydomain.net:5060;tag=3901872054 To: sip:8007777777@client.mydomain.net:5060 Call-ID: 6_327133011(a)192.168.0.78 CSeq: 1 INVITE Server: NXO Content-Length: 0 U 2020/04/07 10:36:02.573608 65.39.1.1:5060 -> 66.199.2.2:5060 INVITE sip:8007777777@client.mydomain.net:5060 SIP/2.0 Record-Route: sip:65.39.1.1;lr;did=faf.517 Via: SIP/2.0/UDP 65.39.1.1;branch=z9hG4bK6ef8.b9248afe5375fc379eb33718de1f7481.0 Via: SIP/2.0/UDP 192.0.0.254:11198;rport=17669;received=135.19.155.163;branch=z9hG4bK1066155396 From: "ME" sip:2213@client.mydomain.net:5060;tag=3901872054 To: sip:8007777777@client.mydomain.net:5060 Call-ID: 6_327133011(a)192.168.0.78 CSeq: 1 INVITE Contact: sip:2213@192.0.0.254:11198;alias=135.19.155.163~17669~1 Content-Type: application/sdp Allow: INVITE, INFO, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE Max-Forwards: 69 Allow-Events: talk,hold,conference,refer,check-sync Supported: replaces Content-Length: 281 .. v=0. o=- 22668 22668 IN IP4 192.168.0.78 s=SDP data. c=IN IP4 192.0.0.254 t=0 0 m=audio 22936 RTP/AVP 9 0 18 101 a=rtpmap:9 G722/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:18 G729/8000 a=fmtp:18 annexb=no a=ptime:20 a=sendrecv a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.10 (x86_64/linux) cfcfd5 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: cfcfd5 compiled on 21:57:38 Feb 12 2020 with gcc 4.9.2 ``` * **Operating System**:  ``` Debian 8 Linux proxy1 2.6.32-39-pve #1 SMP Fri May 8 11:27:35 CEST 2015 x86_64 GNU/Linux ``` -- 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/2277

3 14

git:master:c68d783b: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: c68d783b67dc57eb8ff2598690ad50393acb107e URL: https://github.com/kamailio/kamailio/commit/c68d783b67dc57eb8ff2598690ad503… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-16T17:01:20+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/c68d783b67dc57eb8ff2598690ad503… Patch: https://github.com/kamailio/kamailio/commit/c68d783b67dc57eb8ff2598690ad503… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 71ea0ddf96..a56ce5e1d8 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -58,6 +58,7 @@ Muhammad Shahzad Shafi 4.20. via_add_srvid(flags) 4.21. via_add_xavp_params(flags) 4.22. via_use_xavp_fields(flags) + 4.23. is_faked_msg() 5. RPC Commands @@ -102,8 +103,9 @@ Muhammad Shahzad Shafi 1.24. via_add_srvid usage 1.25. via_add_xavp_params usage 1.26. via_use_xavp_fields usage - 1.27. event_route[network:msg] use cases - 1.28. Sample PERL code for do_compress and do_uncompress + 1.27. is_faked_msg usage + 1.28. event_route[network:msg] use cases + 1.29. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -146,6 +148,7 @@ Chapter 1. Admin Guide 4.20. via_add_srvid(flags) 4.21. via_add_xavp_params(flags) 4.22. via_use_xavp_fields(flags) + 4.23. is_faked_msg() 5. RPC Commands @@ -287,6 +290,7 @@ modparam("corex", "msg_avp", "$avp(msg)") 4.20. via_add_srvid(flags) 4.21. via_add_xavp_params(flags) 4.22. via_use_xavp_fields(flags) + 4.23. is_faked_msg() 4.1. append_branch([ uri, [ q ] ]) @@ -644,6 +648,27 @@ request_route { } ... +4.23. is_faked_msg() + + Returns 1 (native config true) if the SIP message under processing is + the internal faked msg structure. Returns -1 (native config false) if + the SIP message under processing is received from the network. + + The function should be useful in event route blocks or async route + blocks where it can be processed either a message from the network or + the internal faked message. + + This function can be used in ANY_ROUTE. + + Example 1.27. is_faked_msg usage +... +event_route[dispatcher:dst-down] { + if (is_faked_msg()) { + xinfo("Running with faked message\n"); + } +} +... + 5. RPC Commands 5.1. corex.debug @@ -778,7 +803,7 @@ request_route { Next is a basic usage example where encoding and decoding is done using PERL, - Example 1.27. event_route[network:msg] use cases + Example 1.28. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -809,7 +834,7 @@ event_route[network:msg] { } ... - Example 1.28. Sample PERL code for do_compress and do_uncompress + Example 1.29. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

1 0

git:master:2ea7dc36: corex: docs for is_faked_msg() function
by Daniel-Constantin Mierla 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: 2ea7dc363b15259468fb1518208b87d3e2b6289c URL: https://github.com/kamailio/kamailio/commit/2ea7dc363b15259468fb1518208b87d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T16:52:30+02:00 corex: docs for is_faked_msg() function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2ea7dc363b15259468fb1518208b87d… Patch: https://github.com/kamailio/kamailio/commit/2ea7dc363b15259468fb1518208b87d… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 98c51f1470..b35efd1047 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -765,6 +765,36 @@ request_route { </programlisting> </example> </section> + <section id="corex.f.is_faked_msg"> + <title> + <function moreinfo="none">is_faked_msg()</function> + </title> + <para> + Returns 1 (native config true) if the SIP message under processing + is the internal faked msg structure. Returns -1 (native config false) + if the SIP message under processing is received from the network. + </para> + <para> + The function should be useful in event route blocks or async route + blocks where it can be processed either a message from the network + or the internal faked message. + </para> + <para> + This function can be used in ANY_ROUTE. + </para> + <example> + <title><function>is_faked_msg</function> usage</title> + <programlisting format="linespecific"> +... +event_route[dispatcher:dst-down] { + if (is_faked_msg()) { + xinfo("Running with faked message\n"); + } +} +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:51505a0f: corex: new function is_faked_msg()
by Daniel-Constantin Mierla 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: 51505a0f5eadcdb8ca4aa3108b060802d7a55972 URL: https://github.com/kamailio/kamailio/commit/51505a0f5eadcdb8ca4aa3108b06080… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T16:44:17+02:00 corex: new function is_faked_msg() - return 1 (native cfg true) if the message under processing is faked (a static sip message structure used internally by kamailio) - return -1 (native cfg false) if it is a received sip message - useful for checking in event routes or async route blocks when can be both types of messages --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/51505a0f5eadcdb8ca4aa3108b06080… Patch: https://github.com/kamailio/kamailio/commit/51505a0f5eadcdb8ca4aa3108b06080… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index febd97f0f3..e23aae325d 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -29,6 +29,7 @@ #include "../../core/resolve.h" #include "../../core/lvalue.h" #include "../../core/pvar.h" +#include "../../core/fmsg.h" #include "../../core/kemi.h" #include "../../core/parser/parse_uri.h" @@ -61,6 +62,7 @@ static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2); static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *p2); static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2); static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *p2); +static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2); static int fixup_file_op(void** param, int param_no); @@ -130,6 +132,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1, fixup_igp_null, 0, ANY_ROUTE }, + {"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, + 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -927,6 +931,28 @@ static int ki_has_user_agent(sip_msg_t *msg) return -1; } +/** + * + */ +static int ki_is_faked_msg(sip_msg_t *msg) +{ + if(faked_msg_match(msg)) { + return 1; + } + return -1; +} + +/** + * + */ +static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2) +{ + if(faked_msg_match(msg)) { + return 1; + } + return -1; +} + /** * */ @@ -1022,6 +1048,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("is_faked_msg"), + SR_KEMIP_INT, ki_is_faked_msg, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:a5fc0262: pv: format new xavp functions declaration lines to be matched by kemi docs tool
by Daniel-Constantin Mierla 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: a5fc02623c1489d1e46c2f352703e8bdcf808ec2 URL: https://github.com/kamailio/kamailio/commit/a5fc02623c1489d1e46c2f352703e8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T16:32:54+02:00 pv: format new xavp functions declaration lines to be matched by kemi docs tool --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a5fc02623c1489d1e46c2f352703e8b… Patch: https://github.com/kamailio/kamailio/commit/a5fc02623c1489d1e46c2f352703e8b… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 36cb4a0f03..2574148c04 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1394,7 +1394,11 @@ static sr_kemi_xval_t* ki_xavp_getw(sip_msg_t *msg, str *rname) return ki_xavp_get_mode(msg, rname, SR_KEMI_XVAL_NULL_PRINT); } +/** + * + */ sr_kemi_dict_item_t* ki_xavp_dict(sr_xavp_t *xavp); + /** * SR_KEMIP_ARRAY with values of xavp=>name */ @@ -1480,7 +1484,8 @@ sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str name) /** * SR_KEMIP_DICT of xavp */ -sr_kemi_dict_item_t* ki_xavp_dict(sr_xavp_t *xavp) { +sr_kemi_dict_item_t* ki_xavp_dict(sr_xavp_t *xavp) +{ sr_xavp_t *avp = NULL; struct str_list *keys; struct str_list *k; @@ -1534,8 +1539,7 @@ sr_kemi_dict_item_t* ki_xavp_dict(sr_xavp_t *xavp) { /** * */ -static sr_kemi_xval_t* -ki_xavp_getd_helper(sip_msg_t *msg, str *rname, int *_indx) +static sr_kemi_xval_t* ki_xavp_getd_helper(sip_msg_t *msg, str *rname, int *_indx) { sr_xavp_t *xavp=NULL; int xavp_size = 0; @@ -1589,8 +1593,7 @@ ki_xavp_getd_helper(sip_msg_t *msg, str *rname, int *_indx) /** * */ -static sr_kemi_xval_t* -ki_xavp_getd(sip_msg_t *msg, str *rname) +static sr_kemi_xval_t* ki_xavp_getd(sip_msg_t *msg, str *rname) { return ki_xavp_getd_helper(msg, rname, NULL); } @@ -1598,8 +1601,7 @@ ki_xavp_getd(sip_msg_t *msg, str *rname) /** * */ -static sr_kemi_xval_t* -ki_xavp_getd_p1(sip_msg_t *msg, str *rname, int indx) +static sr_kemi_xval_t* ki_xavp_getd_p1(sip_msg_t *msg, str *rname, int indx) { return ki_xavp_getd_helper(msg, rname, &indx); } @@ -1607,8 +1609,8 @@ ki_xavp_getd_p1(sip_msg_t *msg, str *rname, int indx) /** * */ -static sr_kemi_xval_t* -ki_xavp_get_keys(sip_msg_t *msg, str *rname, int indx) { +static sr_kemi_xval_t* ki_xavp_get_keys(sip_msg_t *msg, str *rname, int indx) +{ sr_xavp_t *xavp=NULL; struct str_list *keys, *k; sr_kemi_dict_item_t *val;

1 0

git:5.3:44ccb90f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 16 Apr '20

16 Apr '20

Module: kamailio Branch: 5.3 Commit: 44ccb90f1e5205fbba593a93c7f36f79b9784ea7 URL: https://github.com/kamailio/kamailio/commit/44ccb90f1e5205fbba593a93c7f36f7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-16T14:46:30+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_sqlang/README Modified: src/modules/nat_traversal/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/44ccb90f1e5205fbba593a93c7f36f7… Patch: https://github.com/kamailio/kamailio/commit/44ccb90f1e5205fbba593a93c7f36f7…

1 0

git: new commits in branch 5.3
by Daniel-Constantin Mierla 16 Apr '20

16 Apr '20

- URL: https://github.com/kamailio/kamailio/commit/d04d748018631fd8ac983ec19041b8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:14:47+02:00 core: parser - removed temporarily remark for module reserved internal flags (cherry picked from commit 8801ee89856d4a37709869a5c01dfa66988b8f5a) - URL: https://github.com/kamailio/kamailio/commit/2762e8b5c5f12bb57418652ced2b652… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:17:38+02:00 kamctl: try to locate rpc fifo file in /var/run/ or /run/ folders - cope better with old or non-linux systems (cherry picked from commit 6a7aa74663a25b52651bc39e986849c62c8a50f4) - URL: https://github.com/kamailio/kamailio/commit/426262c88e84073a9328c045b31ab40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:18:36+02:00 nat_traversal: new marameter contact_match - if set to 0 (default), match request-reply contacts with string comparison (behaviour so far) - if set to 1, use light uri comparison ( match uri type, user, host, port and proto ) (cherry picked from commit 531f2551affb06e71cbabbeba0e3174900e69aab) - URL: https://github.com/kamailio/kamailio/commit/48477857eaf4b5adc9d691f81688a5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:18:45+02:00 nat_traversal: docs for contact_match parameter (cherry picked from commit 91c30dc8650d778851fcf439904557bc7363fcc4) - URL: https://github.com/kamailio/kamailio/commit/80b1c57cc9ff8a670ac88df5dbd71a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:25:58+02:00 rr: exported record_route_advertised_address() to kemi (cherry picked from commit 66582c49ee16a15a6859bfb094c2faaed7960d4d) - URL: https://github.com/kamailio/kamailio/commit/9c15c3b108ddefd3261640d4c2556b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:27:36+02:00 app_sqlang: docs - fix for rpc command name (cherry picked from commit a072e170c07370f97716ae719abb35c508d98564) - URL: https://github.com/kamailio/kamailio/commit/3026641a218508044190adc856d160d… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2020-04-16T14:27:48+02:00 app_python3: update Python3 detection mechanism This commit - removes the python calls whose output is never actually used. - changes the include discovery to use python3(.x)-config. This is preferable because it also works for cross-compiling. Calling python3(.x) directly will always provide host flags, which for cross-compiling is not feasible. - updates LDFLAGS discovery to also work with >= Python 3.8. To achieve this python3(.x)-config is first run with the argument "--embed". If this does not succeed (exit status 1) python3(.x)-config is run again without "--embed". This is the method suggested by Python upstream to provide backwards compatibility. See [1] for more details. [1] https://docs.python.org/3/whatsnew/3.8.html Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> (cherry picked from commit 05af36d34aa2668780aa111878206c6797fa98b0) - URL: https://github.com/kamailio/kamailio/commit/1579b7855d09967a92c79df26dd8bda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:27:58+02:00 app_python3: Makefile - suppress warning if --embed is not supported by python3-config (cherry picked from commit 392688fc756a97f65c2433bb6af7adedca4e0abf) - URL: https://github.com/kamailio/kamailio/commit/8ab8b455f4c07014d2bd0648122478d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-16T14:28:24+02:00 misc: kemi examples, add missing kemix module change introduced at 01ac570c2fbda800d1e00cd50305739cf0596ebf (cherry picked from commit e123971726a8d18627091870086ee7d244e9802f) - URL: https://github.com/kamailio/kamailio/commit/0889852ca52d304cf15fe39f8fcf3b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:28:49+02:00 misc/examples/kemi: make reply code integer everywhere (cherry picked from commit 28be94ea97216ba7ac1420130cc01ebda167c5d8) - URL: https://github.com/kamailio/kamailio/commit/2a0fa8133783d88b5672e0ff741f69e… Author: fredposner <fred(a)qxork.com> Date: 2020-04-16T14:29:12+02:00 tls: fix typo in documentation - params.xml: replace "private" with "private_key" (cherry picked from commit ad91985849e46beee757d48ee9041b81bef9bd81) - URL: https://github.com/kamailio/kamailio/commit/f1899b1e96d046392d7cdd9a567408f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:29:26+02:00 presence: removed unused global var log_buf (cherry picked from commit 6ef70d7366d60c1c7c73aff987193340e0b7c938) - URL: https://github.com/kamailio/kamailio/commit/613e68a3bde21722c9bd8e8d2169860… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:32:58+02:00 core: data lump - updated comments and param names reflect better the purpose - coherent whitespacing (cherry picked from commit 36d55b1fca14eb1a055dedac2e3cdb81b48c3a22) - URL: https://github.com/kamailio/kamailio/commit/76c825fa03e89d094583b2d778f2bde… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:33:06+02:00 core: receive - removed unnecessary time zone parameter for time difference (cherry picked from commit dbec3e4f682b17fc706cf9ea486229a51928e2d0) - URL: https://github.com/kamailio/kamailio/commit/da0c6ba521665d2f898f508cf99c586… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:33:24+02:00 nathelper: moved cfg file to examples folder (cherry picked from commit 097f613f0e1d4ef67a6d9022f33f037921cd9a9c) - URL: https://github.com/kamailio/kamailio/commit/52bed0c797b79b7e97f5d01fd9fb0ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:33:45+02:00 tm: do not return if kemi callback execution fails for t_continue() - have same behaviour as with route blocks (cherry picked from commit 2161f0cc316af0e1153b01f327d0e7c50523060c) - URL: https://github.com/kamailio/kamailio/commit/52aa43febb06f69427a4fe5860f3005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T14:34:25+02:00 core: functions for light comparison of uri values - match uri type, user, host, port and proto, but skip params matching (cherry picked from commit d1584cff4766d45147cc3ed88da91ab691437799)

1 0

git:master:2161f0cc: tm: do not return if kemi callback execution fails for t_continue()
by Daniel-Constantin Mierla 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: 2161f0cc316af0e1153b01f327d0e7c50523060c URL: https://github.com/kamailio/kamailio/commit/2161f0cc316af0e1153b01f327d0e7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T12:39:02+02:00 tm: do not return if kemi callback execution fails for t_continue() - have same behaviour as with route blocks --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/2161f0cc316af0e1153b01f327d0e7c… Patch: https://github.com/kamailio/kamailio/commit/2161f0cc316af0e1153b01f327d0e7c… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 3ebef32e2a..4c8de42ce6 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -312,7 +312,6 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, if(sr_kemi_route(keng, faked_req, FAILURE_ROUTE, cbname, &evname)<0) { LM_ERR("error running event route kemi callback\n"); - return -1; } } else { LM_DBG("event callback (%.*s) set, but no cfg engine\n",

1 0

git:master:9fb26280: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: 9fb26280e9f90f326de885b4f93f5949b33f4bd4 URL: https://github.com/kamailio/kamailio/commit/9fb26280e9f90f326de885b4f93f594… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-16T12:01:17+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/9fb26280e9f90f326de885b4f93f594… Patch: https://github.com/kamailio/kamailio/commit/9fb26280e9f90f326de885b4f93f594…

1 0

git:master:288f1f17: nathelper: docs - fix ending tags issues introduced with previous commit
by Daniel-Constantin Mierla 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: 288f1f17cb36cd69ea2daed7afcaa859ccc72d58 URL: https://github.com/kamailio/kamailio/commit/288f1f17cb36cd69ea2daed7afcaa85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T11:58:23+02:00 nathelper: docs - fix ending tags issues introduced with previous commit --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/288f1f17cb36cd69ea2daed7afcaa85… Patch: https://github.com/kamailio/kamailio/commit/288f1f17cb36cd69ea2daed7afcaa85… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 8594cda9ce..27b2ef3dbd 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -477,26 +477,26 @@ modparam("nathelper", "filter_server_id", 1) <itemizedlist> <listitem> <para>10.0.0.0/8</para> - <listitem> + </listitem> <listitem> <para>172.16.0.0/12</para> - <listitem> + </listitem> <listitem> <para>192.168.0.0/16</para> - <listitem> + </listitem> <listitem> <para>100.64.0.0/10 - RFC6598 - Carrier Grade NAT</para> - <listitem> + </listitem> <listitem> <para>192.0.0.0/29 - RFC7335 - IPv4 Service Continuity Prefix</para> - <listitem> - <itemizedlist> + </listitem> + </itemizedlist> <para>Reserved net addresses are:</para> <itemizedlist> <listitem> <para>192.0.0.0/24 - RFC7335 - IETF Protocol Assignments</para> - <listitem> - <itemizedlist> + </listitem> + </itemizedlist> <para> <emphasis> Default value is <quote>1</quote>.

1 0

git:master:f1a6f264: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: f1a6f264c7665a43fbda86d6691d0361de3e0428 URL: https://github.com/kamailio/kamailio/commit/f1a6f264c7665a43fbda86d6691d036… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-16T10:01:22+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/f1a6f264c7665a43fbda86d6691d036… Patch: https://github.com/kamailio/kamailio/commit/f1a6f264c7665a43fbda86d6691d036…

1 0

git:master:9721922e: nathelper: docs for nat_addr_mode parameter
by Daniel-Constantin Mierla 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: 9721922e2e47f3e8403bc540ecd73b55f41d5d91 URL: https://github.com/kamailio/kamailio/commit/9721922e2e47f3e8403bc540ecd73b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T09:54:48+02:00 nathelper: docs for nat_addr_mode parameter --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9721922e2e47f3e8403bc540ecd73b5… Patch: https://github.com/kamailio/kamailio/commit/9721922e2e47f3e8403bc540ecd73b5… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 732a617396..8594cda9ce 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -466,6 +466,52 @@ modparam("nathelper", "filter_server_id", 1) </example> </section> + <section id="nathelper.p.nat_addr_mode"> + <title><varname>nat_addr_mode</varname> (int)</title> + <para> + If set to 0, only default private net addresses are checked by + nat_uac_test(). If set to 1, other reserved net addresses are + checked by nat_uac_test() as well. + </para> + <para>Default private net addresses are:</para> + <itemizedlist> + <listitem> + <para>10.0.0.0/8</para> + <listitem> + <listitem> + <para>172.16.0.0/12</para> + <listitem> + <listitem> + <para>192.168.0.0/16</para> + <listitem> + <listitem> + <para>100.64.0.0/10 - RFC6598 - Carrier Grade NAT</para> + <listitem> + <listitem> + <para>192.0.0.0/29 - RFC7335 - IPv4 Service Continuity Prefix</para> + <listitem> + <itemizedlist> + <para>Reserved net addresses are:</para> + <itemizedlist> + <listitem> + <para>192.0.0.0/24 - RFC7335 - IETF Protocol Assignments</para> + <listitem> + <itemizedlist> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>nat_addr_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "nat_addr_mode", 0) +... +</programlisting> + </example> + </section> + </section>

1 0

git:master:a10e7652: nathelper: new parameter nat_addr_mode
by Daniel-Constantin Mierla 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: a10e7652f24bc7ed8e74ff27d16da5d77689b6ac URL: https://github.com/kamailio/kamailio/commit/a10e7652f24bc7ed8e74ff27d16da5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T09:40:42+02:00 nathelper: new parameter nat_addr_mode - if set to 0, default private net addresses are checked by nat_uac_test() - if set to 1, other reserved net addresses are checked by nat_uac_test() - default 1 (reserved addresses are considered not routable) - related at GH #2277 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/a10e7652f24bc7ed8e74ff27d16da5d… Patch: https://github.com/kamailio/kamailio/commit/a10e7652f24bc7ed8e74ff27d16da5d… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index c5100a466f..65db2a11c3 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -143,13 +143,16 @@ static int cblen = 0; static int natping_interval = 0; struct socket_info *force_socket = 0; +static int nh_nat_addr_mode = 1; /* clang-format off */ -static struct { +typedef struct nh_netaddr { const char *cnetaddr; uint32_t netaddr; uint32_t mask; -} nets_1918[] = { +} nh_netaddr_t; + +static nh_netaddr_t nh_nets_1918[] = { {"10.0.0.0", 0, 0xffffffffu << 24}, {"172.16.0.0", 0, 0xffffffffu << 20}, {"192.168.0.0", 0, 0xffffffffu << 16}, @@ -157,6 +160,11 @@ static struct { {"192.0.0.0", 0, 0xffffffffu << 3}, /* rfc7335 - IPv4 Service Continuity Prefix */ {NULL, 0, 0} }; + +static nh_netaddr_t nh_nets_extra[] = { + {"192.0.0.0", 0, 0xffffffffu << 8}, /* rfc7335 - IETF Protocol Assignments */ + {NULL, 0, 0} +}; /* clang-format on */ /* @@ -257,6 +265,7 @@ static param_export_t params[] = { {"udpping_from_path", INT_PARAM, &udpping_from_path }, {"append_sdp_oldmediaip", INT_PARAM, &sdp_oldmediaip }, {"filter_server_id", INT_PARAM, &nh_filter_srvid }, + {"nat_addr_mode", INT_PARAM, &nh_nat_addr_mode }, {0, 0, 0} }; @@ -535,10 +544,17 @@ static int mod_init(void) } /* Prepare 1918 networks list */ - for(i = 0; nets_1918[i].cnetaddr != NULL; i++) { - if(inet_aton(nets_1918[i].cnetaddr, &addr) != 1) + for(i = 0; nh_nets_1918[i].cnetaddr != NULL; i++) { + if(inet_aton(nh_nets_1918[i].cnetaddr, &addr) != 1) abort(); - nets_1918[i].netaddr = ntohl(addr.s_addr) & nets_1918[i].mask; + nh_nets_1918[i].netaddr = ntohl(addr.s_addr) & nh_nets_1918[i].mask; + } + + /* Prepare reserved/extra networks list */ + for(i = 0; nh_nets_extra[i].cnetaddr != NULL; i++) { + if(inet_aton(nh_nets_extra[i].cnetaddr, &addr) != 1) + abort(); + nh_nets_extra[i].netaddr = ntohl(addr.s_addr) & nh_nets_extra[i].mask; } register_select_table(sel_declaration); @@ -1267,11 +1283,18 @@ static inline int is1918addr_n(uint32_t netaddr) uint32_t hl; hl = ntohl(netaddr); - for(i = 0; nets_1918[i].cnetaddr != NULL; i++) { - if((hl & nets_1918[i].mask) == nets_1918[i].netaddr) { + for(i = 0; nh_nets_1918[i].cnetaddr != NULL; i++) { + if((hl & nh_nets_1918[i].mask) == nh_nets_1918[i].netaddr) { return 1; } } + if(nh_nat_addr_mode==1) { + for(i = 0; nh_nets_extra[i].cnetaddr != NULL; i++) { + if((hl & nh_nets_extra[i].mask) == nh_nets_extra[i].netaddr) { + return 1; + } + } + } return 0; }

1 0

git:master:097f613f: nathelper: moved cfg file to examples folder
by Daniel-Constantin Mierla 16 Apr '20

16 Apr '20

Module: kamailio Branch: master Commit: 097f613f0e1d4ef67a6d9022f33f037921cd9a9c URL: https://github.com/kamailio/kamailio/commit/097f613f0e1d4ef67a6d9022f33f037… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-16T09:25:05+02:00 nathelper: moved cfg file to examples folder --- Added: src/modules/nathelper/examples/nathelper.cfg Added: src/modules/nathelper/examples/nathelper_rtpp.cfg Removed: src/modules/nathelper/nathelper.cfg Removed: src/modules/nathelper/nathelper_rtpp.cfg --- Diff: https://github.com/kamailio/kamailio/commit/097f613f0e1d4ef67a6d9022f33f037… Patch: https://github.com/kamailio/kamailio/commit/097f613f0e1d4ef67a6d9022f33f037… --- diff --git a/src/modules/nathelper/nathelper.cfg b/src/modules/nathelper/examples/nathelper.cfg similarity index 100% rename from src/modules/nathelper/nathelper.cfg rename to src/modules/nathelper/examples/nathelper.cfg diff --git a/src/modules/nathelper/nathelper_rtpp.cfg b/src/modules/nathelper/examples/nathelper_rtpp.cfg similarity index 100% rename from src/modules/nathelper/nathelper_rtpp.cfg rename to src/modules/nathelper/examples/nathelper_rtpp.cfg

1 0

[kamailio/kamailio] SMPP support (#2280)
by TelecomsXChange 15 Apr '20

15 Apr '20

Any plans for SMPP support in Kamailio in 2020-2021? -- 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/2280

5 7

git:master:cd4a5150: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: cd4a51504921710816fa44330c2ac35b8136a4ab URL: https://github.com/kamailio/kamailio/commit/cd4a51504921710816fa44330c2ac35… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-15T16:16:13+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/cd4a51504921710816fa44330c2ac35… Patch: https://github.com/kamailio/kamailio/commit/cd4a51504921710816fa44330c2ac35…

1 0

git:master:6d45c551: tm: docs for exec_time_check parameter
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 6d45c55197fe9460fac90364b96e01f68826992b URL: https://github.com/kamailio/kamailio/commit/6d45c55197fe9460fac90364b96e01f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T15:59:52+02:00 tm: docs for exec_time_check parameter --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/6d45c55197fe9460fac90364b96e01f… Patch: https://github.com/kamailio/kamailio/commit/6d45c55197fe9460fac90364b96e01f… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 512e7d40a0..47b39d2419 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1526,4 +1526,29 @@ modparam("tm", "rich_redirect", 3) </example> </section> + <section id="tm.p.exec_time_check"> + <title><varname>exec_time_check</varname> (int)</title> + <para> + Duration in milliseconds for executing transaction failure callbacks + and failure_route block after which to do a safety check if + transaction is still active. + </para> + <para> + Set it to 0 in order to disable this check. + </para> + <para> + <emphasis> + Default value is 5000 (5 seconds). + </emphasis> + </para> + <example> + <title>Set <varname>exec_time_check</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("tm", "exec_time_check", 0) +... +</programlisting> + </example> + </section> + </section>

1 0

git:master:b0becdd9: tm: new parameter exec_time_check for safety checks on lenghtly callbacks
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: b0becdd95dcd5d403d435bd02ee7934b44d9fcf6 URL: https://github.com/kamailio/kamailio/commit/b0becdd95dcd5d403d435bd02ee7934… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T15:52:17+02:00 tm: new parameter exec_time_check for safety checks on lenghtly callbacks - try to detect when failure callbacks execution take too long and do safety check of the transaction - default value is 5000 (milliseconds) - set to 0 to disable this check --- Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_reply.h Modified: src/modules/tm/timer.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/b0becdd95dcd5d403d435bd02ee7934… Patch: https://github.com/kamailio/kamailio/commit/b0becdd95dcd5d403d435bd02ee7934…

1 0

git:master:dbec3e4f: core: receive - removed unnecessary time zone parameter for time difference
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: dbec3e4f682b17fc706cf9ea486229a51928e2d0 URL: https://github.com/kamailio/kamailio/commit/dbec3e4f682b17fc706cf9ea486229a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T14:20:48+02:00 core: receive - removed unnecessary time zone parameter for time difference --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/dbec3e4f682b17fc706cf9ea486229a… Patch: https://github.com/kamailio/kamailio/commit/dbec3e4f682b17fc706cf9ea486229a… --- diff --git a/src/core/receive.c b/src/core/receive.c index 1bf288420d..d9194379b2 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -228,7 +228,6 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) struct run_act_ctx *bctx = NULL; int ret = -1; struct timeval tvb, tve; - struct timezone tz; unsigned int diff = 0; str inb = STR_NULL; sr_net_info_t netinfo = {0}; @@ -379,7 +378,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) /* skip: */ LM_DBG("preparing to run routing scripts...\n"); if(exectime) { - gettimeofday(&tvb, &tz); + gettimeofday(&tvb, NULL); } /* execute pre-script callbacks, if any; -jiri */ /* if some of the callbacks said not to continue with @@ -429,7 +428,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) } if(exectime) { - gettimeofday(&tve, &tz); + gettimeofday(&tve, NULL); diff = (tve.tv_sec - tvb.tv_sec) * 1000000 + (tve.tv_usec - tvb.tv_usec); if (cfg_get(core, core_cfg, latency_limit_cfg) == 0 @@ -451,7 +450,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) } if(exectime) { - gettimeofday(&tvb, &tz); + gettimeofday(&tvb, NULL); } /* execute pre-script callbacks, if any; -jiri */ @@ -510,7 +509,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) forward_reply(msg); skip_send_reply: if(exectime) { - gettimeofday(&tve, &tz); + gettimeofday(&tve, NULL); diff = (tve.tv_sec - tvb.tv_sec) * 1000000 + (tve.tv_usec - tvb.tv_usec); if (cfg_get(core, core_cfg, latency_limit_cfg) == 0

1 0

git:master:36d55b1f: core: data lump - updated comments and param names reflect better the purpose
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 36d55b1fca14eb1a055dedac2e3cdb81b48c3a22 URL: https://github.com/kamailio/kamailio/commit/36d55b1fca14eb1a055dedac2e3cdb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T13:33:07+02:00 core: data lump - updated comments and param names reflect better the purpose - coherent whitespacing --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/36d55b1fca14eb1a055dedac2e3cdb8… Patch: https://github.com/kamailio/kamailio/commit/36d55b1fca14eb1a055dedac2e3cdb8…

1 0

git:master:9f6331e0: app_python: fix SR_KEMIP_DICT case in return_xval
by Victor Seva 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 9f6331e0614599dd9dcdc1e362efad5bf228b0c4 URL: https://github.com/kamailio/kamailio/commit/9f6331e0614599dd9dcdc1e362efad5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-15T12:04:24+02:00 app_python: fix SR_KEMIP_DICT case in return_xval introduced at 82279ebd3a634911277e48523a56f93473baca2c --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/9f6331e0614599dd9dcdc1e362efad5… Patch: https://github.com/kamailio/kamailio/commit/9f6331e0614599dd9dcdc1e362efad5… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 5d1489e201..5320b02155 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -187,6 +187,8 @@ PyObject *sr_kemi_apy_return_xval(sr_kemi_t *ket, sr_kemi_xval_t *rx) return sr_apy_kemi_return_none(); case SR_KEMIP_DICT: LM_ERR("unsupported return type: map\n"); + sr_kemi_xval_free(rx); + return sr_apy_kemi_return_none(); case SR_KEMIP_XVAL: /* unknown content - return false */ return sr_kemi_apy_return_false();

1 0

git:master:18f6fbb8: app_ruby: for now return NULL for array and map kemi results
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 18f6fbb8f8af8a822caca18e97da23a4fe4d9a7e URL: https://github.com/kamailio/kamailio/commit/18f6fbb8f8af8a822caca18e97da23a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T11:53:17+02:00 app_ruby: for now return NULL for array and map kemi results - free result structure --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/18f6fbb8f8af8a822caca18e97da23a… Patch: https://github.com/kamailio/kamailio/commit/18f6fbb8f8af8a822caca18e97da23a… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 4d9bbbdb6b..41e6a3ec9e 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -769,6 +769,14 @@ VALUE sr_kemi_ruby_return_xval(sr_kemi_t *ket, sr_kemi_xval_t *rx) } else { return Qfalse; } + case SR_KEMIP_ARRAY: + LM_ERR("unsupported return type: array\n"); + sr_kemi_xval_free(rx); + return Qnil; + case SR_KEMIP_DICT: + LM_ERR("unsupported return type: map\n"); + sr_kemi_xval_free(rx); + return Qnil; case SR_KEMIP_XVAL: /* unknown content - return false */ return Qfalse;

1 0

git:master:0edc8e3a: app_sqlang: for now return NULL for array and map kemi results
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 0edc8e3ab127feca8847987612669cc8782aff23 URL: https://github.com/kamailio/kamailio/commit/0edc8e3ab127feca8847987612669cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T11:50:58+02:00 app_sqlang: for now return NULL for array and map kemi results - free result structure --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/0edc8e3ab127feca8847987612669cc… Patch: https://github.com/kamailio/kamailio/commit/0edc8e3ab127feca8847987612669cc… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 22d2ce6ff3..192e059e2e 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -898,6 +898,16 @@ int sr_kemi_sqlang_return_xval(HSQUIRRELVM J, sr_kemi_t *ket, sr_kemi_xval_t *rx sq_pushbool(J, SRSQLANG_FALSE); } return 1; + case SR_KEMIP_ARRAY: + LM_ERR("unsupported return type: array\n"); + sr_kemi_xval_free(rx); + sqlang_pushstring(J, NULL); + return 1; + case SR_KEMIP_DICT: + LM_ERR("unsupported return type: map\n"); + sr_kemi_xval_free(rx); + sqlang_pushstring(J, NULL); + return 1; case SR_KEMIP_XVAL: /* unknown content - return false */ sq_pushbool(J, SRSQLANG_FALSE);

1 0

git:master:046bba65: app_python3: for now return none for array and map kemi results
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 046bba65da26a4b30cb5965d6d6ae28320cc8a54 URL: https://github.com/kamailio/kamailio/commit/046bba65da26a4b30cb5965d6d6ae28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T11:45:50+02:00 app_python3: for now return none for array and map kemi results - free result structure --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/046bba65da26a4b30cb5965d6d6ae28… Patch: https://github.com/kamailio/kamailio/commit/046bba65da26a4b30cb5965d6d6ae28… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 7769046d2d..2c4d73eb72 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -184,6 +184,14 @@ PyObject *sr_kemi_apy_return_xval(sr_kemi_t *ket, sr_kemi_xval_t *rx) } else { return sr_kemi_apy_return_false(); } + case SR_KEMIP_ARRAY: + LM_ERR("unsupported return type: array\n"); + sr_kemi_xval_free(rx); + return sr_apy_kemi_return_none(); + case SR_KEMIP_DICT: + LM_ERR("unsupported return type: map\n"); + sr_kemi_xval_free(rx); + return sr_apy_kemi_return_none(); case SR_KEMIP_XVAL: /* unknown content - return false */ return sr_kemi_apy_return_false();

1 0

git:master:930c69a8: app_jsdt: for now return NULL for array and map kemi results
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 930c69a88119c60560d815035d5bae2c95824a2a URL: https://github.com/kamailio/kamailio/commit/930c69a88119c60560d815035d5bae2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T11:48:29+02:00 app_jsdt: for now return NULL for array and map kemi results - free result structure --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/930c69a88119c60560d815035d5bae2… Patch: https://github.com/kamailio/kamailio/commit/930c69a88119c60560d815035d5bae2… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index e313803bba..ff4e629075 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -176,6 +176,16 @@ int sr_kemi_jsdt_return_xval(duk_context *J, sr_kemi_t *ket, sr_kemi_xval_t *rx) duk_push_boolean(J, SRJSDT_FALSE); } return 1; + case SR_KEMIP_ARRAY: + LM_ERR("unsupported return type: array\n"); + sr_kemi_xval_free(rx); + duk_push_string(J, NULL); + return 1; + case SR_KEMIP_DICT: + LM_ERR("unsupported return type: map\n"); + sr_kemi_xval_free(rx); + duk_push_string(J, NULL); + return 1; case SR_KEMIP_XVAL: /* unknown content - return false */ duk_push_boolean(J, SRJSDT_FALSE);

1 0

git:master:82279ebd: app_python: for now return none for array and map kemi results
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 82279ebd3a634911277e48523a56f93473baca2c URL: https://github.com/kamailio/kamailio/commit/82279ebd3a634911277e48523a56f93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T11:44:44+02:00 app_python: for now return none for array and map kemi results - free result structure --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/82279ebd3a634911277e48523a56f93… Patch: https://github.com/kamailio/kamailio/commit/82279ebd3a634911277e48523a56f93… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 96fa2cf024..5d1489e201 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -181,6 +181,12 @@ PyObject *sr_kemi_apy_return_xval(sr_kemi_t *ket, sr_kemi_xval_t *rx) } else { return sr_kemi_apy_return_false(); } + case SR_KEMIP_ARRAY: + LM_ERR("unsupported return type: array\n"); + sr_kemi_xval_free(rx); + return sr_apy_kemi_return_none(); + case SR_KEMIP_DICT: + LM_ERR("unsupported return type: map\n"); case SR_KEMIP_XVAL: /* unknown content - return false */ return sr_kemi_apy_return_false();

1 0

git:master:7f51bc70: pv: add KEMI functions pvx.xavp_get_keys and pvx.xavp_getd
by Victor Seva 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 7f51bc7080bc5c46fbc21148818b3cc30c05d59f URL: https://github.com/kamailio/kamailio/commit/7f51bc7080bc5c46fbc21148818b3cc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-15T11:12:30+02:00 pv: add KEMI functions pvx.xavp_get_keys and pvx.xavp_getd --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/7f51bc7080bc5c46fbc21148818b3cc… Patch: https://github.com/kamailio/kamailio/commit/7f51bc7080bc5c46fbc21148818b3cc…

1 0

[kamailio/kamailio] pv: add xavp KEMI functions (#2285)
by Victor Seva 15 Apr '20

15 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Related to https://lists.kamailio.org/pipermail/sr-dev/2020-April/056481.html #### Description Add functions: __pvx.xavp_get_keys__(_rname_): get an array with the keys used in `$xavp(rname)` __pvx.xavp_getd__(_rname_): get a dictionary with `$xavp(rname)` content __pvx.xavp_getd__(_rname_, _idx_): get a dictionary with the `$xavp(rname[idx])` content You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2285 -- Commit Summary -- * pv: add KEMI functions pvx.xavp_get_keys and pvx.xavp_getd -- File Changes -- M src/modules/pv/pv.c (281) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2285.patch https://github.com/kamailio/kamailio/pull/2285.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/2285

2 3

[kamailio/kamailio] KEMI: add support for array and dict datatypes (#2284)
by Victor Seva 15 Apr '20

15 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Related to https://lists.kamailio.org/pipermail/sr-dev/2020-April/056481.html #### Description Added ARRAY and DICT data types and implement support in app_lua You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2284 -- Commit Summary -- * core: KEMI suport for ARRAY and DICT * app_lua: add support for ARRAY and DICT types -- File Changes -- M src/core/kemi.c (28) M src/core/kemi.h (17) M src/modules/app_lua/app_lua_api.c (88) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2284.patch https://github.com/kamailio/kamailio/pull/2284.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/2284

2 3

git:master:8f753d10: core: KEMI suport for ARRAY and DICT
by Victor Seva 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 8f753d10b7dd44735d723dd781864ddd0202e769 URL: https://github.com/kamailio/kamailio/commit/8f753d10b7dd44735d723dd781864dd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-15T11:09:40+02:00 core: KEMI suport for ARRAY and DICT --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/8f753d10b7dd44735d723dd781864dd… Patch: https://github.com/kamailio/kamailio/commit/8f753d10b7dd44735d723dd781864dd… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 8b5663a39f..d389c4b4e0 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2390,6 +2390,34 @@ void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode) } } +/** + * + */ +void sr_kemi_dict_item_free(sr_kemi_dict_item_t *item) +{ + sr_kemi_dict_item_t *v; + + while(item) { + if (item->vtype == SR_KEMIP_ARRAY || item->vtype == SR_KEMIP_DICT) { + sr_kemi_dict_item_free(item->v.dict); + } + v = item; + item = item->next; + pkg_free(v); + } +} + +/** + * + */ +void sr_kemi_xval_free(sr_kemi_xval_t *xval) +{ + if(xval && (xval->vtype == SR_KEMIP_ARRAY || xval->vtype == SR_KEMIP_DICT)) + { + sr_kemi_dict_item_free(xval->v.dict); + } +} + /** * */ diff --git a/src/core/kemi.h b/src/core/kemi.h index 7824ce2f60..85cd521512 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -32,6 +32,8 @@ #define SR_KEMIP_BOOL (1<<2) /* type boolean (0/1) */ #define SR_KEMIP_XVAL (1<<3) /* type extended value (integer, str*, ...) */ #define SR_KEMIP_NULL (1<<4) /* type NULL */ +#define SR_KEMIP_DICT (1<<5) /* type dictionary */ +#define SR_KEMIP_ARRAY (1<<6) /* type array */ #define SR_KEMI_FALSE 0 #define SR_KEMI_TRUE 1 @@ -66,11 +68,24 @@ typedef union { str s; } sr_kemi_val_t; +typedef struct sr_kemi_dict_item +{ + struct sr_kemi_dict_item *next; + str name; + int vtype; + union { + int n; + str s; + struct sr_kemi_dict_item *dict; + } v; +} sr_kemi_dict_item_t; + typedef struct sr_kemi_xval { int vtype; union { int n; str s; + sr_kemi_dict_item_t *dict; } v; } sr_kemi_xval_t; @@ -208,5 +223,5 @@ sr_kemi_t* sr_kemi_exports_get_pv(void); #define SR_KEMI_XVAL_NULL_PRINT 1 #define SR_KEMI_XVAL_NULL_EMPTY 2 void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode); - +void sr_kemi_xval_free(sr_kemi_xval_t *xval); #endif

1 0

git:master:a1ef564b: app_lua: add support for ARRAY and DICT types
by Victor Seva 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: a1ef564b50877be7c5eed2b8a0ef3a8b00d3d1cd URL: https://github.com/kamailio/kamailio/commit/a1ef564b50877be7c5eed2b8a0ef3a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-15T11:09:40+02:00 app_lua: add support for ARRAY and DICT types --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/a1ef564b50877be7c5eed2b8a0ef3a8… Patch: https://github.com/kamailio/kamailio/commit/a1ef564b50877be7c5eed2b8a0ef3a8… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index f80de0909e..da3b4eeb17 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -806,6 +806,85 @@ int sr_kemi_lua_return_int(lua_State* L, sr_kemi_t *ket, int rc) return app_lua_return_false(L); } +void sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item); + +/** + * creates and push a table to the lua stack with + * the elements of the list + */ +void sr_kemi_lua_push_array(lua_State *L, sr_kemi_dict_item_t *item) { + int i = 1; + sr_kemi_dict_item_t *k; + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } + if (item->vtype == SR_KEMIP_ARRAY) { + k = item->v.dict; + } else { + k = item; + } + if(k) { + lua_newtable(L); + } + while(k){ + lua_pushnumber(L, i++); + sr_kemi_lua_push_dict_item(L, k); + lua_settable(L, -3); + k = k->next; + } +} + +void sr_kemi_lua_push_dict(lua_State *L, sr_kemi_dict_item_t *item) { + sr_kemi_dict_item_t *k = item; + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } + lua_newtable(L); + while(k){ + sr_kemi_lua_push_dict_item(L, k->v.dict); + lua_setfield(L, -2, k->name.s); + k = k->next; + } +} + +void +sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) +{ + switch(item->vtype) { + case SR_KEMIP_NONE: + LM_CRIT("BUG: vtype is NONE\n"); + lua_pushnil(L); + break; + case SR_KEMIP_INT: + lua_pushinteger(L, item->v.n); + break; + case SR_KEMIP_STR: + lua_pushlstring(L, item->v.s.s, item->v.s.len); + break; + case SR_KEMIP_BOOL: + if(item->v.n!=SR_KEMI_FALSE) { + lua_pushboolean(L, SRLUA_TRUE); + } else { + lua_pushboolean(L, SRLUA_FALSE); + } + break; + case SR_KEMIP_NULL: + lua_pushnil(L); + break; + case SR_KEMIP_ARRAY: + sr_kemi_lua_push_array(L, item); + break; + case SR_KEMIP_DICT: + sr_kemi_lua_push_dict(L, item); + break; + default: + LM_DBG("unknown type:%d\n", item->vtype); + /* unknown type - return false */ + lua_pushboolean(L, SRLUA_FALSE); + } +} /** * @@ -835,6 +914,14 @@ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) case SR_KEMIP_NULL: lua_pushnil(L); return 1; + case SR_KEMIP_ARRAY: + sr_kemi_lua_push_array(L, rx->v.dict); + sr_kemi_xval_free(rx); + return 1; + case SR_KEMIP_DICT: + sr_kemi_lua_push_dict_item(L, rx->v.dict); + sr_kemi_xval_free(rx); + return 1; default: /* unknown type - return false */ lua_pushboolean(L, SRLUA_FALSE);

1 0

Re: [sr-dev] Unable to make SIP Calls (403 Forbidden - Domain Not Served)
by Pavel Siderov 15 Apr '20

15 Apr '20

Hello, I think this thread is for Users maillist. Anyway, first of all start scscf in debug mode and test. Then have a look on the logs. There is only one place in the scscf configuration where you can get "Domain not served": if (uri == myself || uri =~ "tel:.*") { if (!term_impu_registered("location")) { xlog("L_DBG", "We need to do an UNREG server SAR assignemnt"); assign_server_unreg("UNREG_SAR_REPLY", "location", "term"); exit; } } else { sl_send_reply("403","Forbidden - Domain not served"); exit(); } I personally got the same error some time ago and I didn't have enough time to debug it. That's why I just commented all the code above so scscf can proceed to : route(term); This is a temporary workaround but it is working fine for me. Most likely this is something important but it stays in the todo to debug it in the near future. Regards, Pavel Siderov На пн, 13.04.2020 г. в 22:38 <sr-dev-request(a)lists.kamailio.org> написа: > > Date: Tue, 14 Apr 2020 01:07:14 +0530 > From: Pavithra M <pavimohan3096(a)gmail.com> > To: "Kamailio (SER) - Development Mailing List" > <sr-dev(a)lists.kamailio.org> > Subject: Re: [sr-dev] Unable to make SIP Calls (403 Forbidden - Domain > Not Served) > Message-ID: > <CAJvDr=+ > UKZ66o1ZQ-EmQ5xc70AEnZ3fJzoNair1ctCanB1DyvA(a)mail.gmail.com> > Content-Type: text/plain; charset="utf-8" > > Hi , > > I have configured kamailio as an IMS server as VM based . > > PCSCF - 10.x.x.179 > ICSCF - 10.x.x.79 > SCSCF - 10.x.x.73 > HSS - 10.x.x.75 > > I am using zoiper client for testing the call flow . The *registration is > happening properly* in my both zoiper clients for hss configured users > (alice and bob). > When i am making an *INVITE , *I am getting *403 Forbidden - Domain not > served *error from SCSCF. > > The Call Flow for invite is as follows . call from alice(a)sip.example.com > > zoiper1 (UE) -> PCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > PCSCF -> SCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > SCSCF -> PCSCF (100 trying) > SCSCF -> ICSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > ICSCF -> SCSCF (100 trying) > ICSCF -> SCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > SCSCF -> ICSCF (100 trying) > SCSCF -> ICSCF (*403 Forbidden - Domain not served*) > ICSCF -> SCSCF (Request: ACK sip:bob@sip.example.com | ) > ICSCF -> SCSCF ( 403 Forbidden - Domain not served ) > SCSCF -> PCSCF ( 403 Forbidden - Domain not served ) > PCSCF -> UE ( 403 Forbidden - Domain not served ) > > Below are the alias configuration i have done in pcscf,icscf,scscf nodes > *PCSCF.CFG* > # IP-Adress for incoming SIP-Traffic, in the following format: > > # SIP / UDP > listen=udp:10.x.x.179:4060 > # SIP / TCP > listen=tcp:10.x.x.179:4060 > # SIP / TCP/TLS > listen=tls:10.x.x.179:4060 > > # IPSEC / UDP > #!define IPSEC_LISTEN_ADDR "0.0.0.0" > #!define IPSEC_CLIENT_PORT 5062 > #!define IPSEC_SERVER_PORT 5063 > #alias="sip.example.com:4060" > alias=pcscf.sip.example.com:4060 > > #!define MY_WS_PORT 80 > #!define MY_WSS_PORT 443 > > #!define PCSCF_URL "sip:pcscf.sip.example.com:4060" > > #!define TCP_PROCESSES 8 > > #!subst "/NETWORKNAME/sip.example.com/" > #!subst "/HOSTNAME/pcscf.sip.example.com/" > > *ICSCF.CFG* > > # SIP / UDP > listen=udp:10.x.x.79:4070 > # SIP / TCP > listen=tcp:10.x.x.79:4070 > # SIP / TCP/TLS > listen=tls:10.x.x.79:4071 > > alias="icscf.sip.example.com:4070" > > #!define NETWORKNAME "sip.example.com" > #!define HOSTNAME "icscf.sip.example.com" > > *SCSCF.CFG* > > # SIP / UDP > listen=udp:10.x.x.73:4080 > # SIP / TCP > listen=tcp:10.x.x.73:4080 > # SIP / TCP/TLS > listen=tls:10.x.x.73:4081 > > #!define NETWORKNAME "sip.example.com" > #!define HOSTNAME "scscf.sip.example.com" > #!define URI "sip:scscf.sip.example.com:4080" > alias=scscf.sip.example.com:4080 > > # ENUM-Server to query: > #!define ENUM_SUFFIX "scscf.sip.example.com." > > > Kindly let me know where i am missing . Kindly need help in this issue > since the registration is happening successfully and dropping in the INVITE > level. > Kindly help.

2 1

git:master:125be8e4: presence_xml: use common prefix for global variables
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 125be8e423cd968933690c682cb0a45ab7136ad3 URL: https://github.com/kamailio/kamailio/commit/125be8e423cd968933690c682cb0a45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T09:21:11+02:00 presence_xml: use common prefix for global variables --- Modified: src/modules/presence_xml/add_events.c Modified: src/modules/presence_xml/notify_body.c Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h Modified: src/modules/presence_xml/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/125be8e423cd968933690c682cb0a45… Patch: https://github.com/kamailio/kamailio/commit/125be8e423cd968933690c682cb0a45…

1 0

git:master:3b2a84e9: presence_xml: use presence api via structure instead of declaring local function variables
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 3b2a84e94da6e17c61620760fee0288d8af936b9 URL: https://github.com/kamailio/kamailio/commit/3b2a84e94da6e17c61620760fee0288… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T09:21:11+02:00 presence_xml: use presence api via structure instead of declaring local function variables - simpler overall and clearer when function is local in module or imported via api, given that same prefix was used --- Modified: src/modules/presence_xml/add_events.c Modified: src/modules/presence_xml/notify_body.c Modified: src/modules/presence_xml/pidf.c Modified: src/modules/presence_xml/pres_check.c Modified: src/modules/presence_xml/pres_check.h Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h Modified: src/modules/presence_xml/xcap_auth.c Modified: src/modules/presence_xml/xcap_auth.h --- Diff: https://github.com/kamailio/kamailio/commit/3b2a84e94da6e17c61620760fee0288… Patch: https://github.com/kamailio/kamailio/commit/3b2a84e94da6e17c61620760fee0288…

1 0

[kamailio/kamailio] TLS module compiled with outdated OpenSSL version for Ubuntu bionic (#2018)
by welljsjs 14 Apr '20

14 Apr '20

### Description  Ubuntu Bionic 18.04.02 LTS ships with "OpenSSL 1.1.1 11 Sep 2018" (0x1010100f), whereas the `kamailio-tls-modules` package is compiled with "OpenSSL 1.1.0g 2 Nov 2017" (0x1010007f). I installed Kamailio from the Kamailio repositories (not from the Ubuntu repositories). This leads to Kamailio being unable to start as it complains about the OpenSSL versions being too different from each other. Overriding the OpenSSl version check by enabling `tls_force_run` does not solve the issue, instead, it leads to Kamailio emitting multiple errors.  #### Reproduction I installed Kamailio from the official Kamailio apt sources (nightly build, the same occurs for the latest stable version 5.2). ``` deb http://deb.kamailio.org/kamailiodev-nightly bionic main deb-src http://deb.kamailio.org/kamailiodev-nightly bionic main ``` I enabled TLS and edited the configuration files accordingly.    ``` (paste your debugging data here) ``` #### Log Messages ``` CRITICAL: tls [tls_init.c:677]: init_tls_h(): installed openssl library version is too different from the library the kamailio tls module was compiled with: installed "OpenSSL 1.1.1 11 Sep 2018" (0x1010100f), compiled "OpenSSL 1.1.0g 2 Nov 2017" (0x1010007f).#012 Please make sure a compatible version is used (tls_force_run in kamailio.cfg will override this check) ```  ### Possible Solutions Recompile and publish the `kamailio-tls-modules` package compiled with OpenSSL 1.1.1b. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0-dev6 (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_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 7.3.0 ``` * **Operating System**:  ``` Linux hostname 4.15.0-55-generic #60-Ubuntu SMP Tue Jul 2 18:22:20 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux Description: Ubuntu 18.04.2 LTS Release: 18.04 ``` -- 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/2018

4 13

git:master:498d7649: rtpengine: add `flags` field for every command
by Richard Fuchs 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: 498d7649339edfc07f40fe3e37e66376b2817d6c URL: https://github.com/kamailio/kamailio/commit/498d7649339edfc07f40fe3e37e6637… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-04-14T13:15:21-04:00 rtpengine: add `flags` field for every command --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/498d7649339edfc07f40fe3e37e6637… Patch: https://github.com/kamailio/kamailio/commit/498d7649339edfc07f40fe3e37e6637… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7be7968660..d56e88e003 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2401,8 +2401,9 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ bencode_list_add_string(item, "load limit"); body.s = NULL; + ng_flags.flags = bencode_list(bencbuf); + if (op == OP_OFFER || op == OP_ANSWER) { - ng_flags.flags = bencode_list(bencbuf); ng_flags.direction = bencode_list(bencbuf); ng_flags.replace = bencode_list(bencbuf); ng_flags.rtcp_mux = bencode_list(bencbuf); @@ -2428,11 +2429,6 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ else bencode_dictionary_add_str(ng_flags.dict, "sdp", &body); } - else if (op == OP_BLOCK_DTMF || op == OP_BLOCK_MEDIA || op == OP_UNBLOCK_DTMF - || op == OP_UNBLOCK_MEDIA || op == OP_START_FORWARDING || op == OP_STOP_FORWARDING) - { - ng_flags.flags = bencode_list(bencbuf); - } /*** parse flags & build dictionary ***/

1 0

Re: [sr-dev] Unable to make SIP Calls (403 Forbidden - Domain Not Served)
by Pafel 14 Apr '20

14 Apr '20

Hello, I think this thread is for Users maillist. Anyway, first of all start scscf in debug mode and test. Then have a look on the logs. There is only one place in the scscf configuration where you can get "Domain not served": if (uri == myself || uri =~ "tel:.*") { if (!term_impu_registered("location")) { xlog("L_DBG", "We need to do an UNREG server SAR assignemnt"); assign_server_unreg("UNREG_SAR_REPLY", "location", "term"); exit; } } else { sl_send_reply("403","Forbidden - Domain not served"); exit(); } I personally got the same error some time ago and I didn't have enough time to debug it. That's why I just commented all the code above so scscf can proceed to : route(term); This is a temporary workaround but it is working fine for me. Most likely this is something important but it stays in the todo to debug it in the near future. Regards, Pavel Siderov На пн, 13.04.2020 г. в 22:38 <sr-dev-request(a)lists.kamailio.org> написа: > > Date: Tue, 14 Apr 2020 01:07:14 +0530 > From: Pavithra M <pavimohan3096(a)gmail.com> > To: "Kamailio (SER) - Development Mailing List" > <sr-dev(a)lists.kamailio.org> > Subject: Re: [sr-dev] Unable to make SIP Calls (403 Forbidden - Domain > Not Served) > Message-ID: > <CAJvDr=+ > UKZ66o1ZQ-EmQ5xc70AEnZ3fJzoNair1ctCanB1DyvA(a)mail.gmail.com> > Content-Type: text/plain; charset="utf-8" > > Hi , > > I have configured kamailio as an IMS server as VM based . > > PCSCF - 10.x.x.179 > ICSCF - 10.x.x.79 > SCSCF - 10.x.x.73 > HSS - 10.x.x.75 > > I am using zoiper client for testing the call flow . The *registration is > happening properly* in my both zoiper clients for hss configured users > (alice and bob). > When i am making an *INVITE , *I am getting *403 Forbidden - Domain not > served *error from SCSCF. > > The Call Flow for invite is as follows . call from alice(a)sip.example.com > > zoiper1 (UE) -> PCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > PCSCF -> SCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > SCSCF -> PCSCF (100 trying) > SCSCF -> ICSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > ICSCF -> SCSCF (100 trying) > ICSCF -> SCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > SCSCF -> ICSCF (100 trying) > SCSCF -> ICSCF (*403 Forbidden - Domain not served*) > ICSCF -> SCSCF (Request: ACK sip:bob@sip.example.com | ) > ICSCF -> SCSCF ( 403 Forbidden - Domain not served ) > SCSCF -> PCSCF ( 403 Forbidden - Domain not served ) > PCSCF -> UE ( 403 Forbidden - Domain not served ) > > Below are the alias configuration i have done in pcscf,icscf,scscf nodes > *PCSCF.CFG* > # IP-Adress for incoming SIP-Traffic, in the following format: > > # SIP / UDP > listen=udp:10.x.x.179:4060 > # SIP / TCP > listen=tcp:10.x.x.179:4060 > # SIP / TCP/TLS > listen=tls:10.x.x.179:4060 > > # IPSEC / UDP > #!define IPSEC_LISTEN_ADDR "0.0.0.0" > #!define IPSEC_CLIENT_PORT 5062 > #!define IPSEC_SERVER_PORT 5063 > #alias="sip.example.com:4060" > alias=pcscf.sip.example.com:4060 > > #!define MY_WS_PORT 80 > #!define MY_WSS_PORT 443 > > #!define PCSCF_URL "sip:pcscf.sip.example.com:4060" > > #!define TCP_PROCESSES 8 > > #!subst "/NETWORKNAME/sip.example.com/" > #!subst "/HOSTNAME/pcscf.sip.example.com/" > > *ICSCF.CFG* > > # SIP / UDP > listen=udp:10.x.x.79:4070 > # SIP / TCP > listen=tcp:10.x.x.79:4070 > # SIP / TCP/TLS > listen=tls:10.x.x.79:4071 > > alias="icscf.sip.example.com:4070" > > #!define NETWORKNAME "sip.example.com" > #!define HOSTNAME "icscf.sip.example.com" > > *SCSCF.CFG* > > # SIP / UDP > listen=udp:10.x.x.73:4080 > # SIP / TCP > listen=tcp:10.x.x.73:4080 > # SIP / TCP/TLS > listen=tls:10.x.x.73:4081 > > #!define NETWORKNAME "sip.example.com" > #!define HOSTNAME "scscf.sip.example.com" > #!define URI "sip:scscf.sip.example.com:4080" > alias=scscf.sip.example.com:4080 > > # ENUM-Server to query: > #!define ENUM_SUFFIX "scscf.sip.example.com." > > > Kindly let me know where i am missing . Kindly need help in this issue > since the registration is happening successfully and dropping in the INVITE > level. > Kindly help.

2 1

Re: [sr-dev] Unable to make SIP Calls (403 Forbidden - Domain Not Served)
by Pavithra M 14 Apr '20

14 Apr '20

Hi , I have configured kamailio as an IMS server as VM based . PCSCF - 10.x.x.179 ICSCF - 10.x.x.79 SCSCF - 10.x.x.73 HSS - 10.x.x.75 I am using zoiper client for testing the call flow . The *registration is happening properly* in my both zoiper clients for hss configured users (alice and bob). When i am making an *INVITE , *I am getting *403 Forbidden - Domain not served *error from SCSCF. The Call Flow for invite is as follows . call from alice(a)sip.example.com zoiper1 (UE) -> PCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) PCSCF -> SCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) SCSCF -> PCSCF (100 trying) SCSCF -> ICSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) ICSCF -> SCSCF (100 trying) ICSCF -> SCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) SCSCF -> ICSCF (100 trying) SCSCF -> ICSCF (*403 Forbidden - Domain not served*) ICSCF -> SCSCF (Request: ACK sip:bob@sip.example.com | ) ICSCF -> SCSCF ( 403 Forbidden - Domain not served ) SCSCF -> PCSCF ( 403 Forbidden - Domain not served ) PCSCF -> UE ( 403 Forbidden - Domain not served ) Below are the alias configuration i have done in pcscf,icscf,scscf nodes *PCSCF.CFG* # IP-Adress for incoming SIP-Traffic, in the following format: # SIP / UDP listen=udp:10.x.x.179:4060 # SIP / TCP listen=tcp:10.x.x.179:4060 # SIP / TCP/TLS listen=tls:10.x.x.179:4060 # IPSEC / UDP #!define IPSEC_LISTEN_ADDR "0.0.0.0" #!define IPSEC_CLIENT_PORT 5062 #!define IPSEC_SERVER_PORT 5063 #alias="sip.example.com:4060" alias=pcscf.sip.example.com:4060 #!define MY_WS_PORT 80 #!define MY_WSS_PORT 443 #!define PCSCF_URL "sip:pcscf.sip.example.com:4060" #!define TCP_PROCESSES 8 #!subst "/NETWORKNAME/sip.example.com/" #!subst "/HOSTNAME/pcscf.sip.example.com/" *ICSCF.CFG* # SIP / UDP listen=udp:10.x.x.79:4070 # SIP / TCP listen=tcp:10.x.x.79:4070 # SIP / TCP/TLS listen=tls:10.x.x.79:4071 alias="icscf.sip.example.com:4070" #!define NETWORKNAME "sip.example.com" #!define HOSTNAME "icscf.sip.example.com" *SCSCF.CFG* # SIP / UDP listen=udp:10.x.x.73:4080 # SIP / TCP listen=tcp:10.x.x.73:4080 # SIP / TCP/TLS listen=tls:10.x.x.73:4081 #!define NETWORKNAME "sip.example.com" #!define HOSTNAME "scscf.sip.example.com" #!define URI "sip:scscf.sip.example.com:4080" alias=scscf.sip.example.com:4080 # ENUM-Server to query: #!define ENUM_SUFFIX "scscf.sip.example.com." Kindly let me know where i am missing . Kindly need help in this issue since the registration is happening successfully and dropping in the INVITE level. Kindly help.

2 2

git:master:6b9e5c6c: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: 6b9e5c6c52fe3f22fc25b1b5e755c4d1842c4adb URL: https://github.com/kamailio/kamailio/commit/6b9e5c6c52fe3f22fc25b1b5e755c4d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-14T15:31:11+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/6b9e5c6c52fe3f22fc25b1b5e755c4d… Patch: https://github.com/kamailio/kamailio/commit/6b9e5c6c52fe3f22fc25b1b5e755c4d…

1 0

git:master:217a6b83: presence: docs for timer_mode parameter
by Daniel-Constantin Mierla 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: 217a6b83da60d874b78cc451b339b3baca559b33 URL: https://github.com/kamailio/kamailio/commit/217a6b83da60d874b78cc451b339b3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-14T15:25:14+02:00 presence: docs for timer_mode parameter --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/217a6b83da60d874b78cc451b339b3b… Patch: https://github.com/kamailio/kamailio/commit/217a6b83da60d874b78cc451b339b3b… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index cbbf7f9775..8f65c394e2 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -951,6 +951,27 @@ modparam("presence", "delete_same_subs", 1) </example> </section> +<section id="presence.p.timer_mode"> + <title><varname>timer_mode</varname> (integer)</title> + <para> + Specify what timer process to be used. If set to 0, the core main timer + is used. If set to 1, the core secondary timer is used. + </para> + <para> + <emphasis> + Default value is 1. + </emphasis> + </para> + <example> + <title>Set <varname>timer_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence", "timer_mode", 0) +... +</programlisting> + </example> +</section> + </section> <section>

1 0

git:master:de0c3195: presence: timer_mode - new parameter to control what timer process to use
by Daniel-Constantin Mierla 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: de0c3195894ae5e20bc3bc3d88431b5043566cf2 URL: https://github.com/kamailio/kamailio/commit/de0c3195894ae5e20bc3bc3d88431b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-14T15:20:24+02:00 presence: timer_mode - new parameter to control what timer process to use - if set to 0, use the core main timer - if set to 1, use the core secondary timer - default 1 (timer tasks are for cleanup) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/de0c3195894ae5e20bc3bc3d88431b5… Patch: https://github.com/kamailio/kamailio/commit/de0c3195894ae5e20bc3bc3d88431b5… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 107563bbbc..3cbdab959a 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -102,6 +102,7 @@ str pres_server_address = {0, 0}; evlist_t *pres_evlist = NULL; int pres_subs_remove_match = 0; int _pres_subs_mode = 1; +static int pres_timer_mode = 1; int pres_uri_match = 0; /* sip uri match function pointer */ @@ -241,6 +242,8 @@ static param_export_t params[]={ { "enable_dmq", PARAM_INT, &pres_enable_dmq}, { "pres_subs_mode", PARAM_INT, &_pres_subs_mode}, { "delete_same_subs", PARAM_INT, &pres_delete_same_subs}, + { "timer_mode", PARAM_INT, &pres_timer_mode}, + {0,0,0} }; /* clang-format on */ @@ -423,12 +426,21 @@ static int mod_init(void) pres_startup_time = (int)time(NULL); if(pres_clean_period > 0) { - register_timer(msg_presentity_clean, 0, pres_clean_period); - register_timer(msg_watchers_clean, 0, pres_clean_period); + if(pres_timer_mode==0) { + register_timer(msg_presentity_clean, 0, pres_clean_period); + register_timer(msg_watchers_clean, 0, pres_clean_period); + } else { + sr_wtimer_add(msg_presentity_clean, 0, pres_clean_period); + sr_wtimer_add(msg_watchers_clean, 0, pres_clean_period); + } } if(pres_db_update_period > 0) { - register_timer(timer_db_update, 0, pres_db_update_period); + if(pres_timer_mode==0) { + register_timer(timer_db_update, 0, pres_db_update_period); + } else { + sr_wtimer_add(timer_db_update, 0, pres_db_update_period); + } } if(pres_waitn_time <= 0) {

1 0

git:master:a0a18cc2: presence_xml: pass pres uri as pointer for pres_update_watchers()
by Daniel-Constantin Mierla 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: a0a18cc28dafe3b4bd73bf5e0d2d848d39b72668 URL: https://github.com/kamailio/kamailio/commit/a0a18cc28dafe3b4bd73bf5e0d2d848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-14T12:15:48+02:00 presence_xml: pass pres uri as pointer for pres_update_watchers() --- Modified: src/modules/presence_xml/presence_xml.c --- Diff: https://github.com/kamailio/kamailio/commit/a0a18cc28dafe3b4bd73bf5e0d2d848… Patch: https://github.com/kamailio/kamailio/commit/a0a18cc28dafe3b4bd73bf5e0d2d848… --- diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index faf4c91360..82e57d2f55 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -448,7 +448,7 @@ static int xcap_doc_updated(int doc_type, str xid, char *doc) rules_doc.s = doc; rules_doc.len = strlen(doc); - if(pres_update_watchers(xid, &ev, &rules_doc) < 0) { + if(pres_update_watchers(&xid, &ev, &rules_doc) < 0) { LM_ERR("updating watchers in presence\n"); return -1; }

1 0

git:master:ddc755c6: presence: pass str parameters via pointer to couple of functions
by Daniel-Constantin Mierla 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: ddc755c6e0646a4d503842d6b06863c4f93bd525 URL: https://github.com/kamailio/kamailio/commit/ddc755c6e0646a4d503842d6b06863c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-14T12:15:48+02:00 presence: pass str parameters via pointer to couple of functions --- Modified: src/modules/presence/bind_presence.h Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/ddc755c6e0646a4d503842d6b06863c… Patch: https://github.com/kamailio/kamailio/commit/ddc755c6e0646a4d503842d6b06863c…

1 0

git:master:3b809cff: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: 3b809cff36784c67577ea3a9c88508d44110616d URL: https://github.com/kamailio/kamailio/commit/3b809cff36784c67577ea3a9c88508d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-14T11:31:26+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/3b809cff36784c67577ea3a9c88508d… Patch: https://github.com/kamailio/kamailio/commit/3b809cff36784c67577ea3a9c88508d…

1 0

git:master:f871322c: presence: removed unused module parameter to_tag_pref
by Daniel-Constantin Mierla 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: f871322c2d4102f5f67178b702fdf90b5b01ceea URL: https://github.com/kamailio/kamailio/commit/f871322c2d4102f5f67178b702fdf90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-14T11:22:59+02:00 presence: removed unused module parameter to_tag_pref - no longer used to set prefix for to-tag value --- Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h --- Diff: https://github.com/kamailio/kamailio/commit/f871322c2d4102f5f67178b702fdf90… Patch: https://github.com/kamailio/kamailio/commit/f871322c2d4102f5f67178b702fdf90… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index c25d1aa8f6..4e42e99108 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -109,9 +109,6 @@ sip_uri_match_f presence_sip_uri_match; static int sip_uri_case_sensitive_match(str *s1, str *s2); static int sip_uri_case_insensitive_match(str *s1, str *s2); -/* to tag prefix */ -char *pres_totag_pref = "10"; - /* TM bind */ struct tm_binds tmb; /* SL API structure */ @@ -220,7 +217,6 @@ static param_export_t params[]={ { "notifier_processes", INT_PARAM, &pres_notifier_processes }, { "force_delete", INT_PARAM, &pres_force_delete }, { "startup_mode", INT_PARAM, &pres_startup_mode }, - { "to_tag_pref", PARAM_STRING, &pres_totag_pref }, { "expires_offset", INT_PARAM, &pres_expires_offset }, { "max_expires", INT_PARAM, &pres_max_expires }, { "min_expires", INT_PARAM, &pres_min_expires }, @@ -319,10 +315,6 @@ static int mod_init(void) pres_expires_offset = 0; } - if(pres_totag_pref == NULL || strlen(pres_totag_pref) == 0) { - pres_totag_pref = "10"; - } - if(pres_max_expires <= 0) { pres_max_expires = 3600; } diff --git a/src/modules/presence/presence.h b/src/modules/presence/presence.h index 26f39a45a5..151647cf2a 100644 --- a/src/modules/presence/presence.h +++ b/src/modules/presence/presence.h @@ -70,7 +70,6 @@ extern str watchers_table; extern int pres_counter; extern int pres_pid; extern int pres_startup_time; -extern char *pres_totag_pref; extern int pres_expires_offset; extern int pres_cseq_offset; extern str pres_server_address;

1 0

git:master:ce2bad95: presence: docs - removed to_tag_pref parameter
by Daniel-Constantin Mierla 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: ce2bad95ec75bed4cf9b0bd19fde307162c8601d URL: https://github.com/kamailio/kamailio/commit/ce2bad95ec75bed4cf9b0bd19fde307… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-14T11:23:59+02:00 presence: docs - removed to_tag_pref parameter --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ce2bad95ec75bed4cf9b0bd19fde307… Patch: https://github.com/kamailio/kamailio/commit/ce2bad95ec75bed4cf9b0bd19fde307… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 32ffd3a2e6..cbbf7f9775 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -345,26 +345,6 @@ modparam("presence", "startup_mode", 0) </example> </section> - <section id="presence.p.to_tag_pref"> - <title><varname>to_tag_pref</varname> (str)</title> - <para> - The prefix used when generating to_tag when sending replies for - SUBSCRIBE requests. - </para> - <para> - <emphasis>Default value is <quote>10</quote>. - </emphasis> - </para> - <example> - <title>Set <varname>to_tag_pref</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("presence", "to_tag_pref", 'pres') -... - </programlisting> - </example> - </section> - <section id="presence.p.expires_offset"> <title><varname>expires_offset</varname> (int)</title> <para>

1 0

git:master:fe0e0b89: presence: renamed global vars to add common module prefix
by Daniel-Constantin Mierla 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: fe0e0b894b16478ae490eac6b873ea6c39dd5b2f URL: https://github.com/kamailio/kamailio/commit/fe0e0b894b16478ae490eac6b873ea6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-14T11:10:55+02:00 presence: renamed global vars to add common module prefix - better protection against name conflicts, as this module is used by other modules and can run in library mode --- Modified: src/modules/presence/event_list.c Modified: src/modules/presence/event_list.h Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c Modified: src/modules/presence/subscribe.c Modified: src/modules/presence/utils_func.c --- Diff: https://github.com/kamailio/kamailio/commit/fe0e0b894b16478ae490eac6b873ea6… Patch: https://github.com/kamailio/kamailio/commit/fe0e0b894b16478ae490eac6b873ea6…

1 0

git:master:6ef70d73: presence: removed unused global var log_buf
by Daniel-Constantin Mierla 14 Apr '20

14 Apr '20

Module: kamailio Branch: master Commit: 6ef70d7366d60c1c7c73aff987193340e0b7c938 URL: https://github.com/kamailio/kamailio/commit/6ef70d7366d60c1c7c73aff98719334… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-14T09:19:44+02:00 presence: removed unused global var log_buf --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/6ef70d7366d60c1c7c73aff98719334… Patch: https://github.com/kamailio/kamailio/commit/6ef70d7366d60c1c7c73aff98719334… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 0155cf286f..52ad35bef5 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -81,7 +81,6 @@ MODULE_VERSION #define P_TABLE_VERSION 5 #define ACTWATCH_TABLE_VERSION 12 -char *log_buf = NULL; static int clean_period = 100; static int db_update_period = 100; int pres_local_log_level = L_INFO;

1 0

git:master:0c29e829: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 13 Apr '20

13 Apr '20

Module: kamailio Branch: master Commit: 0c29e829cb4a268f4755afbb74af17304fb276dd URL: https://github.com/kamailio/kamailio/commit/0c29e829cb4a268f4755afbb74af173… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-13T20:01:08+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/0c29e829cb4a268f4755afbb74af173… Patch: https://github.com/kamailio/kamailio/commit/0c29e829cb4a268f4755afbb74af173… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 69abb45556..04503393a2 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -704,7 +704,7 @@ modparam("tls", "certificate", "/usr/local/etc/kamailio/my_certificate.pem") Example 1.5. Set private_key parameter ... -modparam("tls", "private", "/usr/local/etc/kamailio/my_pkey.pem") +modparam("tls", "private_key", "/usr/local/etc/kamailio/my_pkey.pem") ... 10.4. ca_list (string)

1 0

[kamailio/kamailio] tls: fix typo in documentation (#2283)
by Fred Posner 13 Apr '20

13 Apr '20

- params.xml: replace "private" with "private_key"   #### 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:  - [X] PR should be backported to stable branches - [X] 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/2283 -- Commit Summary -- * tls: fix typo in documentation -- File Changes -- M src/modules/tls/doc/params.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2283.patch https://github.com/kamailio/kamailio/pull/2283.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/2283

2 2

git:master:6b731cb0: Merge pull request #2283 from fredposner/master
by GitHub 13 Apr '20

13 Apr '20

Module: kamailio Branch: master Commit: 6b731cb07ba96675c9a61dd156bee0cdccfe60a4 URL: https://github.com/kamailio/kamailio/commit/6b731cb07ba96675c9a61dd156bee0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-13T19:49:46+02:00 Merge pull request #2283 from fredposner/master tls: fix typo in documentation --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b731cb07ba96675c9a61dd156bee0c… Patch: https://github.com/kamailio/kamailio/commit/6b731cb07ba96675c9a61dd156bee0c… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index a04827b44b..eb78ac31b6 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -160,7 +160,7 @@ modparam("tls", "certificate", "/usr/local/etc/kamailio/my_certificate.pem") <title>Set <varname>private_key</varname> parameter</title> <programlisting> ... -modparam("tls", "private", "/usr/local/etc/kamailio/my_pkey.pem") +modparam("tls", "private_key", "/usr/local/etc/kamailio/my_pkey.pem") ... </programlisting> </example>

1 0

git:master:ad919858: tls: fix typo in documentation
by fredposner 13 Apr '20

13 Apr '20

Module: kamailio Branch: master Commit: ad91985849e46beee757d48ee9041b81bef9bd81 URL: https://github.com/kamailio/kamailio/commit/ad91985849e46beee757d48ee9041b8… Author: fredposner <fred(a)qxork.com> Committer: fredposner <fred(a)qxork.com> Date: 2020-04-13T11:49:06-04:00 tls: fix typo in documentation - params.xml: replace "private" with "private_key" --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/ad91985849e46beee757d48ee9041b8… Patch: https://github.com/kamailio/kamailio/commit/ad91985849e46beee757d48ee9041b8… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index a04827b44b..eb78ac31b6 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -160,7 +160,7 @@ modparam("tls", "certificate", "/usr/local/etc/kamailio/my_certificate.pem") <title>Set <varname>private_key</varname> parameter</title> <programlisting> ... -modparam("tls", "private", "/usr/local/etc/kamailio/my_pkey.pem") +modparam("tls", "private_key", "/usr/local/etc/kamailio/my_pkey.pem") ... </programlisting> </example>

1 0

git:master:e2cdcdb9: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 13 Apr '20

13 Apr '20

Module: kamailio Branch: master Commit: e2cdcdb9e8fb7cafce4cf8d4b2821fcfa1cd1917 URL: https://github.com/kamailio/kamailio/commit/e2cdcdb9e8fb7cafce4cf8d4b2821fc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-13T17:46:11+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/e2cdcdb9e8fb7cafce4cf8d4b2821fc… Patch: https://github.com/kamailio/kamailio/commit/e2cdcdb9e8fb7cafce4cf8d4b2821fc… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 27e364be2d..f2a4bc98e9 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -173,7 +173,7 @@ request_route { request_route { ... secsipid_add_identity("$fU", "$rU", "A", "", - "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")); + "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem"); ... } ...

1 0

git:master:bc538f24: secsipid: docs - removed extra parentheses in example
by Daniel-Constantin Mierla 13 Apr '20

13 Apr '20

Module: kamailio Branch: master Commit: bc538f24f7de2f805e5ba907f1cbf99de7c807d0 URL: https://github.com/kamailio/kamailio/commit/bc538f24f7de2f805e5ba907f1cbf99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-13T17:34:56+02:00 secsipid: docs - removed extra parentheses in example --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bc538f24f7de2f805e5ba907f1cbf99… Patch: https://github.com/kamailio/kamailio/commit/bc538f24f7de2f805e5ba907f1cbf99… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index a988e30ed1..ac5884679f 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -164,7 +164,7 @@ request_route { request_route { ... secsipid_add_identity("$fU", "$rU", "A", "", - "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")); + "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem"); ... } ...

1 0

git:master:37fdb5e9: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 13 Apr '20

13 Apr '20

Module: kamailio Branch: master Commit: 37fdb5e9ba6e0c52812b311a167ae0ad8fd662a9 URL: https://github.com/kamailio/kamailio/commit/37fdb5e9ba6e0c52812b311a167ae0a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-13T17:31:14+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/37fdb5e9ba6e0c52812b311a167ae0a… Patch: https://github.com/kamailio/kamailio/commit/37fdb5e9ba6e0c52812b311a167ae0a… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 7889496941..27e364be2d 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -172,8 +172,8 @@ request_route { ... request_route { ... - secsipid_add_identity("$fU", "$rU", "A", "", "http://kamailio.org/stir/$rd/c -ert.pem", "/secsipid/$rd/key.pem")); + secsipid_add_identity("$fU", "$rU", "A", "", + "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")); ... } ... @@ -197,8 +197,8 @@ ert.pem", "/secsipid/$rd/key.pem")); go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba -cp secsipid.h libsecsipid.h libsecsipid.a /path/to/kamailio/src/modules/secsipid -/ +cp secsipid.h libsecsipid.h libsecsipid.a \ + /path/to/kamailio/src/modules/secsipid/ cd /path/to/kamailio/ make modules modules=src/modules/secsipid/ ...

1 0

git:master:85136f92: secsipid: reformatted long lines in examples to fit properly in README
by Daniel-Constantin Mierla 13 Apr '20

13 Apr '20

Module: kamailio Branch: master Commit: 85136f925c80a73618b1d9e4c24a30edae1bbb1e URL: https://github.com/kamailio/kamailio/commit/85136f925c80a73618b1d9e4c24a30e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-13T17:29:33+02:00 secsipid: reformatted long lines in examples to fit properly in README --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/85136f925c80a73618b1d9e4c24a30e… Patch: https://github.com/kamailio/kamailio/commit/85136f925c80a73618b1d9e4c24a30e… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 79e77fc487..a988e30ed1 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -163,7 +163,8 @@ request_route { ... request_route { ... - secsipid_add_identity("$fU", "$rU", "A", "", "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")); + secsipid_add_identity("$fU", "$rU", "A", "", + "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")); ... } ... @@ -192,7 +193,8 @@ request_route { go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba -cp secsipid.h libsecsipid.h libsecsipid.a /path/to/kamailio/src/modules/secsipid/ +cp secsipid.h libsecsipid.h libsecsipid.a \ + /path/to/kamailio/src/modules/secsipid/ cd /path/to/kamailio/ make modules modules=src/modules/secsipid/ ...

1 0

git:master:fd409bad: secsipid: added missing module file
by Daniel-Constantin Mierla 13 Apr '20

13 Apr '20

Module: kamailio Branch: master Commit: fd409bad5ce9f40cf6fa5b4473967ec12499ec07 URL: https://github.com/kamailio/kamailio/commit/fd409bad5ce9f40cf6fa5b4473967ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-13T17:27:21+02:00 secsipid: added missing module file --- Added: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fd409bad5ce9f40cf6fa5b4473967ec… Patch: https://github.com/kamailio/kamailio/commit/fd409bad5ce9f40cf6fa5b4473967ec…

1 0

git:master:5f31a56a: pkg/kamailio: fixed python3 deps for RHEL 6
by Sergey Safarov 13 Apr '20

13 Apr '20

Module: kamailio Branch: master Commit: 5f31a56acd25f892e6275e6ac786677f2eb2be0c URL: https://github.com/kamailio/kamailio/commit/5f31a56acd25f892e6275e6ac786677… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-04-13T17:15:15+03:00 pkg/kamailio: fixed python3 deps for RHEL 6 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/5f31a56acd25f892e6275e6ac786677… Patch: https://github.com/kamailio/kamailio/commit/5f31a56acd25f892e6275e6ac786677… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f00d55058e..3c68a9a002 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1113,6 +1113,10 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} +# python3 does not exist in RHEL 6 and similar dist. +%if 0%{?rhel} == 6 +sed -i -e 's/python3/python2/' utils/kamctl/dbtextdb/dbtextdb.py +%endif %build ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version}

1 0

Re: [sr-dev] [kamailio/kamailio] app_python3: Makefile - suppress warning if --embed is not supported by python3-config (392688f)
by micmac1 13 Apr '20

13 Apr '20

> @micmac1: I did it because after merging your PR, I got usage message on macos: > > ``` > $ python3-config --ldflags --embed > Usage: /opt/local/bin/python3-config [--prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir] > ``` > > I change it and no usage printed: > > ``` > $ python3-config --ldflags --embed 2>/dev/null > ``` Interesting. Maybe your python3-config is patched. Thanks! -- 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/commit/392688fc756a97f65c2433bb6af7ade…

1 0

Re: [sr-dev] [kamailio/kamailio] app_python3: Makefile - suppress warning if --embed is not supported by python3-config (392688f)
by Daniel-Constantin Mierla 13 Apr '20

13 Apr '20

@micmac1: I did it because after merging your PR, I got usage message on macos: ``` $ python3-config --ldflags --embed Usage: /opt/local/bin/python3-config [--prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir] ``` I change it and no usage printed: ``` $ python3-config --ldflags --embed 2>/dev/null ``` -- 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/commit/392688fc756a97f65c2433bb6af7ade…

1 0

[kamailio/kamailio] tls: fix typo in documentation (#2281)
by Fred Posner 13 Apr '20

13 Apr '20

- replace "private" with "private_key"   #### Pre-Submission Checklist    - [X ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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:  - [X ] PR should be backported to stable branches - [X ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - replace "private" with "private_key" You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2281 -- Commit Summary -- * tls: fix typo in documentation -- File Changes -- M src/modules/tls/README (2) M src/modules/tls/doc/params.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2281.patch https://github.com/kamailio/kamailio/pull/2281.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/2281

1 2

Re: [sr-dev] [kamailio/kamailio] app_python3: Makefile - suppress warning if --embed is not supported by python3-config (392688f)
by micmac1 13 Apr '20

13 Apr '20

Hello @miconda Just as a comment, I thought about this, too, but in the end decided against it because the python3(.x)-config scripts don't send out error messages to stderr. exit_with_usage() echoes to stdout. So if there is an error message it'll be saved inside "tmp_py3_libs". Kind regards, Seb -- 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/commit/392688fc756a97f65c2433bb6af7ade…

1 0

git:master:28be94ea: misc/examples/kemi: make reply code integer everywhere
by Daniel-Constantin Mierla 13 Apr '20

13 Apr '20

Module: kamailio Branch: master Commit: 28be94ea97216ba7ac1420130cc01ebda167c5d8 URL: https://github.com/kamailio/kamailio/commit/28be94ea97216ba7ac1420130cc01eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-13T12:14:52+02:00 misc/examples/kemi: make reply code integer everywhere --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/28be94ea97216ba7ac1420130cc01eb… Patch: https://github.com/kamailio/kamailio/commit/28be94ea97216ba7ac1420130cc01eb… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 040af8656c..7cc880f290 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -219,10 +219,10 @@ function ksr_route_location() if (rc<0) { KSR.tm.t_newtran(); if (rc==-1 || rc==-3) { - KSR.sl.send_reply("404", "Not Found"); + KSR.sl.send_reply(404, "Not Found"); KSR.x.exit(); } else if (rc==-2) { - KSR.sl.send_reply("405", "Method Not Allowed"); + KSR.sl.send_reply(405, "Method Not Allowed"); KSR.x.exit(); } } diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index b28eea0ff1..4be9b13587 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -220,10 +220,10 @@ function ksr_route_location() if rc<0 then KSR.tm.t_newtran(); if rc==-1 or rc==-3 then - KSR.sl.send_reply("404", "Not Found"); + KSR.sl.send_reply(404, "Not Found"); KSR.x.exit(); elseif rc==-2 then - KSR.sl.send_reply("405", "Method Not Allowed"); + KSR.sl.send_reply(405, "Method Not Allowed"); KSR.x.exit(); end end diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index b1c3ae4a77..4926ec8317 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -223,10 +223,10 @@ function ksr_route_location() if (rc<0) { KSR.tm.t_newtran(); if (rc==-1 || rc==-3) { - KSR.sl.send_reply("404", "Not Found"); + KSR.sl.send_reply(404, "Not Found"); KSR.x.exit(); } else if (rc==-2) { - KSR.sl.send_reply("405", "Method Not Allowed"); + KSR.sl.send_reply(405, "Method Not Allowed"); KSR.x.exit(); } }

1 0

git:master:392688fc: app_python3: Makefile - suppress warning if --embed is not supported by python3-config
by Daniel-Constantin Mierla 12 Apr '20

12 Apr '20

Module: kamailio Branch: master Commit: 392688fc756a97f65c2433bb6af7adedca4e0abf URL: https://github.com/kamailio/kamailio/commit/392688fc756a97f65c2433bb6af7ade… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-12T12:06:52+02:00 app_python3: Makefile - suppress warning if --embed is not supported by python3-config --- Modified: src/modules/app_python3/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/392688fc756a97f65c2433bb6af7ade… Patch: https://github.com/kamailio/kamailio/commit/392688fc756a97f65c2433bb6af7ade… --- diff --git a/src/modules/app_python3/Makefile b/src/modules/app_python3/Makefile index d31cd6ab10..3594f104c8 100644 --- a/src/modules/app_python3/Makefile +++ b/src/modules/app_python3/Makefile @@ -12,7 +12,7 @@ NAME=app_python3.so PYTHON3?=python3 LIBS=${shell \ - tmp_py3_libs=$$(${PYTHON3}-config --ldflags --embed) || \ + tmp_py3_libs=$$(${PYTHON3}-config --ldflags --embed 2>/dev/null) || \ tmp_py3_libs=$$(${PYTHON3}-config --ldflags); \ echo $$tmp_py3_libs}

1 0

[kamailio/kamailio] app_python3: update Python3 detection mechanism (#2282)
by micmac1 12 Apr '20

12 Apr '20

This commit - removes the python calls whose output is never actually used. - changes the include discovery to use python3(.x)-config. This is preferable because it also works for cross-compiling. Calling python3(.x) directly will always provide host flags, which for cross-compiling is not feasible. - updates LDFLAGS discovery to also work with >= Python 3.8. To achieve this python3(.x)-config is first run with the argument "--embed". If this does not succeed (exit status 1) python3(.x)-config is run again without "--embed". This is the method suggested by Python upstream to provide backwards compatibility. See [1] for more details. [1] https://docs.python.org/3/whatsnew/3.8.html Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hi all, While trying to get app_python3 going on OpenWrt I stumbled over this. We're cross-compiling and I got the wrong includes (host includes instead of target includes). And then there was also the "-lpython3.x" missing because we're using python 3.8 which doesn't provide this linker flags by default anymore. So once I tried to load the module on the target device it threw an error: ``` Fri Apr 10 18:52:13 2020 daemon.err kamailio[15622]: 0(15622) ERROR: <core> [core/sr_module.c:512]: load_module(): could not open module </usr/lib/kamailio/modules/app_python3.so>: Error relocating /usr/lib/kamailio/modules/app_python3.so: PyTuple_New: symbol not found Fri Apr 10 18:52:13 2020 daemon.err kamailio[15622]: 0(15622) CRITICAL: <core> [core/cfg.y:3543]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 124, column 12-27: failed to load module ``` This pull requested fixes this. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2282 -- Commit Summary -- * app_python3: update Python3 detection mechanism -- File Changes -- M src/modules/app_python3/Makefile (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2282.patch https://github.com/kamailio/kamailio/pull/2282.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/2282

2 2

git:master:35251dfb: Merge pull request #2282 from micmac1/py3-detect
by GitHub 12 Apr '20

12 Apr '20

Module: kamailio Branch: master Commit: 35251dfbd17d27478063be56f7f96ca62c8d480b URL: https://github.com/kamailio/kamailio/commit/35251dfbd17d27478063be56f7f96ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-12T11:56:40+02:00 Merge pull request #2282 from micmac1/py3-detect app_python3: update Python3 detection mechanism --- Modified: src/modules/app_python3/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/35251dfbd17d27478063be56f7f96ca… Patch: https://github.com/kamailio/kamailio/commit/35251dfbd17d27478063be56f7f96ca… --- diff --git a/src/modules/app_python3/Makefile b/src/modules/app_python3/Makefile index 1c9ff1c6b6..d31cd6ab10 100644 --- a/src/modules/app_python3/Makefile +++ b/src/modules/app_python3/Makefile @@ -11,18 +11,16 @@ NAME=app_python3.so # but no testing has been done with that. PYTHON3?=python3 -PYTHON3_VERSION=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('VERSION'))"} -PYTHON3_LIBDIR=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('LIBDIR'))"} -PYTHON3_LDFLAGS=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('LINKFORSHARED'))"} -PYTHON3_INCDIR=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_python_inc())"} - -LIBS=${shell ${PYTHON3}-config --ldflags} +LIBS=${shell \ + tmp_py3_libs=$$(${PYTHON3}-config --ldflags --embed) || \ + tmp_py3_libs=$$(${PYTHON3}-config --ldflags); \ + echo $$tmp_py3_libs} ifeq ($(OS), freebsd) LIBS+=-pthread endif -DEFS+=-I${PYTHON3_INCDIR} +DEFS+=${shell ${PYTHON3}-config --includes} include ../../Makefile.modules

1 0

git:master:05af36d3: app_python3: update Python3 detection mechanism
by Sebastian Kemper 12 Apr '20

12 Apr '20

Module: kamailio Branch: master Commit: 05af36d34aa2668780aa111878206c6797fa98b0 URL: https://github.com/kamailio/kamailio/commit/05af36d34aa2668780aa111878206c6… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2020-04-12T09:37:50+02:00 app_python3: update Python3 detection mechanism This commit - removes the python calls whose output is never actually used. - changes the include discovery to use python3(.x)-config. This is preferable because it also works for cross-compiling. Calling python3(.x) directly will always provide host flags, which for cross-compiling is not feasible. - updates LDFLAGS discovery to also work with >= Python 3.8. To achieve this python3(.x)-config is first run with the argument "--embed". If this does not succeed (exit status 1) python3(.x)-config is run again without "--embed". This is the method suggested by Python upstream to provide backwards compatibility. See [1] for more details. [1] https://docs.python.org/3/whatsnew/3.8.html Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/app_python3/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/05af36d34aa2668780aa111878206c6… Patch: https://github.com/kamailio/kamailio/commit/05af36d34aa2668780aa111878206c6… --- diff --git a/src/modules/app_python3/Makefile b/src/modules/app_python3/Makefile index 1c9ff1c6b6..d31cd6ab10 100644 --- a/src/modules/app_python3/Makefile +++ b/src/modules/app_python3/Makefile @@ -11,18 +11,16 @@ NAME=app_python3.so # but no testing has been done with that. PYTHON3?=python3 -PYTHON3_VERSION=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('VERSION'))"} -PYTHON3_LIBDIR=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('LIBDIR'))"} -PYTHON3_LDFLAGS=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('LINKFORSHARED'))"} -PYTHON3_INCDIR=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_python_inc())"} - -LIBS=${shell ${PYTHON3}-config --ldflags} +LIBS=${shell \ + tmp_py3_libs=$$(${PYTHON3}-config --ldflags --embed) || \ + tmp_py3_libs=$$(${PYTHON3}-config --ldflags); \ + echo $$tmp_py3_libs} ifeq ($(OS), freebsd) LIBS+=-pthread endif -DEFS+=-I${PYTHON3_INCDIR} +DEFS+=${shell ${PYTHON3}-config --includes} include ../../Makefile.modules

1 0

git:master:b2410d52: modules: readme files regenerated - app_sqlang ... [skip ci]
by Kamailio Dev 11 Apr '20

11 Apr '20

Module: kamailio Branch: master Commit: b2410d5256a8aad1ad98e1574e7af29fa975f47d URL: https://github.com/kamailio/kamailio/commit/b2410d5256a8aad1ad98e1574e7af29… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-11T18:46:09+02:00 modules: readme files regenerated - app_sqlang ... [skip ci] --- Modified: src/modules/app_sqlang/README --- Diff: https://github.com/kamailio/kamailio/commit/b2410d5256a8aad1ad98e1574e7af29… Patch: https://github.com/kamailio/kamailio/commit/b2410d5256a8aad1ad98e1574e7af29… --- diff --git a/src/modules/app_sqlang/README b/src/modules/app_sqlang/README index ff1770c1fd..bdf804dd79 100644 --- a/src/modules/app_sqlang/README +++ b/src/modules/app_sqlang/README @@ -36,7 +36,7 @@ Daniel-Constantin Mierla 5. RPC Commands - 5.1. app_swlang.reload + 5.1. app_sqlang.reload 5.2. app_sqlang.api_list 6. Example of usage @@ -72,7 +72,7 @@ Chapter 1. Admin Guide 5. RPC Commands - 5.1. app_swlang.reload + 5.1. app_sqlang.reload 5.2. app_sqlang.api_list 6. Example of usage @@ -201,10 +201,10 @@ if(!sqlang_runstring('KSR.dbg("Hello World from $fU\n")')) 5. RPC Commands - 5.1. app_swlang.reload + 5.1. app_sqlang.reload 5.2. app_sqlang.api_list -5.1. app_swlang.reload +5.1. app_sqlang.reload Marks the need to reload the SQLang script pointed by 'load' parameter.The actual reload is done by every working process when the

1 0

git:master:a072e170: app_sqlang: docs - fix for rpc command name
by Daniel-Constantin Mierla 11 Apr '20

11 Apr '20

Module: kamailio Branch: master Commit: a072e170c07370f97716ae719abb35c508d98564 URL: https://github.com/kamailio/kamailio/commit/a072e170c07370f97716ae719abb35c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-11T18:35:56+02:00 app_sqlang: docs - fix for rpc command name --- Modified: src/modules/app_sqlang/doc/app_sqlang_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a072e170c07370f97716ae719abb35c… Patch: https://github.com/kamailio/kamailio/commit/a072e170c07370f97716ae719abb35c… --- diff --git a/src/modules/app_sqlang/doc/app_sqlang_admin.xml b/src/modules/app_sqlang/doc/app_sqlang_admin.xml index ba4bb16740..83ac5ed5e3 100644 --- a/src/modules/app_sqlang/doc/app_sqlang_admin.xml +++ b/src/modules/app_sqlang/doc/app_sqlang_admin.xml @@ -209,7 +209,7 @@ if(!sqlang_runstring('KSR.dbg("Hello World from $fU\n")')) <title>RPC Commands</title> <section id="app_sqlang.r.reload"> <title> - <function moreinfo="none">app_swlang.reload</function> + <function moreinfo="none">app_sqlang.reload</function> </title> <para> Marks the need to reload the SQLang script pointed by 'load'

1 0

git:5.3:065668d6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 11 Apr '20

11 Apr '20

Module: kamailio Branch: 5.3 Commit: 065668d6264573d33cd67e22272f5706b935a981 URL: https://github.com/kamailio/kamailio/commit/065668d6264573d33cd67e22272f570… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-11T18:31:44+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/msilo/README --- Diff: https://github.com/kamailio/kamailio/commit/065668d6264573d33cd67e22272f570… Patch: https://github.com/kamailio/kamailio/commit/065668d6264573d33cd67e22272f570…

1 0

git:master:e61e9dc1: modules: readme files regenerated - msilo ... [skip ci]
by Kamailio Dev 11 Apr '20

11 Apr '20

Module: kamailio Branch: master Commit: e61e9dc11a134b576c172e710ad8d9077cafa499 URL: https://github.com/kamailio/kamailio/commit/e61e9dc11a134b576c172e710ad8d90… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-11T18:31:19+02:00 modules: readme files regenerated - msilo ... [skip ci] --- Modified: src/modules/msilo/README --- Diff: https://github.com/kamailio/kamailio/commit/e61e9dc11a134b576c172e710ad8d90… Patch: https://github.com/kamailio/kamailio/commit/e61e9dc11a134b576c172e710ad8d90…

1 0

git:5.3:85dae9f1: msilo: docs - fixed position of parameter and whitespacing
by Daniel-Constantin Mierla 11 Apr '20

11 Apr '20

Module: kamailio Branch: 5.3 Commit: 85dae9f150fde01afc3bdbc1e583b997b68bde6a URL: https://github.com/kamailio/kamailio/commit/85dae9f150fde01afc3bdbc1e583b99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-11T18:24:09+02:00 msilo: docs - fixed position of parameter and whitespacing - parameter position was broken at the end of file (cherry picked from commit 1e3d7d319d07cd022c374ed2698fb905dacf50b7) --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/85dae9f150fde01afc3bdbc1e583b99… Patch: https://github.com/kamailio/kamailio/commit/85dae9f150fde01afc3bdbc1e583b99…

1 0

git:master:1e3d7d31: msilo: docs - fixed position of parameter and whitespacing
by Daniel-Constantin Mierla 11 Apr '20

11 Apr '20

Module: kamailio Branch: master Commit: 1e3d7d319d07cd022c374ed2698fb905dacf50b7 URL: https://github.com/kamailio/kamailio/commit/1e3d7d319d07cd022c374ed2698fb90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-11T18:22:42+02:00 msilo: docs - fixed position of parameter and whitespacing - parameter position was broken at the end of file --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1e3d7d319d07cd022c374ed2698fb90… Patch: https://github.com/kamailio/kamailio/commit/1e3d7d319d07cd022c374ed2698fb90…

1 0

git:master:dfe724a9: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 10 Apr '20

10 Apr '20

Module: kamailio Branch: master Commit: dfe724a95476694691ed6421f30d520bece05d5b URL: https://github.com/kamailio/kamailio/commit/dfe724a95476694691ed6421f30d520… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-10T11:16:15+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/dfe724a95476694691ed6421f30d520… Patch: https://github.com/kamailio/kamailio/commit/dfe724a95476694691ed6421f30d520…

1 0

git:master:971b79fe: siptrace: helper function to link sip msg attributes
by Daniel-Constantin Mierla 10 Apr '20

10 Apr '20

Module: kamailio Branch: master Commit: 971b79fef72ba7a6c85880160002664de8be284a URL: https://github.com/kamailio/kamailio/commit/971b79fef72ba7a6c85880160002664… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-10T11:02:55+02:00 siptrace: helper function to link sip msg attributes --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/971b79fef72ba7a6c85880160002664… Patch: https://github.com/kamailio/kamailio/commit/971b79fef72ba7a6c85880160002664…

1 0

git:master:eb3a09fb: siptrace: docs for trace_db_mode parameter
by Daniel-Constantin Mierla 10 Apr '20

10 Apr '20

Module: kamailio Branch: master Commit: eb3a09fb92af939372ac292f14850c13f8232df6 URL: https://github.com/kamailio/kamailio/commit/eb3a09fb92af939372ac292f14850c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-10T10:18:38+02:00 siptrace: docs for trace_db_mode parameter --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/eb3a09fb92af939372ac292f14850c1… Patch: https://github.com/kamailio/kamailio/commit/eb3a09fb92af939372ac292f14850c1… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index cc6ead1132..56d69cb95b 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -427,17 +427,45 @@ modparam("siptrace", "hep_version", 3) ... modparam("siptrace", "hep_capture_id", 234) ... +</programlisting> + </example> + </section> + <section id="siptrace.p.trace_db_mode"> + <title><varname>trace_db_mode</varname> (integer)</title> + <para> + If set to 1, the module uses <quote>INSERT DELAYED</quote> to + store to database (when it is available, otherwise falls back + to <quote>INSERT</quote>). + </para> + <para> + If set to 2, the module uses <quote>ASYNC-INSERT</quote> to + store to database (when it is available, otherwise falls back + to <quote>INSERT</quote>). + </para> + <para> + Default value is <emphasis>0 (use <quote>INSERT</quote>)</emphasis>. + </para> + <example> + <title>Set <varname>trace_db_mode</varname> + parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "trace_db_mode", 1) +... </programlisting> </example> </section> <section id="siptrace.p.trace_delayed"> <title><varname>trace_delayed</varname> (integer)</title> + <para> + Kept for backward compatibily, use trace_db_mode instead. + </para> <para> - Use <quote>INSERT DELAYED</quote> to store to database when it is available, - instead of <quote>INSERT</quote>. + If set to non-zero, ot sets trace_db_mode paremter to 1 + when the module is initialized. </para> <para> - Default value is <emphasis>0 (off)</emphasis>. + Default value is <emphasis>0</emphasis>. </para> <example> <title>Set <varname>trace_delayed</varname>

1 0

git:master:bb2894a4: siptrace: helper function for db insert
by Daniel-Constantin Mierla 10 Apr '20

10 Apr '20

Module: kamailio Branch: master Commit: bb2894a453d8b58f34b41870d057c21385b3af81 URL: https://github.com/kamailio/kamailio/commit/bb2894a453d8b58f34b41870d057c21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-10T10:18:38+02:00 siptrace: helper function for db insert --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/bb2894a453d8b58f34b41870d057c21… Patch: https://github.com/kamailio/kamailio/commit/bb2894a453d8b58f34b41870d057c21… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index dd508372d4..5cb4e79b67 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -567,6 +567,24 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, return ret; } +static int sip_trace_insert_db(db_key_t *db_keys, db_val_t *db_vals, + int db_nkeys, char *dtext) +{ + LM_DBG("storing info - %s\n", dtext); + if(trace_delayed != 0 && db_funcs.insert_delayed != NULL) { + if(db_funcs.insert_delayed(db_con, db_keys, db_vals, db_nkeys) < 0) { + LM_ERR("error storing trace - %s\n", dtext); + return -1; + } + } else { + if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { + LM_ERR("error storing trace - %s\n", dtext); + return -1; + } + } + return 0; +} + static int sip_trace_store_db(siptrace_data_t *sto) { if((trace_to_database == 0) && ((_siptrace_mode & SIPTRACE_MODE_DB) == 0)) { @@ -646,17 +664,8 @@ static int sip_trace_store_db(siptrace_data_t *sto) db_vals[9].val.str_val.s = ""; db_vals[9].val.str_val.len = 0; - LM_DBG("storing info...\n"); - if(trace_delayed != 0 && db_funcs.insert_delayed != NULL) { - if(db_funcs.insert_delayed(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } - } else { - if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } + if(sip_trace_insert_db(db_keys, db_vals, NR_KEYS, "no user") < 0) { + goto error; } #ifdef STATISTICS update_stat(sto->stat, 1); @@ -668,34 +677,16 @@ static int sip_trace_store_db(siptrace_data_t *sto) db_vals[9].val.str_val = sto->avp_value.s; - LM_DBG("storing info...\n"); - if(trace_delayed != 0 && db_funcs.insert_delayed != NULL) { - if(db_funcs.insert_delayed(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } - } else { - if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } + if(sip_trace_insert_db(db_keys, db_vals, NR_KEYS, "first user") < 0) { + goto error; } sto->avp = search_next_avp(&sto->state, &sto->avp_value); while(sto->avp != NULL) { db_vals[9].val.str_val = sto->avp_value.s; - LM_DBG("storing info...\n"); - if(trace_delayed != 0 && db_funcs.insert_delayed != NULL) { - if(db_funcs.insert_delayed(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } - } else { - if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; - } + if(sip_trace_insert_db(db_keys, db_vals, NR_KEYS, "extra user") < 0) { + goto error; } sto->avp = search_next_avp(&sto->state, &sto->avp_value); }

1 0

git:master:e3a298e3: siptrace: support for using async-insert to store records to database
by Daniel-Constantin Mierla 10 Apr '20

10 Apr '20

Module: kamailio Branch: master Commit: e3a298e30a7d303bbea9a2511e1878295dceb34e URL: https://github.com/kamailio/kamailio/commit/e3a298e30a7d303bbea9a2511e18782… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-10T10:18:38+02:00 siptrace: support for using async-insert to store records to database - new parameter trace_db_mode to control what type of db insert operation is done --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/e3a298e30a7d303bbea9a2511e18782… Patch: https://github.com/kamailio/kamailio/commit/e3a298e30a7d303bbea9a2511e18782… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 5cb4e79b67..0a90e3fe23 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -158,7 +158,8 @@ int *trace_on_flag = NULL; int trace_sl_acks = 1; int trace_to_database = 1; -int trace_delayed = 0; +int trace_db_delayed = 0; +int trace_db_mode = 0; int hep_mode_on = 0; int hep_version = 1; @@ -249,7 +250,8 @@ static param_export_t params[] = { {"send_sock_name", PARAM_STR, &trace_send_sock_name_str}, {"hep_version", INT_PARAM, &hep_version}, {"hep_capture_id", INT_PARAM, &hep_capture_id}, - {"trace_delayed", INT_PARAM, &trace_delayed}, + {"trace_delayed", INT_PARAM, &trace_db_delayed}, + {"trace_db_mode", INT_PARAM, &trace_db_mode}, {"trace_init_mode", PARAM_INT, &_siptrace_init_mode}, {"trace_mode", PARAM_INT, &_siptrace_mode}, {0, 0, 0} @@ -300,6 +302,10 @@ static int mod_init(void) } #endif + if(trace_db_delayed!=0) { + trace_db_mode = 1; + } + if(siptrace_init_rpc() != 0) { LM_ERR("failed to register RPC commands\n"); return -1; @@ -571,9 +577,14 @@ static int sip_trace_insert_db(db_key_t *db_keys, db_val_t *db_vals, int db_nkeys, char *dtext) { LM_DBG("storing info - %s\n", dtext); - if(trace_delayed != 0 && db_funcs.insert_delayed != NULL) { + if(trace_db_mode = 2 && db_funcs.insert_async != NULL) { + if(db_funcs.insert_async(db_con, db_keys, db_vals, db_nkeys) < 0) { + LM_ERR("error storing trace - async - %s\n", dtext); + return -1; + } + } else if(trace_db_mode != 1 && db_funcs.insert_delayed != NULL) { if(db_funcs.insert_delayed(db_con, db_keys, db_vals, db_nkeys) < 0) { - LM_ERR("error storing trace - %s\n", dtext); + LM_ERR("error storing trace - delayed - %s\n", dtext); return -1; } } else {

1 0

Kamailio stucks at __read_nocancel during stop.
by Andrey Deykunov 09 Apr '20

09 Apr '20

Hi, We're getting periodically core dumps when stopping Kamailio: GNU gdb (Debian 7.12-6) 7.12.0.20161007-git Copyright (C) 2016 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html > This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /var/lib/ums/sbin/kamailio...done. [New LWP 9832] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/var/lib/ums/sbin/kamailio -m 2048 -M 12 -P /var/run/kamailio/kamailio.pid -f /'. Program terminated with signal SIGABRT, Aborted. #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:51 #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:51 #1 0x00007f79c24e842a in __GI_abort () at abort.c:89 #2 0x000000000043f92a in sig_alarm_abort (signo=14) at main.c:679 #3 <signal handler called> #4 0x00007f79c258f910 in __read_nocancel () at ../sysdeps/unix/syscall-template.S:84 #5 0x00007f793cbd7421 in vio_read_buff () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #6 0x00007f793cbd8aa0 in my_real_read () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #7 0x00007f793cbd87d6 in my_net_read () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #8 0x00007f793cbd085d in cli_safe_read () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #9 0x00007f793cbd539a in cli_read_query_result () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #10 0x00007f793cbd436d in mysql_real_query () from /var/lib/ums/lib/mysql/libmysqlclient.so.16 #11 0x00007f793ce80c13 in db_mysql_submit_query (_h=0x7f79c1786890, _s=0x7f793f379250 <sql_str>) at km_dbase.c:111 #12 0x00007f793f16baba in db_do_submit_query (_h=0x7f79c1786890, _query=0x7f793f379250 <sql_str>, submit_query=0x7f793ce801a0 <db_mysql_submit_query>) at db_query.c:58 #13 0x00007f793f16e114 in db_do_delete (_h=0x7f79c1786890, _k=0x7ffeb3ca8df8, _o=0x0, _v=0x7ffeb3ca8dd0, _n=1, val2str=0x7f793cea8990 <db_mysql_val2str>, submit_query=0x7f793ce801a0 <db_mysql_submit_query>) at db_query.c:300 #14 0x00007f793ce86c17 in db_mysql_delete (_h=0x7f79c1786890, _k=0x7ffeb3ca8df8, _o=0x0, _v=0x7ffeb3ca8dd0, _n=1) at km_dbase.c:510 #15 0x00007f793f3cb841 in db_delete_ucontact_ruid (_c=0x7f794186b3c0) at ucontact.c:1552 #16 0x00007f793f3cd096 in db_delete_ucontact (_c=0x7f794186b3c0) at ucontact.c:1570 #17 0x00007f793f3ad0c0 in wb_timer (_r=0x7f79411d7330) at urecord.c:401 #18 0x00007f793f3ab451 in timer_urecord (_r=0x7f79411d7330) at urecord.c:463 #19 0x00007f793f3978aa in mem_timer_udomain (_d=0x7f7940d9baa0, istart=0, istep=1) at udomain.c:1224 #20 0x00007f793f3d4608 in synchronize_all_udomains (istart=0, istep=1) at dlist.c:756 #21 0x00007f793f3a2768 in destroy () at usrloc_mod.c:464 #22 0x0000000000637e2c in destroy_modules () at core/sr_module.c:746 #23 0x000000000041c4d8 in cleanup (show_status=1) at main.c:555 #24 0x0000000000423af7 in shutdown_children (sig=15, show_status=1) at main.c:696 #25 0x000000000041f081 in handle_sigs () at main.c:727 #26 0x0000000000432a01 in main_loop () at main.c:1806 #27 0x000000000043df6f in main (argc=9, argv=0x7ffeb3cac348) at main.c:2802 Looks like libmysql stucks at __read_nocancel() syscall. The exit_timeout parameter is set by default (60 sec), Kamailio version 5.3.1. Any ideas? Thanks, Andrey

2 1

git:master:430e00a2: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 430e00a208c9ae4c2cdc39d628fc0a1d23f30f81 URL: https://github.com/kamailio/kamailio/commit/430e00a208c9ae4c2cdc39d628fc0a1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-09T09:46:16+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/430e00a208c9ae4c2cdc39d628fc0a1… Patch: https://github.com/kamailio/kamailio/commit/430e00a208c9ae4c2cdc39d628fc0a1… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index cfae6ac338..cb6413f981 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -2237,17 +2237,33 @@ kamcmd dlg.is_alive callid123 fromtag123 totag123 9.16. dlg.briefing - Lists fewer attributes for dialog records in memory. + Lists fewer attributes for dialog records in memory. The dialog hash + entry and id are added always, the rest of them are a matter of 'attrs' + parameter. Name: dlg.briefing Parameters: - * none - no parameter + * attrs - (optional) a list of characters (flags) representing the + fields to be added to the response. If is missing, its default + value is 'ftcFT' (note the characters are case sensitive). + The characters can be: + + f - From URI + + t - To URI + + c - Call-ID + + F - From tag + + T - To tag + + I - Init time + + S - Start time + + E - End time + + s - State RPC Command Example: ... kamctl rpc dlg.briefing ... +kamctl rpc dlg.briefing "ft" +... 10. Exported Variables

3 2

git:master:661fc019: misc: examples kemi, don't fail if optional modules are not loaded
by Victor Seva 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 661fc0193da9e559e22b83b006db3e23345c092c URL: https://github.com/kamailio/kamailio/commit/661fc0193da9e559e22b83b006db3e2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-09T13:48:06+02:00 misc: examples kemi, don't fail if optional modules are not loaded kamailio-basic-kemi.cfg has some define instructions that can be removed ( WITH_MYSQL, WITH_AUTH, ...) So lets make sure that modules are there in the lua script before using the defined routes. --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/661fc0193da9e559e22b83b006db3e2… Patch: https://github.com/kamailio/kamailio/commit/661fc0193da9e559e22b83b006db3e2… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index 44a09186fd..b28eea0ff1 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -240,8 +240,11 @@ end -- IP authorization and user uthentication function ksr_route_auth() + if not KSR.auth then + return 1; + end - if not KSR.is_REGISTER() then + if KSR.permissions and not KSR.is_REGISTER() then if KSR.permissions.allow_source_address(1)>0 then -- source IP allowed return 1; @@ -273,6 +276,9 @@ end -- Caller NAT detection function ksr_route_natdetect() + if not KSR.nathelper then + return 1; + end KSR.force_rport(); if KSR.nathelper.nat_uac_test(19)>0 then if KSR.is_REGISTER() then @@ -287,6 +293,9 @@ end -- RTPProxy control function ksr_route_natmanage() + if not KSR.rtpproxy then + return 1; + end if KSR.siputils.is_request()>0 then if KSR.siputils.has_totag()>0 then if KSR.rr.check_route_param("nat=yes")>0 then @@ -317,6 +326,9 @@ end -- URI update for dialog requests function ksr_route_dlguri() + if not KSR.nathelper then + return 1; + end if not KSR.isdsturiset() then KSR.nathelper.handle_ruri_alias(); end

1 0

git:master:e1239717: misc: kemi examples, add missing kemix module
by Victor Seva 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: e123971726a8d18627091870086ee7d244e9802f URL: https://github.com/kamailio/kamailio/commit/e123971726a8d18627091870086ee7d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-09T13:19:00+02:00 misc: kemi examples, add missing kemix module change introduced at 01ac570c2fbda800d1e00cd50305739cf0596ebf --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e123971726a8d18627091870086ee7d… Patch: https://github.com/kamailio/kamailio/commit/e123971726a8d18627091870086ee7d… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index d6859fb7d5..c1eed6c952 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -198,6 +198,7 @@ loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" +loadmodule "kemix.so" #!ifdef WITH_AUTH loadmodule "auth.so"

1 0

git:master:4507ed57: dialog: customizable list of fields for dlg.briefing rpc command
by Daniel-Constantin Mierla 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 4507ed570a881fc6cd9d364624b71b90b48ecbda URL: https://github.com/kamailio/kamailio/commit/4507ed570a881fc6cd9d364624b71b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-09T09:29:24+02:00 dialog: customizable list of fields for dlg.briefing rpc command - it can take an optional parameter to specify what fields to be added to response - hash entry and id are added by default - if the parameter is not give, then it also adds from-uri, to-uri, call-id, from-tag and to-tag --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/4507ed570a881fc6cd9d364624b71b9… Patch: https://github.com/kamailio/kamailio/commit/4507ed570a881fc6cd9d364624b71b9… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 962fceeb52..61e4b0cbcf 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -3064,9 +3064,17 @@ static const char *rpc_dlg_briefing_doc[2] = { */ static void rpc_dlg_briefing(rpc_t *rpc, void *c) { - dlg_cell_t *dlg; - unsigned int i; - void *h; + dlg_cell_t *dlg = NULL; + unsigned int i = 0; + int n = 0; + str fmt = STR_NULL; + void *h = NULL; + + n = rpc->scan(c, "S", &fmt); + if (n < 1) { + fmt.s = "ftcFT"; + fmt.len = 5; + } for( i=0 ; i<d_table->size ; i++ ) { dlg_lock( d_table, &(d_table->entries[i]) ); @@ -3075,22 +3083,81 @@ static void rpc_dlg_briefing(rpc_t *rpc, void *c) rpc->fault(c, 500, "Failed to create the structure"); return; } - if(rpc->struct_add(h, "ddSSSSSdddd", + if(rpc->struct_add(h, "dd", "h_entry", dlg->h_entry, - "h_id", dlg->h_id, - "from_uri", &dlg->from_uri, - "to_uri", &dlg->to_uri, - "call-id", &dlg->callid, - "from_tag", &dlg->tag[DLG_CALLER_LEG], - "to_tag", &dlg->tag[DLG_CALLER_LEG], - "init_ts", dlg->init_ts, - "start_ts", dlg->start_ts, - "end_ts", dlg->end_ts, - "state", dlg->state) < 0) { + "h_id", dlg->h_id) < 0) { rpc->fault(c, 500, "Failed to add fields"); return; } + for(n=0; n<fmt.len; n++) { + switch(fmt.s[n]) { + case 'f': + if(rpc->struct_add(h, "S", + "from_uri", &dlg->from_uri) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 't': + if(rpc->struct_add(h, "S", + "to_uri", &dlg->to_uri) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'c': + if(rpc->struct_add(h, "S", + "call-id", &dlg->callid) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'F': + if(rpc->struct_add(h, "S", + "from_tag", &dlg->tag[DLG_CALLER_LEG]) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'T': + if(rpc->struct_add(h, "S", + "to_tag", &dlg->tag[DLG_CALLER_LEG]) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'I': + if(rpc->struct_add(h, "d", + "init_ts", dlg->init_ts) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'S': + if(rpc->struct_add(h, "d", + "start_ts", dlg->start_ts) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 'E': + if(rpc->struct_add(h, "d", + "end_ts", dlg->end_ts) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + case 's': + if(rpc->struct_add(h, "d", + "state", dlg->state) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + } + break; + } + } + } dlg_unlock( d_table, &(d_table->entries[i]) ); }

1 0

git:master:3466fc59: dialog: docs for attrs parameter of dlg.briefing rpc command
by Daniel-Constantin Mierla 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 3466fc59abff5153c99b438f1e4becdfcba77b6b URL: https://github.com/kamailio/kamailio/commit/3466fc59abff5153c99b438f1e4becd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-09T09:42:58+02:00 dialog: docs for attrs parameter of dlg.briefing rpc command --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3466fc59abff5153c99b438f1e4becd… Patch: https://github.com/kamailio/kamailio/commit/3466fc59abff5153c99b438f1e4becd… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index aeae7da454..987bd54545 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2865,19 +2865,58 @@ dlg_reset_property("timeout-noreset"); <section id="dlg.r.briefing"> <title>dlg.briefing</title> <para> - Lists fewer attributes for dialog records in memory. + Lists fewer attributes for dialog records in memory. The dialog hash + entry and id are added always, the rest of them are a matter of 'attrs' + parameter. </para> <para>Name: <emphasis>dlg.briefing</emphasis></para> <para>Parameters:</para> <itemizedlist> <listitem><para> - <emphasis>none</emphasis> - no parameter - </para></listitem> + <emphasis>attrs</emphasis> - (optional) a list of characters (flags) + representing the fields to be added to the response. If is missing, + its default value is 'ftcFT' (note the characters are case sensitive). + </para> + <para> + The characters can be: + <itemizedlist> + <listitem><para> + <emphasis>f</emphasis> - From URI + </para></listitem> + <listitem><para> + <emphasis>t</emphasis> - To URI + </para></listitem> + <listitem><para> + <emphasis>c</emphasis> - Call-ID + </para></listitem> + <listitem><para> + <emphasis>F</emphasis> - From tag + </para></listitem> + <listitem><para> + <emphasis>T</emphasis> - To tag + </para></listitem> + <listitem><para> + <emphasis>I</emphasis> - Init time + </para></listitem> + <listitem><para> + <emphasis>S</emphasis> - Start time + </para></listitem> + <listitem><para> + <emphasis>E</emphasis> - End time + </para></listitem> + <listitem><para> + <emphasis>s</emphasis> - State + </para></listitem> + </itemizedlist> + </para> + </listitem> </itemizedlist> <para>RPC Command Example:</para> <programlisting format="linespecific"> ... kamctl rpc dlg.briefing +... +kamctl rpc dlg.briefing "ft" ... </programlisting> </section>

1 0

High memory consumption during load tests
by Andrey Deykunov 09 Apr '20

09 Apr '20

Hi, I've noticed more than 14 Gb RSS memory consumption during load test (8000 WSS clients send registrations): [image: pic2.png] [image: pic1.png] # ps aux | grep kamailio hpbx 15948 0.0 0.1 2232328 22920 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15949 1.8 3.8 2232460 789212 ? S 01:40 1:23 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15950 1.8 3.8 2232460 790164 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15951 1.7 3.8 2232460 790656 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15952 1.8 3.8 2232460 790180 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15953 1.7 3.8 2232460 788192 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15954 1.8 3.8 2232460 789484 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15955 1.7 3.8 2232460 789640 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15959 1.8 3.8 2232460 788104 ? S 01:40 1:22 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15960 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15961 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15963 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15964 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15966 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15968 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15969 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15971 0.0 0.0 2232328 8272 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15972 0.0 0.0 2232328 8152 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15973 0.0 0.0 2232328 8152 ? S 01:40 0:02 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15975 0.0 0.0 2232328 8156 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15977 4.8 4.0 2232428 835908 ? S 01:40 3:43 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15979 0.0 2.5 2232452 517192 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15980 0.0 2.5 2232328 515344 ? S 01:40 0:03 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15984 0.0 0.0 2232328 8004 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15986 0.0 0.0 2232328 8276 ? S 01:40 0:00 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15987 2.4 3.9 2232492 817888 ? S 01:40 1:50 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15989 2.4 3.9 2232492 816604 ? S 01:40 1:52 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15991 2.4 3.9 2232492 816952 ? S 01:40 1:51 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15992 2.3 3.9 2232492 817236 ? S 01:40 1:49 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15993 2.4 3.9 2232492 818900 ? S 01:40 1:51 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15994 2.4 3.9 2232492 817692 ? S 01:40 1:50 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15996 2.4 3.9 2232492 816832 ? S 01:40 1:50 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 15998 2.3 3.9 2232492 814336 ? S 01:40 1:49 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg hpbx 16001 2.1 3.1 2232328 655908 ? S 01:40 1:37 /var/lib/ums/sbin/kamailio -m 2048 -M 12 -x qm -P /var/run/kamailio/kamailio.pid -f /var/lib/ums/etc/sipp/sipp.cfg Shared memory consumption is: # /var/lib/ums/sbin/kamcmd -s tcp:localhost:2048 stats.get_statistics shmem: shmem:fragments = 4 shmem:free_size = 1291909000 shmem:max_used_size = 855663448 shmem:real_used_size = 855574648 shmem:total_size = 2147483648 shmem:used_size = 818055392 Also, I don't understand why kamailio maps more than 2 GB per every child process: # pmap -x $(pidof kamailio) | grep total total kB 2232332 659732 653680 total kB 2232496 816132 802908 total kB 2232496 818680 805456 total kB 2232496 818544 805320 total kB 2232496 818900 805676 total kB 2232496 817888 804664 total kB 2232496 818436 805212 total kB 2232496 818124 804900 total kB 2232496 818508 805284 total kB 2232332 8344 3648 total kB 2232332 8072 3580 total kB 2232332 517360 512444 total kB 2232456 519752 514580 total kB 2232432 835996 829552 total kB 2232332 8428 3576 total kB 2232332 8832 3852 total kB 2232332 10380 4604 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232332 8480 3564 total kB 2232464 789152 777596 total kB 2232464 790128 778484 total kB 2232464 790904 779004 total kB 2232464 788796 777240 total kB 2232464 790284 778384 total kB 2232464 790732 779176 total kB 2232464 790360 778716 total kB 2232464 790512 778612 total kB 2232332 22920 8992 Any ideas what is happening here? Andrey

2 2

git:master:507f4cfb: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 507f4cfbdaf634abf6414067ff889e1c569334a4 URL: https://github.com/kamailio/kamailio/commit/507f4cfbdaf634abf6414067ff889e1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-09T05:16:10+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/507f4cfbdaf634abf6414067ff889e1… Patch: https://github.com/kamailio/kamailio/commit/507f4cfbdaf634abf6414067ff889e1… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 43a81807a1..8621ba903c 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -28,6 +28,10 @@ Julien Chavanton <jchavanton(a)gmail.com> +Federico Cabiddu + + <federico.cabiddu(a)gmail.com> + Copyright © 2004 FhG FOKUS Copyright © 2005 Voice Sistem @@ -39,6 +43,8 @@ Julien Chavanton Copyright © 2015 Alessandro Arrichiello, Hewlett Packard Copyright © 2017, 2018 Julien chavanton, Flowroute + + Copyright © 2020 Federico Cabiddu, Libon __________________________________________________________________ Table of Contents @@ -1137,6 +1143,7 @@ DEST: { RWEIGHT: 50 SOCKET: SOCKNAME: + OBPROXY: } LATENCY: { AVG: 20.104000 @@ -1634,6 +1641,8 @@ kamcmd dispatcher.remove 3 sip:127.0.0.1:5075;transport=udp keepalives and has priority over 'socket' attribute. * 'ping_from' - used to set the From URI in OPTIONS keepalives. It overwrites the general ds_ping_from parameter. + * 'obproxy' - SIP URI of outbound proxy to be used when sending + pings. It overwrites the general ds_outbound_proxy parameter. 6.1.2. File Format

1 0

[kamailio/kamailio] dialog: add dialog init, start end end timestamps to the output of dl… (#2279)
by Federico Cabiddu 09 Apr '20

09 Apr '20

…g.briefing   #### 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) - [X] 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 some scenarios I found useful to have the timestamps (init, start, end) of the dialog as output of the dlg.briefing command. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2279 -- Commit Summary -- * dialog: add dialog init, start end end timestamps to the output of dlg.briefing -- File Changes -- M src/modules/dialog/dialog.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2279.patch https://github.com/kamailio/kamailio/pull/2279.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/2279

2 3

git:master:0eb265e6: dialog: add dialog init, start and end timestamps to the output of dlg.briefing
by Federico Cabiddu 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 0eb265e6c6ee78ab3f8735ddc44fc8616ae41066 URL: https://github.com/kamailio/kamailio/commit/0eb265e6c6ee78ab3f8735ddc44fc86… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-08T16:05:37+02:00 dialog: add dialog init, start and end timestamps to the output of dlg.briefing --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/0eb265e6c6ee78ab3f8735ddc44fc86… Patch: https://github.com/kamailio/kamailio/commit/0eb265e6c6ee78ab3f8735ddc44fc86… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 5dd941e7d0..962fceeb52 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -3075,7 +3075,7 @@ static void rpc_dlg_briefing(rpc_t *rpc, void *c) rpc->fault(c, 500, "Failed to create the structure"); return; } - if(rpc->struct_add(h, "ddSSSSSd", + if(rpc->struct_add(h, "ddSSSSSdddd", "h_entry", dlg->h_entry, "h_id", dlg->h_id, "from_uri", &dlg->from_uri, @@ -3083,6 +3083,9 @@ static void rpc_dlg_briefing(rpc_t *rpc, void *c) "call-id", &dlg->callid, "from_tag", &dlg->tag[DLG_CALLER_LEG], "to_tag", &dlg->tag[DLG_CALLER_LEG], + "init_ts", dlg->init_ts, + "start_ts", dlg->start_ts, + "end_ts", dlg->end_ts, "state", dlg->state) < 0) { rpc->fault(c, 500, "Failed to add fields"); return;

1 0

git:master:84a4d8d2: Merge pull request #2279 from kamailio/grumvalski/dlg_briefing_ext
by GitHub 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 84a4d8d266d7642e588f39fa1632fa46e6b47b42 URL: https://github.com/kamailio/kamailio/commit/84a4d8d266d7642e588f39fa1632fa4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-09T05:14:47+02:00 Merge pull request #2279 from kamailio/grumvalski/dlg_briefing_ext dialog: add dialog init, start end end timestamps to the output of dlâ¦ --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/84a4d8d266d7642e588f39fa1632fa4… Patch: https://github.com/kamailio/kamailio/commit/84a4d8d266d7642e588f39fa1632fa4… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 5dd941e7d0..962fceeb52 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -3075,7 +3075,7 @@ static void rpc_dlg_briefing(rpc_t *rpc, void *c) rpc->fault(c, 500, "Failed to create the structure"); return; } - if(rpc->struct_add(h, "ddSSSSSd", + if(rpc->struct_add(h, "ddSSSSSdddd", "h_entry", dlg->h_entry, "h_id", dlg->h_id, "from_uri", &dlg->from_uri, @@ -3083,6 +3083,9 @@ static void rpc_dlg_briefing(rpc_t *rpc, void *c) "call-id", &dlg->callid, "from_tag", &dlg->tag[DLG_CALLER_LEG], "to_tag", &dlg->tag[DLG_CALLER_LEG], + "init_ts", dlg->init_ts, + "start_ts", dlg->start_ts, + "end_ts", dlg->end_ts, "state", dlg->state) < 0) { rpc->fault(c, 500, "Failed to add fields"); return;

1 0

[kamailio/kamailio] Grumvalski/ds outbound proxy (#2275)
by Federico Cabiddu 09 Apr '20

09 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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 add a new attr, "obproxy", to the gateways' attrs, allowing to specify the outbound proxy used for sending pings per gateway. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2275 -- Commit Summary -- * dispatcher: add new gateway attr "obproxy" * dispatcher: docs for obproxy attr -- File Changes -- M src/modules/dispatcher/dispatch.c (16) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/dispatcher.c (6) M src/modules/dispatcher/doc/dispatcher.xml (9) M src/modules/dispatcher/doc/dispatcher_admin.xml (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2275.patch https://github.com/kamailio/kamailio/pull/2275.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/2275

3 4

git:master:8fa5e4f5: dispatcher: docs for obproxy attr
by Federico Cabiddu 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 8fa5e4f572a1ffe7efeb88cf8b80c1337f74741f URL: https://github.com/kamailio/kamailio/commit/8fa5e4f572a1ffe7efeb88cf8b80c13… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-07T15:18:34+02:00 dispatcher: docs for obproxy attr --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8fa5e4f572a1ffe7efeb88cf8b80c13… Patch: https://github.com/kamailio/kamailio/commit/8fa5e4f572a1ffe7efeb88cf8b80c13… --- diff --git a/src/modules/dispatcher/doc/dispatcher.xml b/src/modules/dispatcher/doc/dispatcher.xml index 8502aec0a3..b64151dd44 100644 --- a/src/modules/dispatcher/doc/dispatcher.xml +++ b/src/modules/dispatcher/doc/dispatcher.xml @@ -59,6 +59,11 @@ <surname>Chavanton</surname> <email>jchavanton(a)gmail.com</email> </editor> + <editor> + <firstname>Federico</firstname> + <surname>Cabiddu</surname> + <email>federico.cabiddu(a)gmail.com</email> + </editor> </authorgroup> <copyright> <year>2004</year> @@ -84,6 +89,10 @@ <year>2017, 2018</year> <holder>Julien chavanton, Flowroute</holder> </copyright> + <copyright> + <year>2020</year> + <holder>Federico Cabiddu, Libon</holder> + </copyright> </bookinfo> <toc></toc> diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index ae8102b355..30cd6a5ec1 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1316,6 +1316,7 @@ DEST: { RWEIGHT: 50 SOCKET: SOCKNAME: + OBPROXY: } LATENCY: { AVG: 20.104000 @@ -2055,6 +2056,10 @@ DEST: { 'ping_from' - used to set the From URI in OPTIONS keepalives. It overwrites the general ds_ping_from parameter. </listitem> + <listitem> + 'obproxy' - SIP URI of outbound proxy to be used when sending pings. + It overwrites the general ds_outbound_proxy parameter. + </listitem> </itemizedlist> </para> </section>

1 0

git:master:541d1bdf: Merge pull request #2275 from kamailio/grumvalski/ds_outbound_proxy
by GitHub 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 541d1bdfaf0bf28114f556be61eb434597ed894a URL: https://github.com/kamailio/kamailio/commit/541d1bdfaf0bf28114f556be61eb434… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-09T05:12:58+02:00 Merge pull request #2275 from kamailio/grumvalski/ds_outbound_proxy Grumvalski/ds outbound proxy --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/541d1bdfaf0bf28114f556be61eb434… Patch: https://github.com/kamailio/kamailio/commit/541d1bdfaf0bf28114f556be61eb434…

1 0

git:master:74ef108f: dispatcher: add new gateway attr "obproxy"
by Federico Cabiddu 09 Apr '20

09 Apr '20

Module: kamailio Branch: master Commit: 74ef108fe0371bd261acc42291d7adbba357f769 URL: https://github.com/kamailio/kamailio/commit/74ef108fe0371bd261acc42291d7adb… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-07T15:07:44+02:00 dispatcher: add new gateway attr "obproxy" --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/74ef108fe0371bd261acc42291d7adb… Patch: https://github.com/kamailio/kamailio/commit/74ef108fe0371bd261acc42291d7adb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b62d4c86de..6ded012085 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -324,6 +324,9 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else if(pit->name.len == 9 && strncasecmp(pit->name.s, "ping_from", 9) == 0) { dest->attrs.ping_from = pit->body; + } else if(pit->name.len == 7 + && strncasecmp(pit->name.s, "obproxy", 7) == 0) { + dest->attrs.obproxy = pit->body; } } if(params_list) @@ -3295,6 +3298,7 @@ void ds_ping_set(ds_set_t *node) uac_req_t uac_r; int i, j; str ping_from; + str obproxy; if(!node) return; @@ -3342,10 +3346,20 @@ void ds_ping_set(ds_set_t *node) LM_DBG("Default ping_from: %.*s\n", ping_from.len, ping_from.s); } + if(node->dlist[j].attrs.obproxy.s != NULL + && node->dlist[j].attrs.obproxy.len > 0) { + obproxy = node->dlist[j].attrs.obproxy; + LM_DBG("outbound proxy: %.*s\n", obproxy.len, obproxy.s); + } + else { + obproxy = ds_outbound_proxy; + LM_DBG("Default outbound proxy: %.*s\n", ds_outbound_proxy.len, ds_outbound_proxy.s); + } + gettimeofday(&node->dlist[j].latency_stats.start, NULL); if(tmb.t_request(&uac_r, &node->dlist[j].uri, &node->dlist[j].uri, - &ping_from, &ds_outbound_proxy) + &ping_from, &obproxy) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index e067d30478..6c167a9551 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -188,6 +188,7 @@ typedef struct _ds_attrs { int rweight; int congestion_control; str ping_from; + str obproxy; } ds_attrs_t; typedef struct _ds_latency_stats { diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 06e96da61a..6ac01bbd2a 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1573,7 +1573,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddSS", + if(rpc->struct_add(wh, "SSdddSSS", "BODY", &(node->dlist[j].attrs.body), "DUID", (node->dlist[j].attrs.duid.s) ? &(node->dlist[j].attrs.duid) : &data, @@ -1583,7 +1583,9 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) "SOCKET", (node->dlist[j].attrs.socket.s) ? &(node->dlist[j].attrs.socket) : &data, "SOCKNAME", (node->dlist[j].attrs.sockname.s) - ? &(node->dlist[j].attrs.sockname) : &data) + ? &(node->dlist[j].attrs.sockname) : &data, + "OBPROXY", (node->dlist[j].attrs.obproxy.s) + ? &(node->dlist[j].attrs.obproxy) : &data) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev