sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
270 discussions

git:5.5:0afcccdc: src/Makefile.defs: link -lrt if glibc <= 2.17

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 0afcccdc46950c5b4a49024e2092ab712ba6be94 URL: https://github.com/kamailio/kamailio/commit/0afcccdc46950c5b4a49024e2092ab7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:27:31+01:00 src/Makefile.defs: link -lrt if glibc <= 2.17 - GH #2921 (cherry picked from commit 743a9d33dcc3a6220bba217c14810dafb53355b2) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0afcccdc46950c5b4a49024e2092ab7… Patch: https://github.com/kamailio/kamailio/commit/0afcccdc46950c5b4a49024e2092ab7… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 82b8751e2e..ab3d6b7e27 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1886,6 +1886,13 @@ ifeq ($(OS), linux) ifeq ($(NO_SELECT),) C_DEFS+=-DHAVE_SELECT endif + ifeq ($(CC_NAME), gcc) + # link librt for glibc <= 2.17 + GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) + LIBS+=-lrt + endif + endif endif ifeq ($(OS), gnu_kfreebsd)

2 years, 11 months

git:5.5:0d77ae82: db_cluster: Fix spelling errors

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 0d77ae82ff1cac93a48ede3558ddf48632960a70 URL: https://github.com/kamailio/kamailio/commit/0d77ae82ff1cac93a48ede3558ddf48… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:26:51+01:00 db_cluster: Fix spelling errors (cherry picked from commit 2eed551ed55fcd2bc190e1045da377f6b1e4d22d) --- Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_data.c --- Diff: https://github.com/kamailio/kamailio/commit/0d77ae82ff1cac93a48ede3558ddf48… Patch: https://github.com/kamailio/kamailio/commit/0d77ae82ff1cac93a48ede3558ddf48… --- diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index 838f2a24c2..d1906e0f9d 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -72,7 +72,7 @@ extern int dbcl_max_query_length; cls->usedcon = cls->rlist[i].clist[j];\ return 0;\ } else {\ - LM_DBG("serial operation - failre on cluster"\ + LM_DBG("serial operation - failure on cluster"\ " [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ sec = get_ticks() - sec;\ @@ -105,7 +105,7 @@ extern int dbcl_max_query_length; cls->rlist[i].crt = (j+1) % cls->rlist[i].clen;\ return 0;\ } else {\ - LM_DBG("round robin operation - failre on cluster"\ + LM_DBG("round robin operation - failure on cluster"\ " [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ sec = get_ticks() - sec;\ @@ -409,7 +409,7 @@ db1_con_t* db_cluster_init(const str* _dburl) LM_DBG("initializing with cluster [%.*s]\n", _dburl->len, _dburl->s); if(_dburl->len<10 || strncmp(_dburl->s, "cluster://", 10)!=0) { - LM_ERR("invlaid url for cluster module [%.*s]\n", + LM_ERR("invalid url for cluster module [%.*s]\n", _dburl->len, _dburl->s); return NULL; } @@ -433,7 +433,7 @@ db1_con_t* db_cluster_init(const str* _dburl) cls->ref++; h = (db1_con_t*)pkg_malloc(sizeof(db1_con_t)); if (h==NULL) { - LM_ERR("out of pkg\n"); + LM_ERR("out of pkg memory\n"); return NULL; } memset(h, 0, sizeof(db1_con_t)); diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index f3cb2dcbf8..65bc0eed40 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -265,7 +265,7 @@ int dbcl_cls_set_connections(dbcl_cls_t *cls, str *cons) pit->name.len, pit->name.s, i, cls->rlist[i].clen); cls->rlist[i].clen++; } else { - LM_WARN("too many read connections in cluster - con-id [%.*s]\n", + LM_WARN("too many read connections in cluster - connection id [%.*s]\n", pit->name.len, pit->name.s); } if(s.s[2]<'0' || s.s[2]>'9')

2 years, 11 months

