sr-dev February 2021

sr-dev@lists.kamailio.org

20 participants
248 discussions

git:master:614852cf: corex: added is_socket_name(sockname) config function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 614852cfdc3f6a18549b8e20ef51af9e64a93eba URL: https://github.com/kamailio/kamailio/commit/614852cfdc3f6a18549b8e20ef51af9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-25T16:49:46+01:00 corex: added is_socket_name(sockname) config function - test if the parameter matches a local socket name - function exported to kemi --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/614852cfdc3f6a18549b8e20ef51af9… Patch: https://github.com/kamailio/kamailio/commit/614852cfdc3f6a18549b8e20ef51af9… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 194efcdb8e..ee1ddd37f4 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -68,6 +68,7 @@ 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 w_is_socket_name(sip_msg_t *msg, char *psockname, char *p2); static int fixup_file_op(void** param, int param_no); @@ -146,6 +147,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE }, + {"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null, + 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -1109,6 +1112,46 @@ static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2) return -1; } +/** + * + */ +static int ki_is_socket_name(sip_msg_t *msg, str *sockname) +{ + socket_info_t *si = NULL; + + if (sockname==NULL || sockname->len<=0) { + LM_ERR("invalid socket name value\n"); + return -1; + } + + si = ksr_get_socket_by_name(sockname); + if(si != NULL) { + return 1; + } + return -1; +} + +/** + * + */ +static int w_is_socket_name(sip_msg_t *msg, char *psockname, char *p2) +{ + str sockname; + socket_info_t *si = NULL; + + if (fixup_get_svalue(msg, (gparam_t*)psockname, &sockname)!=0 + || sockname.len<=0) { + LM_ERR("cannot get socket name value\n"); + return -1; + } + + si = ksr_get_socket_by_name(&sockname); + if(si != NULL) { + return 1; + } + return -1; +} + /** * */ @@ -1238,6 +1281,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("is_socket_name"), + SR_KEMIP_INT, ki_is_socket_name, + { SR_KEMIP_STR, 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 } } };

3 years, 4 months

git:master:f9c336aa: ims_qos: typos in comments

by Daniel-Constantin Mierla

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) {

3 years, 4 months

Is sort on htable init necessary?

by Manfred Dellkrantz

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

3 years, 4 months

Errored: kamailio/kamailio#9905 (master - 571fe52)

by Travis CI

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.

3 years, 4 months

[kamailio/kamailio] Fix typo in 'core tables successfully installed' msg (#2648)

by Piotr

### 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

3 years, 4 months

git:master:571fe52f: kamdbctl: typo in log message - core tables successfully installed

by Daniel-Constantin Mierla

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

3 years, 4 months

[kamailio/kamailio] unsupported sip invite request-uri format (#2646)

by lglhust

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

3 years, 4 months

Still Failing: kamailio/kamailio#9900 (master - 2ce2448)

by Travis CI

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.

3 years, 4 months

git:master:2ce24482: ipops: use local ip struct for internal resolving

by Daniel-Constantin Mierla

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)

3 years, 4 months

[kamailio/kamailio] usrloc Stats are not compatible with Prometheus (xhttp_prom module) (#2644)

by Sebastian Damm

### 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 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2021