- sr-dev - kamailio.org

git:master:f9c336aa: ims_qos: typos in comments
by Daniel-Constantin Mierla 24 Feb '21

24 Feb '21

Module: kamailio Branch: master Commit: f9c336aa9a78169cf9c7f3fd9bfcfd22218078fb URL: https://github.com/kamailio/kamailio/commit/f9c336aa9a78169cf9c7f3fd9bfcfd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-24T19:09:35+01:00 ims_qos: typos in comments --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/f9c336aa9a78169cf9c7f3fd9bfcfd2… Patch: https://github.com/kamailio/kamailio/commit/f9c336aa9a78169cf9c7f3fd9bfcfd2… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index 5fa584bcd7..18d111eb67 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -597,7 +597,7 @@ void callback_pcscf_contact_cb(struct pcontact *c, int type, void *param) if (type == PCSCF_CONTACT_EXPIRE || type == PCSCF_CONTACT_DELETE) { - //we dont need to send STR if no QoS was ever succesfully registered! + // we dont need to send STR if no QoS was ever successfully registered! if (must_send_str && (c->reg_state != PCONTACT_REG_PENDING) && (c->reg_state != PCONTACT_REG_PENDING_AAR)) { LM_DBG("Received notification of contact (in state [%d] deleted for signalling bearer with with Rx session ID: [%.*s]\n", c->reg_state, c->rx_session_id.len, c->rx_session_id.s); diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 97d3d7a49d..6a2d60c901 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -328,7 +328,8 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e } //at this point we have the contact - /*set the contact state to say we have succesfully done ARR for register and that we dont need to do it again + /*set the contact state to say we have successfully done ARR for register + * and that we dont need to do it again * for the duration of the registration. * */ if (ul.update_rx_regsession(domain_t, &local_data->auth_session_id, pcontact) != 0) {

1 0

Is sort on htable init necessary?
by Manfred Dellkrantz 24 Feb '21

24 Feb '21

I've come across a problem with initializing the htable module based on data in MySQL. We persist a cache in MySQL during runtime and reload it on restart using the built in loading capabilities of htable. But occasionally when MySQL contains too many rows the query to MySQL times out. I've tracked it down to be due to the fact that the query wants the data to be sorted based on the column key_name (src/modules/htable/ht_db.c:236 on tag 5.4.4). Looking at the code this seems completely unnecessary and it seems to be working fine without the sorting (tested with mysql-rewriter). Any thoughts on this? Best regards Manfred

1 0

Errored: kamailio/kamailio#9905 (master - 571fe52)
by Travis CI 24 Feb '21

24 Feb '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9905 Status: Errored Duration: 5 mins and 52 secs Commit: 571fe52 (master) Author: Piotr Gregor Message: kamdbctl: typo in log message - core tables successfully installed View the changeset: https://github.com/kamailio/kamailio/compare/2ce244825bf7...571fe52f4ad0 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/760276199?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