git:5.5:8d58f4b1: htable: Fix spelling errors in error and debug messages

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 8d58f4b158a30debe58027875287c6c9d675c8db URL: https://github.com/kamailio/kamailio/commit/8d58f4b158a30debe58027875287c6c… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:27:02+01:00 htable: Fix spelling errors in error and debug messages (cherry picked from commit 9517cf47f512f561c6461edc3cbca3410e773735) --- Modified: src/modules/htable/api.c Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_var.c Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/8d58f4b158a30debe58027875287c6c… Patch: https://github.com/kamailio/kamailio/commit/8d58f4b158a30debe58027875287c6c…

2 years, 11 months

git:5.5:2c196d14: core: flags - use unsigned literal for bit shifting operations

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 2c196d149c19ee59174f89020407e1f15156182e URL: https://github.com/kamailio/kamailio/commit/2c196d149c19ee59174f89020407e1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:25:09+01:00 core: flags - use unsigned literal for bit shifting operations (cherry picked from commit 1a406e093ea7ac07428c92aec21ac67f8caa1093) --- Modified: src/core/flags.c --- Diff: https://github.com/kamailio/kamailio/commit/2c196d149c19ee59174f89020407e1f… Patch: https://github.com/kamailio/kamailio/commit/2c196d149c19ee59174f89020407e1f… --- diff --git a/src/core/flags.c b/src/core/flags.c index 551eefe2ee..207849c198 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -43,12 +43,12 @@ static flag_t sflags = 0; int setflag( struct sip_msg* msg, flag_t flag ) { - msg->flags |= 1 << flag; + msg->flags |= 1u << flag; return 1; } int resetflag( struct sip_msg* msg, flag_t flag ) { - msg->flags &= ~ (1 << flag); + msg->flags &= ~ (1u << flag); return 1; } @@ -58,7 +58,7 @@ int resetflags( struct sip_msg* msg, flag_t flags ) { } int isflagset( struct sip_msg* msg, flag_t flag ) { - return (msg->flags & (1<<flag)) ? 1 : -1; + return (msg->flags & (1u<<flag)) ? 1 : -1; } int flag_in_range( flag_t flag ) { @@ -79,21 +79,21 @@ int setsflagsval(flag_t val) int setsflag(flag_t flag) { - sflags |= 1 << flag; + sflags |= 1u << flag; return 1; } int resetsflag(flag_t flag) { - sflags &= ~ (1 << flag); + sflags &= ~ (1u << flag); return 1; } int issflagset(flag_t flag) { - return (sflags & (1<<flag)) ? 1 : -1; + return (sflags & (1u<<flag)) ? 1 : -1; } @@ -126,7 +126,7 @@ static unsigned char registered_flags[MAX_FLAG+1]; void init_named_flags() { int r; - + for (r=0; r<FLAGS_NAME_HASH_ENTRIES; r++) clist_init(&name2flags[r], next, prev); } @@ -149,7 +149,7 @@ inline static struct flag_entry* flag_search(struct flag_hash_head* lst, char* name, int len) { struct flag_entry* fe; - + clist_foreach(lst, fe, next){ if ((fe->name.len==len) && (memcmp(fe->name.s, name, len)==0)){ /* found */ @@ -176,7 +176,7 @@ inline static struct flag_entry* get_flag_entry(char* name, int len) int get_flag_no(char* name, int len) { struct flag_entry* fe; - + fe=get_flag_entry(name, len); return (fe)?fe->no:-1; } @@ -184,7 +184,7 @@ int get_flag_no(char* name, int len) /* resgiter a new flag name and associates it with pos - * pos== -1 => any position will do + * pos== -1 => any position will do * returns flag pos on success (>=0) * -1 flag is an alias for an already existing flag * -2 flag already registered @@ -199,7 +199,7 @@ int register_flag(char* name, int pos) static unsigned int crt_flag=0; unsigned int last_flag; unsigned int h; - + len=strlen(name); h=get_hash1_raw(name, len) & (FLAGS_NAME_HASH_ENTRIES-1); /* check if the name already exists */ @@ -235,7 +235,7 @@ int register_flag(char* name, int pos) } } registered_flags[pos]++; - + e=pkg_malloc(sizeof(struct flag_entry)); if (e==0){ PKG_MEM_ERROR; @@ -259,7 +259,7 @@ int setxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] |= 1 << fb; + msg->xflags[fi] |= 1u << fb; return 1; } @@ -272,7 +272,7 @@ int resetxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] &= ~ (1 << fb); + msg->xflags[fi] &= ~ (1u << fb); return 1; } @@ -285,5 +285,5 @@ int isxflagset(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - return (msg->xflags[fi] & (1<<fb)) ? 1 : -1; + return (msg->xflags[fi] & (1u<<fb)) ? 1 : -1; }

2 years, 11 months

git:5.5:4814bac2: nat_traversal: declare flag literal as unsigned

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 4814bac2424db7fea2ba817fcdf4594a7b2e1c11 URL: https://github.com/kamailio/kamailio/commit/4814bac2424db7fea2ba817fcdf4594… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:24:43+01:00 nat_traversal: declare flag literal as unsigned - GH #2954 (cherry picked from commit 8c30109df0b479cc3fce39a765717149e9c70ddf) --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/4814bac2424db7fea2ba817fcdf4594… Patch: https://github.com/kamailio/kamailio/commit/4814bac2424db7fea2ba817fcdf4594… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 4cfe8d4018..fd5fac5b5e 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -85,7 +85,7 @@ MODULE_VERSION /* WARNING: Keep this aligned with parser/msg_parser.h! */ -#define FL_DO_KEEPALIVE (1 << 31) +#define FL_DO_KEEPALIVE (1u << 31) #define HASH_SIZE 512

2 years, 11 months

Next online devel meeting - Wed, Dec 15, 2021, 15:00UTC

by Daniel-Constantin Mierla

Hello, 2021 is almost over, time ran fast somehow this year, with a major release in the middle, which delayed the development discussion for the next one, so it's time for it! As usual, the aim is to sketch the roadmap to next major release so the developers and community members can syncronize and plan what should be done till Kamailio v5.6 will be out as well as discuss about current state of the project, look for new ideas to improve collaboration within the community, a.s.o. The meeting will be done on a matrix chat room. More details are in the wiki page of the event, available at: * https://www.kamailio.org/wiki/devel/irc-meetings/2021a Feel free to add there topics that you want to be discussed. The proposed date is next Wednesday, December 15, 2021, at 15:00UTC (15:00 London/Dublin, 16:00 most of West Europe, 10:00 New York), but other dates can be proposed if they suit for more participants. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda _______________________________________________ Kamailio (SER) - Development Mailing List sr-dev(a)lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

2 years, 11 months

[kamailio/kamailio] http_client/http_async_client crash at startup if used with tls and openssl 1.1 (Issue #2912)

by kdanderso

### Description When attempting to use either http_client or http_async_client with tls support enabled and openssl version 1.1.x, Kamailio crashes at startup. If openssl is reverted to version 1.0.2r as described in #1860, the issue does not occur. #### Reproduction On a system using openssl version 1.1.x (e.g. 1.1.1l) start Kamailio 5.5.2 with this config file for http_client failure: [kamailio.cfg.txt](https://github.com/kamailio/kamailio/files/7442436/kamail… To test http_async_client, load pv.so and http_async_client.so instead of http_client.so. #### Debugging Data [bt.txt](https://github.com/kamailio/kamailio/files/7442493/bt.txt) #### Log Messages [kam.log.txt](https://github.com/kamailio/kamailio/files/7442496/kam.log.txt) ### Additional Information * **Kamailio Version**: [kamversion.txt](https://github.com/kamailio/kamailio/files/7442506/kamversi… * **Operating System**: Linux 5.4.0-89-generic #100-Ubuntu SMP Fri Sep 24 14:50:10 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux [os.txt](https://github.com/kamailio/kamailio/files/7442509/os.txt) -- 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/2912

2 years, 11 months

git:master:09ac5b6c: kemix: exported kx.get_sas()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 09ac5b6c5330bc0a9eb4617d2385745b4a09c116 URL: https://github.com/kamailio/kamailio/commit/09ac5b6c5330bc0a9eb4617d2385745… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-15T14:53:00+01:00 kemix: exported kx.get_sas() - return source address in socket format, similar to $sas --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/09ac5b6c5330bc0a9eb4617d2385745… Patch: https://github.com/kamailio/kamailio/commit/09ac5b6c5330bc0a9eb4617d2385745… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 2b6f6ec9c2..089ad5e326 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -1100,6 +1100,39 @@ static sr_kemi_xval_t* ki_kx_get_srcuri(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_sas(sip_msg_t *msg) +{ + str ssock; + + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + + } + + if(get_src_address_socket(msg, &ssock)<0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + if (ssock.len + 1 >= pv_get_buffer_size()) { + LM_ERR("local buffer size exceeded\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.v.s.s = pv_get_buffer(); + strncpy(_sr_kemi_kx_xval.v.s.s, ssock.s, ssock.len); + _sr_kemi_kx_xval.v.s.len = ssock.len; + _sr_kemi_kx_xval.v.s.s[_sr_kemi_kx_xval.v.s.len] = '\0'; + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -1370,6 +1403,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_sas"), + SR_KEMIP_XVAL, ki_kx_get_sas, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_ua"), SR_KEMIP_XVAL, ki_kx_get_ua, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

2 years, 11 months

git:master:06306c29: kazoo: fix prototype for ki_kz_amqp_publish_hdrs()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 06306c29d45449d83db718a3e2207ee3fd1755c1 URL: https://github.com/kamailio/kamailio/commit/06306c29d45449d83db718a3e2207ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-15T14:29:25+01:00 kazoo: fix prototype for ki_kz_amqp_publish_hdrs() --- Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/06306c29d45449d83db718a3e2207ee… Patch: https://github.com/kamailio/kamailio/commit/06306c29d45449d83db718a3e2207ee… --- diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index 46897f694b..d614039211 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -275,8 +275,8 @@ int kz_amqp_add_connection(modparam_t type, void* val); int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload); int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* headers); -int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload, str* headers); -int ki_kz_amqp_publish_hdrs(sip_msg_t* msg, str* exchange, str* routing_key, str* payload); +int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload); +int ki_kz_amqp_publish_hdrs(sip_msg_t* msg, str* exchange, str* routing_key, str* payload, str* headers); int kz_amqp_query(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* dst, char* headers); int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* headers); int kz_amqp_subscribe(struct sip_msg* msg, char* payload);

2 years, 11 months

git:master:96ba8bdf: misc/examples: kemi - sanity check for response in lua script

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 96ba8bdf87221c985d8198fe36f7f0bd9858a738 URL: https://github.com/kamailio/kamailio/commit/96ba8bdf87221c985d8198fe36f7f0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-15T12:37:48+01:00 misc/examples: kemi - sanity check for response in lua script --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/96ba8bdf87221c985d8198fe36f7f0b… Patch: https://github.com/kamailio/kamailio/commit/96ba8bdf87221c985d8198fe36f7f0b… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index bddabbaa895..a406b6429cf 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -195,7 +195,7 @@ function ksr_route_reqinit() end if KSR.sanity.sanity_check(1511, 7)<0 then - KSR.err("Malformed SIP message from " + KSR.err("malformed SIP message from " .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); KSR.x.exit(); end @@ -418,6 +418,11 @@ end -- SIP response handling -- equivalent of reply_route{} function ksr_reply_route() - KSR.info("===== response - from kamailio lua script\n"); + KSR.dbg("response - from kamailio lua script\n"); + if KSR.sanity.sanity_check(17604, 6)<0 then + KSR.err("malformed SIP response from " + .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); + KSR.x.drop(); + end return 1; end

2 years, 11 months

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021