[kamailio/kamailio] Fix typo in 'core tables successfully installed' msg (#2648)
by Piotr 24 Feb '21

24 Feb '21

### 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 Fixes minor typo in messages from database config bash scripts. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2648 -- Commit Summary -- * Fix typo in 'core tables successfully installed' msg -- File Changes -- M utils/kamctl/kamdbctl.mysql (8) M utils/kamctl/kamdbctl.oracle (6) M utils/kamctl/kamdbctl.pgsql (8) M utils/kamctl/kamdbctl.sqlite (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2648.patch https://github.com/kamailio/kamailio/pull/2648.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/2648

2 4

git:master:571fe52f: kamdbctl: typo in log message - core tables successfully installed
by Daniel-Constantin Mierla 24 Feb '21

24 Feb '21

Module: kamailio Branch: master Commit: 571fe52f4ad0cf5ceef98fb2d77c2711f3692c28 URL: https://github.com/kamailio/kamailio/commit/571fe52f4ad0cf5ceef98fb2d77c271… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-24T08:20:14+01:00 kamdbctl: typo in log message - core tables successfully installed --- Modified: utils/kamctl/kamdbctl.mysql Modified: utils/kamctl/kamdbctl.oracle Modified: utils/kamctl/kamdbctl.pgsql Modified: utils/kamctl/kamdbctl.sqlite --- Diff: https://github.com/kamailio/kamailio/commit/571fe52f4ad0cf5ceef98fb2d77c271… Patch: https://github.com/kamailio/kamailio/commit/571fe52f4ad0cf5ceef98fb2d77c271… --- diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 4050371bfe..81a730bbe6 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -315,7 +315,7 @@ standard_create () # pars: <database name> fi done - minfo "Core Kamailio tables succesfully created." + minfo "Core Kamailio tables successfully created." if [ -e $DB_SCHEMA/extensions-create.sql ] then @@ -347,7 +347,7 @@ presence_create () # pars: <database name> fi done - minfo "Presence tables succesfully created." + minfo "Presence tables successfully created." } # end presence_create @@ -368,7 +368,7 @@ extra_create () # pars: <database name> exit 1 fi done - minfo "Extra tables succesfully created." + minfo "Extra tables successfully created." } # end extra_create dbuid_create () # pars: <database name> @@ -388,7 +388,7 @@ dbuid_create () # pars: <database name> exit 1 fi done - minfo "UID tables succesfully created." + minfo "UID tables successfully created." } # end uid_create diff --git a/utils/kamctl/kamdbctl.oracle b/utils/kamctl/kamdbctl.oracle index 0b65027d66..e6de52f3a4 100644 --- a/utils/kamctl/kamdbctl.oracle +++ b/utils/kamctl/kamdbctl.oracle @@ -208,7 +208,7 @@ if [ -e $DB_SCHEMA/extensions-create.sql ]; then fi fi -minfo "Core Kamailio tables succesfully created." +minfo "Core Kamailio tables successfully created." get_answer $INSTALL_PRESENCE_TABLES "Install presence related tables? (y/n): " if [ "$ANSWER" = "y" ]; then @@ -244,7 +244,7 @@ if [ $? -ne 0 ] || check_oracle_log ; then exit 1 fi -minfo "Presence tables succesfully created." +minfo "Presence tables successfully created." } extra_create() # pars: <database name> @@ -266,7 +266,7 @@ for TABLE in $EXTRA_MODULES; do fi done -minfo "Extra tables succesfully created." +minfo "Extra tables successfully created." } diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index c41354ffc6..fa1fe1ada8 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -168,7 +168,7 @@ then fi fi -minfo "Core Kamailio tables succesfully created." +minfo "Core Kamailio tables successfully created." get_answer $INSTALL_PRESENCE_TABLES "Install presence related tables? (y/n): " if [ "$ANSWER" = "y" ]; then @@ -216,7 +216,7 @@ for TABLE in $PRESENCE_TABLES; do fi done -minfo "Presence tables succesfully created." +minfo "Presence tables successfully created." } # end presence_create @@ -251,7 +251,7 @@ for TABLE in $EXTRA_TABLES; do fi done -minfo "Extra tables succesfully created." +minfo "Extra tables successfully created." } # end extra_create @@ -272,5 +272,5 @@ dbuid_create () # pars: <database name> exit 1 fi done - minfo "UID tables succesfully created." + minfo "UID tables successfully created." } # end uid_create diff --git a/utils/kamctl/kamdbctl.sqlite b/utils/kamctl/kamdbctl.sqlite index 4915b81a40..1aeae559f2 100644 --- a/utils/kamctl/kamdbctl.sqlite +++ b/utils/kamctl/kamdbctl.sqlite @@ -88,7 +88,7 @@ then fi fi -minfo "Core Kamailio tables succesfully created." +minfo "Core Kamailio tables successfully created." get_answer $INSTALL_PRESENCE_TABLES "Install presence related tables? (y/n): " if [ "$ANSWER" = "y" ]; then @@ -125,7 +125,7 @@ if [ $? -ne 0 ] ; then exit 1 fi -minfo "Presence tables succesfully created." +minfo "Presence tables successfully created." } # end presence_create @@ -147,5 +147,5 @@ for TABLE in $EXTRA_MODULES; do fi done -minfo "Extra tables succesfully created." +minfo "Extra tables successfully created." } # end extra_create

1 0

[kamailio/kamailio] unsupported sip invite request-uri format (#2646)
by lglhust 23 Feb '21

23 Feb '21

In sip register: Request-URI: sip:ims.mnc001.mcc460.3gppnetwork.org , sip register is ok. In sip invite: Request-URI: tel:460010120073501;phone-context=ims.mnc001.mcc460.3gppnetwork.org, return 478 Unresolvable destination . I saw issue #2287 and #1173 . #2287 deals with register, and #1173 has no result. I want to know how to support such RURI in sip invite, does it need a patch in code ? If so , where and how to modified it . Thanks a lot. -- 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/2646

2 3

Still Failing: kamailio/kamailio#9900 (master - 2ce2448)
by Travis CI 23 Feb '21

23 Feb '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9900 Status: Still Failing Duration: 5 mins and 24 secs Commit: 2ce2448 (master) Author: Daniel-Constantin Mierla Message: ipops: use local ip struct for internal resolving - static structure from core can be overwritten on subsequential use - GH #2645 View the changeset: https://github.com/kamailio/kamailio/compare/c48e409b7418...2ce244825bf7 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/760142502?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:2ce24482: ipops: use local ip struct for internal resolving
by Daniel-Constantin Mierla 23 Feb '21

23 Feb '21

Module: kamailio Branch: master Commit: 2ce244825bf7bc38f145699209ef7125ae5480d0 URL: https://github.com/kamailio/kamailio/commit/2ce244825bf7bc38f145699209ef712… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-23T11:32:21+01:00 ipops: use local ip struct for internal resolving - static structure from core can be overwritten on subsequential use - GH #2645 --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2ce244825bf7bc38f145699209ef712… Patch: https://github.com/kamailio/kamailio/commit/2ce244825bf7bc38f145699209ef712… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 13511e4422..cb7422b988 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1098,15 +1098,22 @@ static int ki_is_ip_rfc1918(sip_msg_t* _msg, str* sval) static inline ip_addr_t *strtoipX(str *ips) { + static ip_addr_t ipb; + /* try to figure out INET class */ if(ips->s[0] == '[' || memchr(ips->s, ':', ips->len)!=NULL) { /* IPv6 */ - return str2ip6(ips); + if(str2ip6buf(ips, &ipb) < 0) { + return &ipb; + } } else { /* IPv4 */ - return str2ip(ips); + if (str2ipbuf(ips, &ipb)<0) { + return &ipb; + } } + return NULL; } static int ki_dns_sys_match_ip(sip_msg_t *msg, str *vhn, str *vip)

1 0

[kamailio/kamailio] usrloc Stats are not compatible with Prometheus (xhttp_prom module) (#2644)
by Sebastian Damm 22 Feb '21

22 Feb '21

### Description We tried to use the `xhttp_prom` module, but our Prometheus couldn't read it, because of metrics conflicting with Prometheus data model. For us, the problem lies in the usrloc module. It exports the following metrics: ``` usrloc:location-contacts = 0 usrloc:location-expires = 0 usrloc:location-users = 0 usrloc:registered_users = 0 ``` However, Prometheus allows only ascii characters and digits, as well as underscores and colons. See: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels The metrics names should not contain `-`, so they should get converted to `_`. #### Reproduction Setup Kamailio with `usrloc`, `xhttp` and `xhttp_prom` module and let Prometheus query it. It will stumble upon the first entry of `usrloc` module stats. ### Possible Solutions Either the `usrloc` module could export its stats with the dash replaced by underscores, or the xhttp_prom module could sanitize the output. The first one would be a breaking change, I guess, making this a change for a major release. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ifens5:/# kamailio -v version: kamailio 5.3.8 (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.5.0``` * **Operating System**: ``` Ubuntu 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/2644

3 4

Broken: kamailio/kamailio#9899 (master - c48e409)
by Travis CI 22 Feb '21

22 Feb '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9899 Status: Broken Duration: 5 mins and 30 secs Commit: c48e409 (master) Author: Daniel-Constantin Mierla Message: jsonrpcs: use json null value for c null char* or str* View the changeset: https://github.com/kamailio/kamailio/compare/d40fbc877aa6...c48e409b7418 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/759983787?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:c48e409b: jsonrpcs: use json null value for c null char* or str*
by Daniel-Constantin Mierla 22 Feb '21

22 Feb '21

Module: kamailio Branch: master Commit: c48e409b741821fa470788b3bca0ead32e4d6efc URL: https://github.com/kamailio/kamailio/commit/c48e409b741821fa470788b3bca0ead… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-22T11:29:39+01:00 jsonrpcs: use json null value for c null char* or str* --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c48e409b741821fa470788b3bca0ead… Patch: https://github.com/kamailio/kamailio/commit/c48e409b741821fa470788b3bca0ead… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index c3b8003046..a5a92e1537 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -472,6 +472,7 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) time_t dt; struct tm t; str *sp; + char *cp; switch(fmt) { case 'd': @@ -497,11 +498,20 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) nj = srjson_CreateString(ctx->jrpl, buf); break; case 's': - nj = srjson_CreateString(ctx->jrpl, va_arg(*ap, char*)); + cp = va_arg(*ap, char*); + if(cp!=NULL) { + nj = srjson_CreateString(ctx->jrpl, cp); + } else { + nj = srjson_CreateNull(ctx->jrpl); + } break; case 'S': sp = va_arg(*ap, str*); - nj = srjson_CreateStr(ctx->jrpl, sp->s, sp->len); + if(sp!=NULL && sp->s!=NULL) { + nj = srjson_CreateStr(ctx->jrpl, sp->s, sp->len); + } else { + nj = srjson_CreateNull(ctx->jrpl); + } break; default: LM_ERR("Invalid formatting character [%c]\n", fmt);

1 0

[kamailio/kamailio] Added ; sn param check to loose.c is_myself() (#2643)
by juha-h 21 Feb '21

21 Feb '21

Added ;sn param check to loose.c is_myself() so that loose_route() would recognize such a Route URI denoting itself. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2643 -- Commit Summary -- * Added ;sn param check to loose.c is_myself() -- File Changes -- M src/modules/rr/loose.c (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2643.patch https://github.com/kamailio/kamailio/pull/2643.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/2643

2 6

git:5.4:bdf4e004: kex: display proper values for pkg mem stats
by Ovidiu Sas 21 Feb '21

21 Feb '21

Module: kamailio Branch: 5.4 Commit: bdf4e004d8606f3228d794d55ce7a522b98129f4 URL: https://github.com/kamailio/kamailio/commit/bdf4e004d8606f3228d794d55ce7a52… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-02-20T19:24:36-05:00 kex: display proper values for pkg mem stats - large amounts of pkg memory were displayed as negative numbers (cherry picked from commit 220f9ca3c486b92797982a2333343fab463e9e5a) --- Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/bdf4e004d8606f3228d794d55ce7a52… Patch: https://github.com/kamailio/kamailio/commit/bdf4e004d8606f3228d794d55ce7a52… --- diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index 9a2f4a2d37..7f59130ba6 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -240,7 +240,7 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) _pkg_proc_stats_list[i].total_size = _pkg_proc_stats_list[0].total_size; _pkg_proc_stats_list[i].rank = PROC_NOCHLDINIT; } - if(rpc->struct_add(th, "dddddddds", + if(rpc->struct_add(th, "duduuuuus", "entry", i, "pid", _pkg_proc_stats_list[i].pid, "rank", _pkg_proc_stats_list[i].rank,

1 0

git:master:d40fbc87: pkg/kamailio/deb: add secsipid package for supported releases [skip ci]
by Victor Seva 19 Feb '21

19 Feb '21

Module: kamailio Branch: master Commit: d40fbc877aa699d1fdde1df82892d444f5475d62 URL: https://github.com/kamailio/kamailio/commit/d40fbc877aa699d1fdde1df82892d44… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-02-19T15:05:26+01:00 pkg/kamailio/deb: add secsipid package for supported releases [skip ci] --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/d40fbc877aa699d1fdde1df82892d44… Patch: https://github.com/kamailio/kamailio/commit/d40fbc877aa699d1fdde1df82892d44…

1 0

[kamailio/kamailio] add rport to uac register msg (#2639)
by Seven Du 18 Feb '21

18 Feb '21

### Description  Sometimes need to add rport on outbound uac reg, but seems it's not possible in the current uac module. Would be good to an an extra param to do it, or is it possible to trigger a KEMI event route so a script can add whatever it need before sending the register msg? Thanks. ### 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**:  ``` (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/2639

2 15

git:master:220f9ca3: kex: display proper values for pkg mem stats
by Ovidiu Sas 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: 220f9ca3c486b92797982a2333343fab463e9e5a URL: https://github.com/kamailio/kamailio/commit/220f9ca3c486b92797982a2333343fa… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-02-17T12:08:10-05:00 kex: display proper values for pkg mem stats - large amounts of pkg memory were displayed as negative numbers --- Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/220f9ca3c486b92797982a2333343fa… Patch: https://github.com/kamailio/kamailio/commit/220f9ca3c486b92797982a2333343fa… --- diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index ee6c637ace..102442f1e9 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -240,7 +240,7 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) _pkg_proc_stats_list[i].total_size = _pkg_proc_stats_list[0].total_size; _pkg_proc_stats_list[i].rank = PROC_NOCHLDINIT; } - if(rpc->struct_add(th, "dddddddds", + if(rpc->struct_add(th, "duduuuuus", "entry", i, "pid", _pkg_proc_stats_list[i].pid, "rank", _pkg_proc_stats_list[i].rank,

1 0

[kamailio/kamailio] rtpengine: rebuild sockets if any skipped nodes (#2633)
by Stefan Mititelu 17 Feb '21

17 Feb '21

Retry build_rtpp_socks() if any DNS or create, bind, connect issues happened when kamailio started, and at least one node from list was skipped. This retry will happen automatically, when select_rtpp_node() is called and will avoid a need for a "kamcmd rtpengine.reload"   #### 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  Described above. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2633 -- Commit Summary -- * rtpengine: rebuild sockets if any skipped nodes -- File Changes -- M src/modules/rtpengine/rtpengine.c (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2633.patch https://github.com/kamailio/kamailio/pull/2633.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/2633

3 3

git:master:c88e65ed: rtpengine: rebuild sockets if any skipped nodes
by Henning Westerholt 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: c88e65edf05f7e61826831a2f7528edbc184f68b URL: https://github.com/kamailio/kamailio/commit/c88e65edf05f7e61826831a2f7528ed… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-02-17T17:21:22+01:00 rtpengine: rebuild sockets if any skipped nodes Retry build_rtpp_socks() if any DNS or create, bind, connect issues happened when kamailio started, and at least one node from list was skipped. This retry will happen automatically, when select_rtpp_node() is called and will avoid a need for a "kamcmd rtpengine.reload" --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/c88e65edf05f7e61826831a2f7528ed… Patch: https://github.com/kamailio/kamailio/commit/c88e65edf05f7e61826831a2f7528ed… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 00b27be148..8b751eb48a 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1794,6 +1794,9 @@ static int build_rtpp_socks(int lmode, int rtest) { if(_rtpe_list_vernum_local == _rtpe_list_version->vernum) { /* same version for the list of rtpengines */ + LM_DBG("same rtpengines list version: %d (%u)\n", + _rtpe_list_version->vernum, + (unsigned int)_rtpe_list_version->vertime); return 0; } @@ -1840,6 +1843,11 @@ static int build_rtpp_socks(int lmode, int rtest) { if (hostname==NULL) { LM_ERR("no more pkg memory\n"); rtpp_socks[pnode->idx] = -1; + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } strcpy(hostname, pnode->rn_address); @@ -1860,6 +1868,11 @@ static int build_rtpp_socks(int lmode, int rtest) { LM_ERR("%s\n", gai_strerror(n)); pkg_free(hostname); rtpp_socks[pnode->idx] = -1; + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } pkg_free(hostname); @@ -1869,6 +1882,11 @@ static int build_rtpp_socks(int lmode, int rtest) { if (rtpp_socks[pnode->idx] == -1) { LM_ERR("can't create socket\n"); freeaddrinfo(res); + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } @@ -1899,6 +1917,11 @@ static int build_rtpp_socks(int lmode, int rtest) { close(rtpp_socks[pnode->idx]); rtpp_socks[pnode->idx] = -1; freeaddrinfo(res); + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } @@ -1907,6 +1930,11 @@ static int build_rtpp_socks(int lmode, int rtest) { close(rtpp_socks[pnode->idx]); rtpp_socks[pnode->idx] = -1; freeaddrinfo(res); + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; }

1 0

git:master:6863cb8b: core: early detect of empty host for check_self()
by Daniel-Constantin Mierla 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: 6863cb8b0253c641146633bd063575a53bc6a466 URL: https://github.com/kamailio/kamailio/commit/6863cb8b0253c641146633bd063575a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-17T14:07:43+01:00 core: early detect of empty host for check_self() --- Modified: src/core/forward.c --- Diff: https://github.com/kamailio/kamailio/commit/6863cb8b0253c641146633bd063575a… Patch: https://github.com/kamailio/kamailio/commit/6863cb8b0253c641146633bd063575a… --- diff --git a/src/core/forward.c b/src/core/forward.c index 0ffa627233..57661c211f 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -408,6 +408,13 @@ int run_check_self_func(str* host, unsigned short port, unsigned short proto) int check_self(str* host, unsigned short port, unsigned short proto) { int ret = 1; + + if(host==NULL || host->s==NULL || host->len<=0) { + /* no host (e.g., tel uri) - not matching myself */ + LM_DBG("no host value - not matching myself addresses\n"); + return 0; + } + if (grep_sock_info(host, port, proto)) { goto done; }

1 0

git:master:81cd9c5d: rr: catch uri without host part when matching local addresses
by Daniel-Constantin Mierla 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: 81cd9c5d6934392cafd4b73541a19dbfa4b553f9 URL: https://github.com/kamailio/kamailio/commit/81cd9c5d6934392cafd4b73541a19db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-17T12:15:55+01:00 rr: catch uri without host part when matching local addresses - can happen for tel or urn uri --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/81cd9c5d6934392cafd4b73541a19db… Patch: https://github.com/kamailio/kamailio/commit/81cd9c5d6934392cafd4b73541a19db… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index cfccfffa50..f1cbe1b629 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -122,6 +122,11 @@ static inline int is_myself(sip_uri_t *_puri) { int ret; + if(_puri->host.len==0) { + /* catch uri without host (e.g., tel uri) */ + return 0; + } + ret = check_self(&_puri->host, _puri->port_no?_puri->port_no:SIP_PORT, 0);/* match all protos*/ if (ret < 0) return 0;

1 0

git:master:bfbf41d8: tm: consider local_rport parameter when building local via
by Daniel-Constantin Mierla 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: bfbf41d8ba2ba2b6eed8eb8fff2e554476c0a5b8 URL: https://github.com/kamailio/kamailio/commit/bfbf41d8ba2ba2b6eed8eb8fff2e554… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-17T13:31:34+01:00 tm: consider local_rport parameter when building local via --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/bfbf41d8ba2ba2b6eed8eb8fff2e554… Patch: https://github.com/kamailio/kamailio/commit/bfbf41d8ba2ba2b6eed8eb8fff2e554… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 47f94c1697..ef9b45e246 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1358,6 +1358,7 @@ static inline int assemble_via(str* dest, struct cell* t, unsigned int via_len; str branch_str; struct hostport hp; + str rport = str_init(";rport"); if (!t_calc_branch(t, branch, branch_buf, &len)) { LM_ERR("branch calculation failed\n"); @@ -1372,7 +1373,11 @@ static inline int assemble_via(str* dest, struct cell* t, #endif set_hostport(&hp, 0); - via = via_builder(&via_len, NULL, dst, &branch_str, 0, &hp); + if(ksr_local_rport) { + via = via_builder(&via_len, NULL, dst, &branch_str, &rport, &hp); + } else { + via = via_builder(&via_len, NULL, dst, &branch_str, 0, &hp); + } if (!via) { LM_ERR("via building failed\n"); return -2;

1 0

Errored: kamailio/kamailio#9889 (master - cffd96c)
by Travis CI 17 Feb '21

17 Feb '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9889 Status: Errored Duration: 5 mins and 31 secs Commit: cffd96c (master) Author: Daniel-Constantin Mierla Message: tm: use BUILD_NEW_LOCAL_VIA after local request event route execution View the changeset: https://github.com/kamailio/kamailio/compare/cc4644ea306f...cffd96cc3944 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/759303331?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:da0a6d48: core: new option BUILD_NEW_LOCAL_VIA to recreate the local via
by Daniel-Constantin Mierla 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: da0a6d48debb9c69c5a06a9e702a4378c61eaac7 URL: https://github.com/kamailio/kamailio/commit/da0a6d48debb9c69c5a06a9e702a437… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-17T08:21:36+01:00 core: new option BUILD_NEW_LOCAL_VIA to recreate the local via - to be used from tm uac when a local-generated request has to update the via header following the event route execution --- Modified: src/core/msg_translator.c Modified: src/core/msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/da0a6d48debb9c69c5a06a9e702a437… Patch: https://github.com/kamailio/kamailio/commit/da0a6d48debb9c69c5a06a9e702a437… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f895df9683..c3587d2e88 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1971,7 +1971,7 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) * depending on the presence of the BUILD_IN_SHM flag, needs freeing when * done) and sets returned_len or 0 on error. */ -char * build_req_buf_from_sip_req( struct sip_msg* msg, +char * build_req_buf_from_sip_req(struct sip_msg* msg, unsigned int *returned_len, struct dest_info* send_info, unsigned int mode) @@ -1987,6 +1987,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, unsigned int offset, s_offset, size; struct lump* via_anchor; struct lump* via_lump; + struct lump* via_rm; struct lump* via_insert_param; struct lump* path_anchor; struct lump* path_lump; @@ -2032,11 +2033,22 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, via_anchor=anchor_lump(msg, msg->via1->hdr.s-buf, 0, HDR_VIA_T); if (unlikely(via_anchor==0)) goto error00; - line_buf = create_via_hf( &via_len, msg, send_info, &branch); + line_buf = create_via_hf(&via_len, msg, send_info, &branch); if (unlikely(!line_buf)){ LM_ERR("could not create Via header\n"); goto error00; } + if(unlikely(mode&BUILD_NEW_LOCAL_VIA)) { + /* delete exiting top Via header */ + via_rm = del_lump(msg, msg->h_via1->name.s - msg->buf, + msg->h_via1->len, 0); + if (via_rm==0) { + LM_ERR("failed to remove exiting Via header\n"); + goto error00; + } + /* do not update old Via header anymore */ + mode |= BUILD_NO_VIA1_UPDATE; + } after_local_via: if(unlikely(mode&BUILD_NO_VIA1_UPDATE)) goto after_update_via1; diff --git a/src/core/msg_translator.h b/src/core/msg_translator.h index 4d14ce0fb2..9b9802ad1e 100644 --- a/src/core/msg_translator.h +++ b/src/core/msg_translator.h @@ -49,6 +49,7 @@ #define BUILD_NO_LOCAL_VIA (1<<0) #define BUILD_NO_VIA1_UPDATE (1<<1) #define BUILD_NO_PATH (1<<2) +#define BUILD_NEW_LOCAL_VIA (1<<3) #define BUILD_IN_SHM (1<<7) #include "parser/msg_parser.h"

1 0

git:master:cffd96cc: tm: use BUILD_NEW_LOCAL_VIA after local request event route execution
by Daniel-Constantin Mierla 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: cffd96cc3944fb15aacee97291e4b2c1bb769fbb URL: https://github.com/kamailio/kamailio/commit/cffd96cc3944fb15aacee97291e4b2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-17T08:23:34+01:00 tm: use BUILD_NEW_LOCAL_VIA after local request event route execution --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/cffd96cc3944fb15aacee97291e4b2c… Patch: https://github.com/kamailio/kamailio/commit/cffd96cc3944fb15aacee97291e4b2c… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 40d333b7db..ad6a74c8cb 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -343,7 +343,8 @@ static inline int t_run_local_req( LM_DBG("apply new updates with Via to sip msg\n"); buf1 = build_req_buf_from_sip_req(&lreq, - (unsigned int*)&buf_len1, &request->dst, BUILD_IN_SHM); + (unsigned int*)&buf_len1, &request->dst, + BUILD_NEW_LOCAL_VIA|BUILD_IN_SHM); if (likely(buf1)){ shm_free(*buf); *buf = buf1;

1 0

git:master:cc4644ea: tm: uac - use new send socket only if set in event route local request
by Daniel-Constantin Mierla 16 Feb '21

16 Feb '21

Module: kamailio Branch: master Commit: cc4644ea306f1f8abf9d0f69eb452ae8cabeb4b9 URL: https://github.com/kamailio/kamailio/commit/cc4644ea306f1f8abf9d0f69eb452ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-16T16:36:10+01:00 tm: uac - use new send socket only if set in event route local request - GH #2639 --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/cc4644ea306f1f8abf9d0f69eb452ae… Patch: https://github.com/kamailio/kamailio/commit/cc4644ea306f1f8abf9d0f69eb452ae… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index d01c722844..40d333b7db 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -315,10 +315,10 @@ static inline int t_run_local_req( if((lreq.force_send_socket != uac_r->dialog->send_sock) || (lreq.msg_flags&(FL_ADD_LOCAL_RPORT|FL_ADD_SRVID |FL_ADD_XAVP_VIA_PARAMS|FL_USE_XAVP_VIA_FIELDS))) { - LM_DBG("local Via update - socket: [%.*s] - msg-flags: %u", - lreq.force_send_socket->address_str.len, - lreq.force_send_socket->address_str.s, - lreq.msg_flags); + LM_DBG("local Via update - new socket: [%.*s] - msg-flags: %u", + (lreq.force_send_socket)?lreq.force_send_socket->address_str.len:4, + (lreq.force_send_socket)?lreq.force_send_socket->address_str.s:"none", + lreq.msg_flags); /* rebuild local Via - remove previous value * and add the one for the new send socket */ @@ -335,9 +335,11 @@ static inline int t_run_local_req( lreq.add_to_branch_len = lreq.via1->branch->value.len; /* update also info about new destination and send sock */ - uac_r->dialog->send_sock=lreq.force_send_socket; - request->dst.send_sock = lreq.force_send_socket; - request->dst.proto = lreq.force_send_socket->proto; + if(lreq.force_send_socket) { + uac_r->dialog->send_sock=lreq.force_send_socket; + request->dst.send_sock = lreq.force_send_socket; + request->dst.proto = lreq.force_send_socket->proto; + } LM_DBG("apply new updates with Via to sip msg\n"); buf1 = build_req_buf_from_sip_req(&lreq,

1 0

git:master:92e72ab4: core: exposed module version control function
by Daniel-Constantin Mierla 16 Feb '21

16 Feb '21

Module: kamailio Branch: master Commit: 92e72ab4de7e7a9d1dee57e9bac61cf513367a42 URL: https://github.com/kamailio/kamailio/commit/92e72ab4de7e7a9d1dee57e9bac61cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-16T16:22:45+01:00 core: exposed module version control function --- Modified: src/core/sr_module.c Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/92e72ab4de7e7a9d1dee57e9bac61cf… Patch: https://github.com/kamailio/kamailio/commit/92e72ab4de7e7a9d1dee57e9bac61cf… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index c37e1ab680..03f8feef81 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -335,7 +335,10 @@ static int register_module(module_exports_t* e, char* path, void* handle) return ret; } -static inline int version_control(void *handle, char *path) +/** + * check the version of loaded module + */ +int ksr_version_control(void *handle, char *path) { char **m_ver; char **m_flags; @@ -572,7 +575,7 @@ int load_module(char* mod_path) } } /* version control */ - if (!version_control(handle, path)) { + if (!ksr_version_control(handle, path)) { ksr_exit(-1); } /* launch register */ diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 8de9026c2a..99c1dc1de1 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -551,4 +551,6 @@ int ksr_shutdown_phase(void); int ksr_locate_module(char *mod_path, char **new_path); +int ksr_version_control(void *handle, char *path); + #endif /* sr_module_h */

1 0

git:master:7de21e14: secsipid: check version of loaded module in child init callback
by Daniel-Constantin Mierla 16 Feb '21

16 Feb '21

Module: kamailio Branch: master Commit: 7de21e14662e560cda0a9426f2d3bb6cd1412686 URL: https://github.com/kamailio/kamailio/commit/7de21e14662e560cda0a9426f2d3bb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-16T16:28:31+01:00 secsipid: check version of loaded module in child init callback --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7de21e14662e560cda0a9426f2d3bb6… Patch: https://github.com/kamailio/kamailio/commit/7de21e14662e560cda0a9426f2d3bb6… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index d5968fde30..c8b19ca6d3 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -134,6 +134,10 @@ static int child_init(int rank) /* launch register */ bind_f = (secsipid_proc_bind_f)dlsym(handle, "secsipid_proc_bind"); if (((errstr=(char*)dlerror())==NULL) && bind_f!=NULL) { + /* version control */ + if (!ksr_version_control(handle, modpath)) { + goto error; + } /* no error - call it */ if(bind_f(&_secsipid_papi)<0) { LM_ERR("filed to bind the api of proc module: %s\n", modpath);

1 0

[kamailio/kamailio] Runnning kamailio (docker) with remote connection with MYSQL (docker) fails on start/restart due to socket or database connection (#2640)
by Mario Nuñez 16 Feb '21

16 Feb '21

Hi, I am running docker with this: https://hub.docker.com/layers/kamailio/kamailio/5.4.3-trusty/images/sha256-… and https://hub.docker.com/layers/mysql/library/mysql/8.0.23/images/sha256-8708… I made some configurations in Kamailio: /etc/default/kamailio RUN_KAMAILIO=yes USER=kamailio GROUP=kamailio CFGFILE=/etc/kamailio/kamailio.cfg DUMP_CORE=yes /etc/kamailio/kamailio.cfg #!define WITH_MYSQL #!define WITH_AUTH #!define WITH_USRLOCDB /etc/kamailio/kamctlrc SIP_DOMAIN=kamailio.org DBENGINE=MYSQL DBHOST=172.19.0.3 DBPORT=3306 DBNAME=kamailio DBRWUSER="kamailio" DBRWPW="kamailiorw" DBROUSER="kamailioro" DBROPW="kamailioro" DBACCESSHOST=172.19.0.5 DBROOTUSER="root" DBROOTPW="negro" CHARSET="latin1" USERCOL="user" Then I run creation of database: /usr/sbin/kamdbctl create All was ok so I can see in database: +------------------+------------+-----------------------+ | user | host | plugin | +------------------+------------+-----------------------+ | root | % | mysql_native_password | | kamailio | 172.19.0.3 | mysql_native_password | | kamailioro | 172.19.0.3 | mysql_native_password | | kamailio | 172.19.0.5 | mysql_native_password | | kamailioro | 172.19.0.5 | mysql_native_password | | kamailio | localhost | mysql_native_password | | kamailioro | localhost | mysql_native_password | | mysql.infoschema | localhost | caching_sha2_password | | mysql.session | localhost | caching_sha2_password | | mysql.sys | localhost | caching_sha2_password | | root | localhost | mysql_native_password | +------------------+------------+-----------------------+ At this point, if I try to restart kamailio i got an error and container never go up again, I have to delete it and restart the installation and configuration process with this log: ON RESTART KAMAILIO FROM CONTAINER CONSOLE: Listening on udp: 127.0.0.1:5060 udp: 172.17.0.4:5060 tcp: 127.0.0.1:5060 tcp: 172.17.0.4:5060 Aliases: tcp: mykamailio:5060 tcp: localhost:5060 udp: mykamailio:5060 udp: localhost:5060 0(1) INFO: <core> [core/tcp_main.c:4984]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(1) INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(1) INFO: rr [rr_mod.c:185]: mod_init(): outbound module not available 0(1) INFO: <core> [main.c:2834]: main(): processes (at least): 33 - shm size: 67108864 - pkg size: 8388608 0(1) INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 0(1) INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 0(1) INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 0(1) INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 21(28) INFO: jsonrpcs [jsonrpcs_sock.c:443]: jsonrpc_dgram_process(): a new child 0/28 23(30) INFO: ctl [io_listener.c:214]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) 0(1) ALERT: <core> [main.c:774]: handle_sigs(): child process 205 exited normally, status=255 0(1) INFO: <core> [main.c:802]: handle_sigs(): terminating due to SIGCHLD 2(9) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 1(8) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 3(10) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 4(11) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 6(13) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 5(12) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 7(14) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 10(17) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 12(19) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 14(21) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 29(36) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 24(31) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 28(35) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 15(22) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 19(26) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 13(20) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 17(24) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 8(15) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 23(30) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 22(29) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 21(28) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 26(33) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 20(27) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 31(38) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 32(39) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 9(16) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 30(37) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 11(18) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 16(23) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 27(34) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 18(25) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 25(32) INFO: <core> [main.c:857]: sig_usr(): signal 15 received 0(1) ERROR: ctl [ctl.c:390]: mod_destroy(): ERROR: ctl: could not delete unix socket /var/run/kamailio//kamailio_ctl: No such file or directory (2) 0(1) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized SO CONTAINER WAS DOWN, AND THEN IF I TRY TO START CONTAINER AGAIN: Listening on udp: 127.0.0.1:5060 udp: 172.17.0.4:5060 udp: 172.19.0.5:5060 tcp: 127.0.0.1:5060 tcp: 172.17.0.4:5060 tcp: 172.19.0.5:5060 Aliases: tcp: mykamailio:5060 tcp: localhost:5060 udp: mykamailio:5060 udp: localhost:5060 0(1) INFO: <core> [core/tcp_main.c:4984]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(1) INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(1) INFO: rr [rr_mod.c:185]: mod_init(): outbound module not available 0(1) INFO: auth [auth_mod.c:346]: mod_init(): qop set, but nonce-count (nonce_count) support disabled 0(1) INFO: <core> [main.c:2834]: main(): processes (at least): 41 - shm size: 67108864 - pkg size: 8388608 0(1) ERROR: db_mysql [km_my_con.c:163]: db_mysql_new_connection(): driver error: Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2) 0(1) ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool 0(1) ERROR: usrloc [dlist.c:852]: register_udomain(): failed to open database connection 0(1) ERROR: registrar [registrar.c:711]: domain_fixup(): failed to register domain 0(1) ERROR: <core> [core/route.c:1167]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:698 0(1) ERROR: <core> [core/rvalue.c:3869]: fix_rval_expr(): failure in cfg at line: 698 col: 22 0(1) ERROR: <core> [core/rvalue.c:3869]: fix_rval_expr(): failure in cfg at line: 698 col: 22 0(1) ERROR: <core> [core/route.c:1167]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:701 error -1 while trying to fix configuration 0(1) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized SO NO WAY TO GET IT UP. Any idea on what is the problem here? I tried giving permissions to some folders in Kamailio docker container: chown kamailio:kamailio /usr/sbin/kam* chmod 755 /usr/sbin/kam* chown -R kamailio:kamailio /etc/kamailio chmod -R 755 /etc/kamailio chown -R root:kamailio /var/run chmod -R 755 /var/run chown -R kamailio:kamailio /run/kamailio chown -R 755 /run/kamailio But had no effect... thank you in advance. -- 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/2640

2 2

[kamailio/kamailio] update libphonenum (#2635)
by Boden Garman 15 Feb '21

15 Feb '21

### Description update libphonenum for the latest metadata please (currently v8.12.18) ### Additional Information OS is CentOS 8 Stream ```# dnf list installed | grep phone kamailio-phonenum.x86_64 5.4.3-0.el8.centos @kamailio libphonenumber.x86_64 8.12.11-2.el8 @kamailio ``` -- 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/2635

2 3

[kamailio/kamailio] Build warnings (#2636)
by sergey-safarov 15 Feb '21

15 Feb '21

**core/receive.c:300 - CentOS 7** ``` CC (gcc) [kamailio] core/ip_addr.o CC (gcc) [kamailio] core/rvalue.o CC (gcc) [kamailio] core/receive.o core/receive.c: In function 'receive_msg': core/receive.c:300:2: warning: missing braces around initializer [-Wmissing-braces] sr_net_info_t netinfo = {0}; ^ core/receive.c:300:2: warning: (near initialization for 'netinfo.data') [-Wmissing-braces] CC (gcc) [kamailio] core/timer_proc.o CC (gcc) [kamailio] core/lock_ops.o CC (gcc) [kamailio] core/counters.o ``` -- 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/2636

2 3

Kamailio v5.4.4 Released
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Hello, Kamailio SIP Server v5.4.4 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.3. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.4. For more details about version 5.4.4 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/02/kamailio-v5-4-4-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

Errored: kamailio/kamailio#9886 (master - fd8d0f6)
by Travis CI 15 Feb '21

15 Feb '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9886 Status: Errored Duration: 5 mins and 52 secs Commit: fd8d0f6 (master) Author: Daniel-Constantin Mierla Message: Makefile.groups: added secsipid_proc to secsipid group View the changeset: https://github.com/kamailio/kamailio/compare/211915aeffa9...fd8d0f66c80f View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/759037473?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:fd8d0f66: Makefile.groups: added secsipid_proc to secsipid group
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: fd8d0f66c80f0ab296bcaff08713a2eb578dd886 URL: https://github.com/kamailio/kamailio/commit/fd8d0f66c80f0ab296bcaff08713a2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T12:11:33+01:00 Makefile.groups: added secsipid_proc to secsipid group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/fd8d0f66c80f0ab296bcaff08713a2e… Patch: https://github.com/kamailio/kamailio/commit/fd8d0f66c80f0ab296bcaff08713a2e… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 9382e04c28..251a191e77 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -215,7 +215,7 @@ mod_list_kafka=kafka mod_list_mqtt=mqtt # - modules depending on secsipid library -mod_list_secsipid=secsipid +mod_list_secsipid=secsipid secsipid_proc # - modules depending on oRTP and mediastreamer2 libraries mod_list_rtp_media_server=rtp_media_server

1 0

git:5.4:b87099f5: Makefile.defs: version set to 5.4.4
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: 5.4 Commit: b87099f5a26845aaf11d55c8fa56f9a9e4255b8c URL: https://github.com/kamailio/kamailio/commit/b87099f5a26845aaf11d55c8fa56f9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T11:52:37+01:00 Makefile.defs: version set to 5.4.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b87099f5a26845aaf11d55c8fa56f9a… Patch: https://github.com/kamailio/kamailio/commit/b87099f5a26845aaf11d55c8fa56f9a… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 1f5e5518b6..c51796568d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:e1635210: ChangeLog: content updated for v5.4.4
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: 5.4 Commit: e16352101921ec9ba5c50871f5581b883df6a8a3 URL: https://github.com/kamailio/kamailio/commit/e16352101921ec9ba5c50871f5581b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T11:58:01+01:00 ChangeLog: content updated for v5.4.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/e16352101921ec9ba5c50871f5581b8… Patch: https://github.com/kamailio/kamailio/commit/e16352101921ec9ba5c50871f5581b8…

1 0

git:master:9a35a5b9: pkg/kamailio/obs: added --atexit=no into systemd unit file [skip ci]
by Sergey Safarov 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: 9a35a5b95e8144dbdb18003f40e49e5b497274f3 URL: https://github.com/kamailio/kamailio/commit/9a35a5b95e8144dbdb18003f40e49e5… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-02-15T11:10:24+03:00 pkg/kamailio/obs: added --atexit=no into systemd unit file [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9a35a5b95e8144dbdb18003f40e49e5… Patch: https://github.com/kamailio/kamailio/commit/9a35a5b95e8144dbdb18003f40e49e5… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 999422a746..0c0170d100 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1119,6 +1119,12 @@ UUID module for Kamailio. sed -i -e 's/python3/python2/' utils/kamctl/dbtextdb/dbtextdb.py %endif +# on latest dist need to add --atexit=no for Kamailio options. More details GH #2616 +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 +sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/obs/kamailio.service +%endif + + %build ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8

2 2

git:5.4:57fb85e2: pkg/kamailio/obs: added --atexit=no into systemd unit file [skip ci]
by Sergey Safarov 15 Feb '21

15 Feb '21

Module: kamailio Branch: 5.4 Commit: 57fb85e2a1dc50618179b79901563bab502169da URL: https://github.com/kamailio/kamailio/commit/57fb85e2a1dc50618179b79901563ba… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-02-15T13:43:09+03:00 pkg/kamailio/obs: added --atexit=no into systemd unit file [skip ci] (cherry picked from commit 9a35a5b95e8144dbdb18003f40e49e5b497274f3) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/57fb85e2a1dc50618179b79901563ba… Patch: https://github.com/kamailio/kamailio/commit/57fb85e2a1dc50618179b79901563ba… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index dc76d321f6..0bd9c0238a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1119,6 +1119,12 @@ UUID module for Kamailio. sed -i -e 's/python3/python2/' utils/kamctl/dbtextdb/dbtextdb.py %endif +# on latest dist need to add --atexit=no for Kamailio options. More details GH #2616 +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 +sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/obs/kamailio.service +%endif + + %build ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8

1 0

git:master:211915ae: core: sr module - check for null to avoid free warning
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: 211915aeffa9bfb867969bc840ff73a1bdf16f66 URL: https://github.com/kamailio/kamailio/commit/211915aeffa9bfb867969bc840ff73a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T10:39:56+01:00 core: sr module - check for null to avoid free warning --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/211915aeffa9bfb867969bc840ff73a… Patch: https://github.com/kamailio/kamailio/commit/211915aeffa9bfb867969bc840ff73a… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 0a7ba37848..c37e1ab680 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -509,7 +509,7 @@ int ksr_locate_module(char *mod_path, char **new_path) return 0; error: - if(path!=mod_path) { + if(path!=NULL && path!=mod_path) { pkg_free(path); }

1 0

git:master:3e345291: secsipid_proc: link always against -lpthread
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: 3e345291c0e9474ed0196b0ab0528e0f6744fbe0 URL: https://github.com/kamailio/kamailio/commit/3e345291c0e9474ed0196b0ab0528e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T10:31:48+01:00 secsipid_proc: link always against -lpthread - being loaded on child init may not benefit of core -lphtread in some OSes --- Modified: src/modules/secsipid_proc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3e345291c0e9474ed0196b0ab0528e0… Patch: https://github.com/kamailio/kamailio/commit/3e345291c0e9474ed0196b0ab0528e0… --- diff --git a/src/modules/secsipid_proc/Makefile b/src/modules/secsipid_proc/Makefile index 766ce4a190..259766b151 100644 --- a/src/modules/secsipid_proc/Makefile +++ b/src/modules/secsipid_proc/Makefile @@ -19,14 +19,14 @@ endif ifeq ($(BUILDER),) DEFS+= -I. - LIBS = -L. -lsecsipid + LIBS = -L. -lsecsipid -lpthread else DEFS+= $(shell pkg-config --cflags secsipid-1) - LIBS = $(shell pkg-config --libs secsipid-1) + LIBS = $(shell pkg-config --libs secsipid-1) -lpthread endif ifeq ($(OS), darwin) -LIBS+= -framework CoreFoundation -framework Security -lpthread +LIBS+= -framework CoreFoundation -framework Security endif include ../../Makefile.modules

1 0

git:5.4:9cf3a799: pkg/kamailio/deb: version set 5.4.4
by Victor Seva 15 Feb '21

15 Feb '21

Module: kamailio Branch: 5.4 Commit: 9cf3a7991919a27410aec6658ec8e77d4e381e01 URL: https://github.com/kamailio/kamailio/commit/9cf3a7991919a27410aec6658ec8e77… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-02-15T09:32:05+01:00 pkg/kamailio/deb: version set 5.4.4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/9cf3a7991919a27410aec6658ec8e77… Patch: https://github.com/kamailio/kamailio/commit/9cf3a7991919a27410aec6658ec8e77…

1 0

git:5.4:864238f6: pkg/kamailio/deb: restore python3 dependency of kamailio package
by Victor Seva 15 Feb '21

15 Feb '21

Module: kamailio Branch: 5.4 Commit: 864238f68588923ca60758251bd5f5ab3ac838fd URL: https://github.com/kamailio/kamailio/commit/864238f68588923ca60758251bd5f5a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-02-15T09:30:52+01:00 pkg/kamailio/deb: restore python3 dependency of kamailio package (cherry picked from commit ab8e680e0dd3a8078d40b72c50d41db55d442240) --- Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/wheezy --- Diff: https://github.com/kamailio/kamailio/commit/864238f68588923ca60758251bd5f5a… Patch: https://github.com/kamailio/kamailio/commit/864238f68588923ca60758251bd5f5a… --- diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index 13743a3f2b..78e0d2cfdf 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -90,7 +90,12 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ ruby/' ${DIST}/rules # no python3 for app_python3 sed -i -e '/python3-dev/d' -e '/^Package: kamailio-python3-modules/,/^$/d' \ - -e '/python3/d' ${DIST}/control + ${DIST}/control +# this removes python3 from Package: kamalio +sed -i -e '/python3/d' ${DIST}/control +# add that again +sed -i '/lsb-base,/a \ python3,' ${DIST}/control + sed -i -e 's/ python3[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ python3/' ${DIST}/rules diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index e8052665bb..87f95168a3 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -90,7 +90,12 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ ruby/' ${DIST}/rules # no python3 for app_python3 sed -i -e '/python3-dev/d' -e '/^Package: kamailio-python3-modules/,/^$/d' \ - -e '/python3/d' ${DIST}/control + ${DIST}/control +# this removes python3 from Package: kamalio +sed -i -e '/python3/d' ${DIST}/control +# add that again +sed -i '/lsb-base,/a \ python3,' ${DIST}/control + sed -i -e 's/ python3[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ python3/' ${DIST}/rules

1 0

git:5.4:e8595172: pv: proper transfomation name in the log message
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: 5.4 Commit: e8595172d317b03a335bfd7c29fdf09d2e6da8b5 URL: https://github.com/kamailio/kamailio/commit/e8595172d317b03a335bfd7c29fdf09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T08:46:45+01:00 pv: proper transfomation name in the log message (cherry picked from commit b4d1def5d8a5ffaddbd87708d8dc99f0f5f8853c) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/e8595172d317b03a335bfd7c29fdf09… Patch: https://github.com/kamailio/kamailio/commit/e8595172d317b03a335bfd7c29fdf09… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index cdfcd3ddf3..3c547305a6 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2688,7 +2688,7 @@ char* tr_parse_string(str* in, trans_t *t) while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; if(*p!=TR_RBRACKET) { - LM_ERR("invalid ftime transformation: %.*s!!\n", + LM_ERR("invalid rm transformation: %.*s!!\n", in->len, in->s); goto error; }

1 0

git:5.4:0f093556: pkg/kamailio: version set to 5.4.4 for rpm specs and alpine
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: 5.4 Commit: 0f093556d0ad9e8bcf92222ac0cc7c1887ea0527 URL: https://github.com/kamailio/kamailio/commit/0f093556d0ad9e8bcf92222ac0cc7c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T09:24:57+01:00 pkg/kamailio: version set to 5.4.4 for rpm specs and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0f093556d0ad9e8bcf92222ac0cc7c1… Patch: https://github.com/kamailio/kamailio/commit/0f093556d0ad9e8bcf92222ac0cc7c1… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index c443804535..913168c652 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.3 +pkgver=5.4.4 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 950dd4b0e4..dc76d321f6 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.3 +%define ver 5.4.4 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:master:2664a51c: Fixed typo.
by Juha Heinanen 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: 2664a51c35a1e8b5adc4c7e6cedde60bc01f0b28 URL: https://github.com/kamailio/kamailio/commit/2664a51c35a1e8b5adc4c7e6cedde60… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2021-02-11T17:27:44+02:00 Fixed typo. --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2664a51c35a1e8b5adc4c7e6cedde60… Patch: https://github.com/kamailio/kamailio/commit/2664a51c35a1e8b5adc4c7e6cedde60… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index a925014715..7dc08b7b5c 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -560,7 +560,7 @@ remove_record_route(); scheme (sip: or sips:), one is added based on routing requirements. Thus the value has to be like "address:port;parameters", the port and parameters are optional. If the second parameter is provided, do not - forget to add the parameter "r2=0" so the proxy processes both + forget to add the parameter "r2=on" so the proxy processes both corresponding Route headers at once.</para> <para>When the <quote>outbound</quote> module was loaded before this

2 1

git:master:5064ffc6: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: 5064ffc6490ed9db3f92a171e6b950fd0e8056e6 URL: https://github.com/kamailio/kamailio/commit/5064ffc6490ed9db3f92a171e6b950f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-02-15T08:46:22+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/5064ffc6490ed9db3f92a171e6b950f… Patch: https://github.com/kamailio/kamailio/commit/5064ffc6490ed9db3f92a171e6b950f… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index c125b689d6..87ed1f9287 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -30,6 +30,7 @@ Daniel-Constantin Mierla 3.2. timeout (int) 3.3. cache_dir (str) 3.4. cache_expire (int) + 3.5. modproc (str) 4. Functions @@ -47,11 +48,12 @@ Daniel-Constantin Mierla 1.2. Set timeout parameter 1.3. Set cache_dir parameter 1.4. Set cache_expire parameter - 1.5. secsipid_check_identity usage - 1.6. secsipid_check_identity_pubkey usage - 1.7. secsipid_get_url usage - 1.8. secsipid_add_identity usage - 1.9. Libsecsipid usage + 1.5. Set modproc parameter + 1.6. secsipid_check_identity usage + 1.7. secsipid_check_identity_pubkey usage + 1.8. secsipid_get_url usage + 1.9. secsipid_add_identity usage + 1.10. Libsecsipid usage Chapter 1. Admin Guide @@ -69,6 +71,7 @@ Chapter 1. Admin Guide 3.2. timeout (int) 3.3. cache_dir (str) 3.4. cache_expire (int) + 3.5. modproc (str) 4. Functions @@ -89,6 +92,11 @@ Chapter 1. Admin Guide It exports the functions to check and generate SIP Identity header. + Note that this module needs "secsipid_proc.so" module to be installed, + but without loading the "secsipid_proc.so" via "loadmodule". This + module loads "secsipid_proc.so" in child init callback in order to + initialize the "libsecsipid" per child process. + 2. Dependencies 2.1. Kamailio Modules @@ -96,14 +104,15 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules - The following modules must be loaded before this module: - * No dependencies on other Kamailio modules. + The following modules must be installed (but not loaded) to use this + module: + * secsipid_proc. 2.2. External Libraries or Applications The following libraries or applications must be installed before running Kamailio with this module loaded: - * libsecsipid - https://github.com/asipto/secsipidx/. + * none. 3. Parameters @@ -111,6 +120,7 @@ Chapter 1. Admin Guide 3.2. timeout (int) 3.3. cache_dir (str) 3.4. cache_expire (int) + 3.5. modproc (str) 3.1. expire (int) @@ -160,6 +170,17 @@ modparam("secsipid", "cache_dir", "/tmp/kamailio/secsipid") modparam("secsipid", "cache_expire", 7200) ... +3.5. modproc (str) + + The name of or the path to the required per-process API module. + + Default value is "secsipid_proc.so". + + Example 1.5. Set modproc parameter +... +modparam("secsipid", "modproc", "secsipid_proc2.so") +... + 4. Functions 4.1. secsipid_check_identity(keyPath) @@ -181,7 +202,7 @@ modparam("secsipid", "cache_expire", 7200) This function can be used from ANY_ROUTE. - Example 1.5. secsipid_check_identity usage + Example 1.6. secsipid_check_identity usage ... request_route { ... @@ -205,7 +226,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.6. secsipid_check_identity_pubkey usage + Example 1.7. secsipid_check_identity_pubkey usage ... request_route { ... @@ -226,7 +247,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.7. secsipid_get_url usage + Example 1.8. secsipid_get_url usage ... request_route { ... @@ -250,7 +271,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.8. secsipid_add_identity usage + Example 1.9. secsipid_add_identity usage ... request_route { ... @@ -274,7 +295,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.9. Libsecsipid usage + Example 1.10. Libsecsipid usage ... go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/

1 0

git:master:09c61a1f: secsipid: redesign to use per-process API functions
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: 09c61a1fe5c551b021a5c2a6997203f80a7c6f18 URL: https://github.com/kamailio/kamailio/commit/09c61a1fe5c551b021a5c2a6997203f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T08:34:05+01:00 secsipid: redesign to use per-process API functions - needed to initialize the multi-threaded libsecsipid library per child process - per-process API functions to be offered by secsipid_proc module --- Added: src/modules/secsipid/secsipid_papi.h Modified: src/modules/secsipid/Makefile Modified: src/modules/secsipid/doc/secsipid_admin.xml Modified: src/modules/secsipid/secsipid_mod.c Removed: src/modules/secsipid/libsecsipid.h Removed: src/modules/secsipid/secsipid.h --- Diff: https://github.com/kamailio/kamailio/commit/09c61a1fe5c551b021a5c2a6997203f… Patch: https://github.com/kamailio/kamailio/commit/09c61a1fe5c551b021a5c2a6997203f…

1 0

git:master:bd432651: secsipid_proc: per-process API functions needed by secsipid module
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: bd432651a0343b41811e379a03fa582fa95cd366 URL: https://github.com/kamailio/kamailio/commit/bd432651a0343b41811e379a03fa582… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T08:37:55+01:00 secsipid_proc: per-process API functions needed by secsipid module --- Added: src/modules/secsipid_proc/Makefile Added: src/modules/secsipid_proc/README Added: src/modules/secsipid_proc/doc/Makefile Added: src/modules/secsipid_proc/doc/secsipid_proc.xml Added: src/modules/secsipid_proc/doc/secsipid_proc_admin.xml Added: src/modules/secsipid_proc/libsecsipid.h Added: src/modules/secsipid_proc/secsipid.h Added: src/modules/secsipid_proc/secsipid_proc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bd432651a0343b41811e379a03fa582… Patch: https://github.com/kamailio/kamailio/commit/bd432651a0343b41811e379a03fa582…

1 0

git:master:b4d1def5: pv: proper transfomation name in the log message
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: b4d1def5d8a5ffaddbd87708d8dc99f0f5f8853c URL: https://github.com/kamailio/kamailio/commit/b4d1def5d8a5ffaddbd87708d8dc99f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-13T20:59:30+01:00 pv: proper transfomation name in the log message --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/b4d1def5d8a5ffaddbd87708d8dc99f… Patch: https://github.com/kamailio/kamailio/commit/b4d1def5d8a5ffaddbd87708d8dc99f… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 437e3b2e74..a4faa1fb7d 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2749,7 +2749,7 @@ char* tr_parse_string(str* in, trans_t *t) while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; if(*p!=TR_RBRACKET) { - LM_ERR("invalid ftime transformation: %.*s!!\n", + LM_ERR("invalid rm transformation: %.*s!!\n", in->len, in->s); goto error; }

1 0

git:master:10cfe340: pv: new transformations {s.after, char} and {s.before, char}
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: 10cfe340407e479b04a10b47857aab10c1e9f275 URL: https://github.com/kamailio/kamailio/commit/10cfe340407e479b04a10b47857aab1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-14T09:40:34+01:00 pv: new transformations {s.after,char} and {s.before,char} --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/10cfe340407e479b04a10b47857aab1… Patch: https://github.com/kamailio/kamailio/commit/10cfe340407e479b04a10b47857aab1…

1 0

git:master:25b1a518: core: split function that locates a module file
by Daniel-Constantin Mierla 15 Feb '21

15 Feb '21

Module: kamailio Branch: master Commit: 25b1a51806dfa661f987958c8e84a16e60e37a4f URL: https://github.com/kamailio/kamailio/commit/25b1a51806dfa661f987958c8e84a16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T08:33:07+01:00 core: split function that locates a module file --- Modified: src/core/sr_module.c Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/25b1a51806dfa661f987958c8e84a16… Patch: https://github.com/kamailio/kamailio/commit/25b1a51806dfa661f987958c8e84a16… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index a021cb92c3..0a7ba37848 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -376,44 +376,24 @@ static inline int version_control(void *handle, char *path) } /** - * \brief load a sr module + * \brief lookup a module and fill the new path * - * tries to load the module specified by mod_path. - * If mod_path is 'modname' or 'modname.so' then - * \<MODS_DIR\>/\<modname\>.so will be tried and if this fails - * \<MODS_DIR\>/\<modname\>/\<modname\>.so - * If mod_path contain a '/' it is assumed to be the - * path to the module and tried first. If fails and mod_path is not - * absolute path (not starting with '/') then will try: - * \<MODS_DIR\>/mod_path * @param mod_path path or module name + * @param new_path resolved path to the module, must be pkg_free() if != mod_path * @return 0 on success , <0 on error */ -int load_module(char* mod_path) +int ksr_locate_module(char *mod_path, char **new_path) { - void* handle; - char* error; - mod_register_function mr; - module_exports_t* exp; - struct sr_module* t; struct stat stat_buf; str modname; char* mdir; char* nxt_mdir; char* path; int mdir_len; - int len; - int dlflags; - int new_dlflags; - int retries; int path_type; - str expref; - char exbuf[64]; + int len; -#ifndef RTLD_NOW -/* for openbsd */ -#define RTLD_NOW DL_LAZY -#endif + *new_path = NULL; path=mod_path; path_type = 0; modname.s = path; @@ -523,6 +503,57 @@ int load_module(char* mod_path) goto error; } } + + LM_DBG("found module to load <%s>\n", path); + *new_path = path; + return 0; + +error: + if(path!=mod_path) { + pkg_free(path); + } + + return -1; +} + +/** + * \brief load a sr module + * + * tries to load the module specified by mod_path. + * If mod_path is 'modname' or 'modname.so' then + * \<MODS_DIR\>/\<modname\>.so will be tried and if this fails + * \<MODS_DIR\>/\<modname\>/\<modname\>.so + * If mod_path contain a '/' it is assumed to be the + * path to the module and tried first. If fails and mod_path is not + * absolute path (not starting with '/') then will try: + * \<MODS_DIR\>/mod_path + * @param mod_path path or module name + * @return 0 on success , <0 on error + */ +int load_module(char* mod_path) +{ + void* handle; + char* error; + mod_register_function mr; + module_exports_t* exp; + struct sr_module* t; + int dlflags; + int new_dlflags; + int retries; + char* path = NULL; + str expref; + char exbuf[64]; + char* mdir; + +#ifndef RTLD_NOW +/* for openbsd */ +#define RTLD_NOW DL_LAZY +#endif + + if(ksr_locate_module(mod_path, &path)<0) { + return -1; + } + LM_DBG("trying to load <%s>\n", path); retries=2; diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 1d3150b326..8de9026c2a 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -549,4 +549,6 @@ int destroy_modules_phase(void); int ksr_shutdown_phase_init(void); int ksr_shutdown_phase(void); +int ksr_locate_module(char *mod_path, char **new_path); + #endif /* sr_module_h */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev