- sr-dev - kamailio.org

git:5.5:dc5eda21: core: parser - print start of buffer on error for identity info
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: dc5eda219c152d1c08ba38849163849f62242b2d URL: https://github.com/kamailio/kamailio/commit/dc5eda219c152d1c08ba38849163849… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:16+01:00 core: parser - print start of buffer on error for identity info (cherry picked from commit 48dc90dfa1839a405e7d090b23c1fdc907107731) --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/dc5eda219c152d1c08ba38849163849… Patch: https://github.com/kamailio/kamailio/commit/dc5eda219c152d1c08ba38849163849… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index e58bcd26ff..6aaabf2377 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -313,7 +313,7 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) parseerror: if(p<end) { LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p, status, (int)(p-buffer), ZSW(p)); + *p, status, (int)(p-buffer), buffer); } else { LM_ERR("unexpected end of buffer - status %d\n", status); }

1 0

git:5.5:8d58f4b1: htable: Fix spelling errors in error and debug messages
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

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…

1 0

git:5.5:0d77ae82: db_cluster: Fix spelling errors
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

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

1 0

git:5.5:4814bac2: nat_traversal: declare flag literal as unsigned
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

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

1 0

git:5.5:2c196d14: core: flags - use unsigned literal for bit shifting operations
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

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; }

1 0

Next online devel meeting - Wed, Dec 15, 2021, 15:00UTC
by Daniel-Constantin Mierla 15 Dec '21

15 Dec '21

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

1 2

[kamailio/kamailio] http_client/http_async_client crash at startup if used with tls and openssl 1.1 (Issue #2912)
by kdanderso 15 Dec '21

15 Dec '21

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

4 9

git:master:09ac5b6c: kemix: exported kx.get_sas()
by Daniel-Constantin Mierla 15 Dec '21

15 Dec '21

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,

1 0

git:master:06306c29: kazoo: fix prototype for ki_kz_amqp_publish_hdrs()
by Daniel-Constantin Mierla 15 Dec '21

15 Dec '21

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

1 0

git:master:96ba8bdf: misc/examples: kemi - sanity check for response in lua script
by Daniel-Constantin Mierla 15 Dec '21

15 Dec '21

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

1 0

git:master:1cd480df: core: parser - clang format for parse_identityinfo.c
by Daniel-Constantin Mierla 15 Dec '21

15 Dec '21

Module: kamailio Branch: master Commit: 1cd480dfe6f2e06bac99b74e466e0c6bb8801279 URL: https://github.com/kamailio/kamailio/commit/1cd480dfe6f2e06bac99b74e466e0c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-15T09:00:45+01:00 core: parser - clang format for parse_identityinfo.c --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/1cd480dfe6f2e06bac99b74e466e0c6… Patch: https://github.com/kamailio/kamailio/commit/1cd480dfe6f2e06bac99b74e466e0c6…

1 0

git:master:b0f4c835: kazoo: fix kemi export due to changed function prototype
by Daniel-Constantin Mierla 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: b0f4c835b91059f021c4e5be1b16a6493cc46fbe URL: https://github.com/kamailio/kamailio/commit/b0f4c835b91059f021c4e5be1b16a64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T20:42:02+01:00 kazoo: fix kemi export due to changed function prototype - change done in dcb8e1650204c9453457871515ab5c7ec2d497f1 --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/b0f4c835b91059f021c4e5be1b16a64… Patch: https://github.com/kamailio/kamailio/commit/b0f4c835b91059f021c4e5be1b16a64… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 7155c62d37..4d9e3dcd8a 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1262,10 +1262,10 @@ int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, c headers_s.s = ""; } - return ki_kz_amqp_publish(msg, &exchange_s, &routing_key_s, &pl_s, &headers_s); + return ki_kz_amqp_publish_hdrs(msg, &exchange_s, &routing_key_s, &pl_s, &headers_s); }; -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, str* headers) { char *pl = ((str*)payload)->s; struct json_object *j = json_tokener_parse(pl); @@ -1279,6 +1279,11 @@ int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* pay return kz_amqp_pipe_send(exchange, routing_key, payload, headers); } +int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload) +{ + return ki_kz_amqp_publish_hdrs(msg, exchange, routing_key, payload, NULL); +} + int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload) { return kz_amqp_publish_ex(msg, exchange, routing_key, payload, NULL); diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index 5903314139..46897f694b 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -276,6 +276,7 @@ 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 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);

1 0

git:master:2c239795: jwt: exported jwt_generate_hdrs() function to kemi
by Daniel-Constantin Mierla 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: 2c239795d3d1a7e0ef9918006ff57da13dfedae1 URL: https://github.com/kamailio/kamailio/commit/2c239795d3d1a7e0ef9918006ff57da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T17:55:22+01:00 jwt: exported jwt_generate_hdrs() function to kemi --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2c239795d3d1a7e0ef9918006ff57da… Patch: https://github.com/kamailio/kamailio/commit/2c239795d3d1a7e0ef9918006ff57da… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 4424aee13d..233a0709e3 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -174,7 +174,8 @@ static int jwt_fcache_add(str *key, str *kdata) /** * */ -static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, str *headers) +static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, + str *headers) { str dupclaims = STR_NULL; str sparams = STR_NULL; @@ -187,7 +188,7 @@ static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, unsigned char keybuf[10240]; size_t keybuf_len = 0; param_t* params_list = NULL; - param_t* headers_list = NULL; + param_t* headers_list = NULL; param_hooks_t phooks; param_t *pit = NULL; param_t *header = NULL; @@ -323,7 +324,7 @@ static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, free_params(params_list); pkg_free(dupclaims.s); free_params(headers_list); - pkg_free(dupheaders.s); + pkg_free(dupheaders.s); jwt_free(jwt); return 1; @@ -404,7 +405,7 @@ static int w_jwt_generate_4(sip_msg_t* msg, char* pkey, char* palg, char* pclaim LM_ERR("cannot get claims value\n"); return -1; } - + if (fixup_get_svalue(msg, (gparam_t*)pheaders, &sheaders) != 0) { LM_ERR("cannot get headers value\n"); return -1; @@ -617,6 +618,11 @@ static sr_kemi_t sr_kemi_jwt_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("jwt"), str_init("jwt_generate_hdrs"), + SR_KEMIP_INT, ki_jwt_generate_hdrs, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("jwt"), str_init("jwt_verify"), SR_KEMIP_INT, ki_jwt_verify, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

1 0

git:master:c83b3eb8: modules: readme files regenerated - jwt ... [skip ci]
by Kamailio Dev 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: c83b3eb828efbe5370eab9ecdfdd10cb9ea11a87 URL: https://github.com/kamailio/kamailio/commit/c83b3eb828efbe5370eab9ecdfdd10c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-14T17:46:16+01:00 modules: readme files regenerated - jwt ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/c83b3eb828efbe5370eab9ecdfdd10c… Patch: https://github.com/kamailio/kamailio/commit/c83b3eb828efbe5370eab9ecdfdd10c…

1 0

[kamailio/kamailio] jwt: possibility to add headers when generating jwt (PR #2971)
by Rodrigo Alves Silva 14 Dec '21

14 Dec '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) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Adding an optional forth parameter to jwt module to add headers. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2971 -- Commit Summary -- * jwt: possibility to add headers when generating jwt -- File Changes -- M src/modules/jwt/doc/jwt_admin.xml (11) M src/modules/jwt/jwt_mod.c (85) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2971.patch https://github.com/kamailio/kamailio/pull/2971.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/2971

2 11

git:master:aaa142d2: jwt: possibility to add headers when generating jwt
by Daniel-Constantin Mierla 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: aaa142d293105ef27f7e4b6143fc3fb18c9a5a75 URL: https://github.com/kamailio/kamailio/commit/aaa142d293105ef27f7e4b6143fc3fb… Author: rodrigo.alves <rodrigo.alves(a)messagebird.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T17:36:02+01:00 jwt: possibility to add headers when generating jwt --- Modified: src/modules/jwt/doc/jwt_admin.xml Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aaa142d293105ef27f7e4b6143fc3fb… Patch: https://github.com/kamailio/kamailio/commit/aaa142d293105ef27f7e4b6143fc3fb…

1 0

git:master:8df3752c: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: 8df3752c2d7ea37b4acadf76283287744a56005a URL: https://github.com/kamailio/kamailio/commit/8df3752c2d7ea37b4acadf762832877… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-14T14:16:31+01:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/8df3752c2d7ea37b4acadf762832877… Patch: https://github.com/kamailio/kamailio/commit/8df3752c2d7ea37b4acadf762832877… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 127cfa7601..94c8cfc069 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -234,6 +234,14 @@ Chapter 1. Admin Guide module that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in Kamailio.cfg). + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require Kamailio to be started with --atexit=no + command line parameters to avoid calling C atexit callbacks inside the + process ending during daemonize procedure as well as during shut down, + which can lead to crashes because it destroys and then accesses shared + memory. For example, such case has been reported for Ubuntu 20.04 or + RedHat 8. + 2. Quick Start The default kamailio.cfg file has basic tls support included, it has to

1 0

git:master:8dc18cab: tls: docs - added note about --atexit=no cli param for newer libssl versions
by Daniel-Constantin Mierla 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: 8dc18cab5bc32c1d34a9113242d230b7458d4075 URL: https://github.com/kamailio/kamailio/commit/8dc18cab5bc32c1d34a9113242d230b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T14:02:41+01:00 tls: docs - added note about --atexit=no cli param for newer libssl versions --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/8dc18cab5bc32c1d34a9113242d230b… Patch: https://github.com/kamailio/kamailio/commit/8dc18cab5bc32c1d34a9113242d230b… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index b5ea415ae79..e356d5bff7c 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -64,6 +64,15 @@ that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in &kamailio;.cfg). </para> + <para> + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require &kamailio; to be started with + <emphasis>--atexit=no</emphasis> command line parameters to avoid + calling C atexit callbacks inside the process ending during + daemonize procedure as well as during shut down, which can lead + to crashes because it destroys and then accesses shared memory. For + example, such case has been reported for Ubuntu 20.04 or RedHat 8. + </para> </section> <section id="tls.quick_start"> <title>Quick Start</title>

1 0

[kamailio/kamailio] Kamailio with dmq stop processing SIP (Issue #2974)
by tser 13 Dec '21

13 Dec '21

### Description Hi, I have been doing some load testing on kamailio 5.4.7 running in podman. Kamailio is using dmq to share dialogs and htable with a backup Kamailio also running 5.4.7. I tested with 100 CPS and during the first minutes all calls are being processed correctly but then all the messages start to be retransmitted. Kamailio is not processing any sip messages anymore but still replies to HTTP requests, is still possible to run kamctl/kamcmd commands on it but for example, if running the command "kamcmd dlg.list" nothing happens. Also, I did a load test with the backup Kamailio turn off so that there is no replication between them, and in that case, I can run the 100 CPS without any issue. In kamcmd trap file I can see a lot of "<error: Cannot access memory" errors. In order for Kamailio to start processing again sip, I need to restart it. Any extra logs that I can try to collect when the problem happens? #### Debugging Data  [trap.txt](https://github.com/kamailio/kamailio/files/7705076/trap.txt) ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.7 (x86_64/linux) a19fe1 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: a19fe1 compiled on 14:06:57 Dec 13 2021 with gcc 10.2.1 ``` * **Operating System**:  ``` Debian 5.10.70-1 (2021-09-30) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2974

2 2

git:master:2e62177f: core: tcp - fixed typo on condition introduced in previous commit
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 2e62177f7f08314efa883f87f3d703a4f71a1d5e URL: https://github.com/kamailio/kamailio/commit/2e62177f7f08314efa883f87f3d703a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T15:17:37+01:00 core: tcp - fixed typo on condition introduced in previous commit --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/2e62177f7f08314efa883f87f3d703a… Patch: https://github.com/kamailio/kamailio/commit/2e62177f7f08314efa883f87f3d703a… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 8824e123ab..ba9ed92575 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1145,7 +1145,7 @@ int tcpconn_read_haproxy(struct tcp_connection *c) { twaitms = 0; do { bytes = recv(c->s, &hdr, size, 0); - if(bytes==-1 && errno == EINTR)) { + if(bytes==-1 && errno == EINTR) { if(twaitms <= cfg_get(tcp, tcp_cfg, wait_data_ms)) { /* LM_DBG("bytes: %d - errno: %d (%d/%d) - twait: %dms\n", bytes, errno, EINTR, EAGAIN, twaitms); */

1 0

git:master:7a5ae41e: core: tcp - added core parameter tcp_wait_data
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 7a5ae41ec7184ffb362fe54154c350e552ad8917 URL: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T14:47:59+01:00 core: tcp - added core parameter tcp_wait_data - specify how long to wait (in milliseconds) to wait for data on tcp connections in certain cases - default is 5000ms (5secs) - now applies when reading on tcp connection for haproxy protocol --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/tcp_main.c Modified: src/core/tcp_options.c Modified: src/core/tcp_options.h --- Diff: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e… Patch: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e…

1 0

[kamailio/kamailio] dialog: fix missing else (PR #2973)
by Bastian Triller 13 Dec '21

13 Dec '21

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2973 -- Commit Summary -- * dialog: fix missing else -- File Changes -- M src/modules/dialog/dialog.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2973.patch https://github.com/kamailio/kamailio/pull/2973.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/2973

2 2

git:master:1d0b7f22: dialog: fix missing else
by Bastian Triller 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 1d0b7f22b3321cf9b2a4866b0a8a6001538aba42 URL: https://github.com/kamailio/kamailio/commit/1d0b7f22b3321cf9b2a4866b0a8a600… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2021-12-13T13:11:26+01:00 dialog: fix missing else --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/1d0b7f22b3321cf9b2a4866b0a8a600… Patch: https://github.com/kamailio/kamailio/commit/1d0b7f22b3321cf9b2a4866b0a8a600… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 16abec9e88..da3ce7cbfd 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2330,9 +2330,9 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, if (rpc->add(c, "{", &h) < 0) goto error; tnow = time(NULL); - if(dlg->end_ts) { + if (dlg->end_ts) { tdur = (int)(dlg->end_ts - dlg->start_ts); - } if(dlg->start_ts) { + } else if (dlg->start_ts) { tdur = (int)(tnow - dlg->start_ts); } else { tdur = 0;

1 0

git:master:8f23548c: Merge pull request #2973 from btriller/dialog-fix-missing-else
by GitHub 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 8f23548c4d201445e29e73cd0f2efab6a7dc5c04 URL: https://github.com/kamailio/kamailio/commit/8f23548c4d201445e29e73cd0f2efab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-12-13T13:27:36+01:00 Merge pull request #2973 from btriller/dialog-fix-missing-else dialog: fix missing else --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/8f23548c4d201445e29e73cd0f2efab… Patch: https://github.com/kamailio/kamailio/commit/8f23548c4d201445e29e73cd0f2efab… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 16abec9e88..da3ce7cbfd 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2330,9 +2330,9 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, if (rpc->add(c, "{", &h) < 0) goto error; tnow = time(NULL); - if(dlg->end_ts) { + if (dlg->end_ts) { tdur = (int)(dlg->end_ts - dlg->start_ts); - } if(dlg->start_ts) { + } else if (dlg->start_ts) { tdur = (int)(tnow - dlg->start_ts); } else { tdur = 0;

1 0

git:master:ba773d2a: dialog: added duration field in dialog rpc output
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: ba773d2a2bf64e01f1724e61acad765fb311a0a6 URL: https://github.com/kamailio/kamailio/commit/ba773d2a2bf64e01f1724e61acad765… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T09:54:29+01:00 dialog: added duration field in dialog rpc output --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/ba773d2a2bf64e01f1724e61acad765… Patch: https://github.com/kamailio/kamailio/commit/ba773d2a2bf64e01f1724e61acad765… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7361887fe5..16abec9e88 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2324,10 +2324,20 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, void *h, *sh, *ssh; dlg_profile_link_t *pl; dlg_var_t *var; + time_t tnow; + int tdur; if (rpc->add(c, "{", &h) < 0) goto error; - rpc->struct_add(h, "dddSSSddddddddd", + tnow = time(NULL); + if(dlg->end_ts) { + tdur = (int)(dlg->end_ts - dlg->start_ts); + } if(dlg->start_ts) { + tdur = (int)(tnow - dlg->start_ts); + } else { + tdur = 0; + } + rpc->struct_add(h, "dddSSSdddddddddd", "h_entry", dlg->h_entry, "h_id", dlg->h_id, "ref", dlg->ref, @@ -2338,7 +2348,8 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, "start_ts", dlg->start_ts, "init_ts", dlg->init_ts, "end_ts", dlg->end_ts, - "timeout", dlg->tl.timeout ? time(0) + dlg->tl.timeout - get_ticks() : 0, + "duration", tdur, + "timeout", dlg->tl.timeout ? tnow + dlg->tl.timeout - get_ticks() : 0, "lifetime", dlg->lifetime, "dflags", dlg->dflags, "sflags", dlg->sflags,

1 0

git:master:3816bcb2: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 3816bcb2375baef9451025ed906ebf36e8c32ec3 URL: https://github.com/kamailio/kamailio/commit/3816bcb2375baef9451025ed906ebf3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-13T09:31:25+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/3816bcb2375baef9451025ed906ebf3… Patch: https://github.com/kamailio/kamailio/commit/3816bcb2375baef9451025ed906ebf3… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index cb6413f981..8b85f1f05e 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -2198,7 +2198,10 @@ kamcmd dlg.bridge_dlg _from_ _to_ _op_ Name: dlg.stats_active - Parameters: none. + Parameters: + * local_only (optional) - if not 0 then filter out non local dialogs + (the receiving socket is not found locally, from C code point of + view, the bind_addr info is not set). Returned fields * starting - initial INVITE has been processed, no ringing or 1xx has diff --git a/src/modules/ims_usrloc_scscf/README b/src/modules/ims_usrloc_scscf/README index eaf9b5cc87..d6de6ab3d7 100644 --- a/src/modules/ims_usrloc_scscf/README +++ b/src/modules/ims_usrloc_scscf/README @@ -47,6 +47,8 @@ Yasin Caner 3.19. support_wildcardPSI (int) 3.20. unreg_validity (int) 3.21. user_data_xsd (string) + 3.22. realm (string) + 3.23. skip_realm (int) 4. RPC Commands @@ -79,6 +81,8 @@ Yasin Caner 1.19. Set support_wildcardPSI parameter 1.20. Set unreg_validity parameter 1.21. Set unreg_validity parameter + 1.22. Set realm parameter + 1.23. Set skip_realm parameter Chapter 1. Admin Guide @@ -112,6 +116,8 @@ Chapter 1. Admin Guide 3.19. support_wildcardPSI (int) 3.20. unreg_validity (int) 3.21. user_data_xsd (string) + 3.22. realm (string) + 3.23. skip_realm (int) 4. RPC Commands @@ -159,6 +165,8 @@ Chapter 1. Admin Guide 3.19. support_wildcardPSI (int) 3.20. unreg_validity (int) 3.21. user_data_xsd (string) + 3.22. realm (string) + 3.23. skip_realm (int) 3.1. db_url (string) @@ -385,6 +393,23 @@ st/scscf") modparam("ims_usrloc_scscf", "user_data_xsd", "/usr/local/etc/kamailio/C xDataType_Rel6.xsd") +3.22. realm (string) + + Default value is NULL + + Example 1.22. Set realm parameter + modparam("ims_usrloc_scscf", "realm", "kamailio-ims.org") + +3.23. skip_realm (int) + + Skipping defined network name in the realm for NOTIFY's Message body + reginfo tag. + + Default value is 0 + + Example 1.23. Set skip_realm parameter + modparam("ims_usrloc_scscf", "skip_realm", 1) + 4. RPC Commands 4.1. ulscscf.status

1 0

[kamailio/kamailio] failed master build on centos 6 (Issue #2921)
by sergey-safarov 13 Dec '21

13 Dec '21

``` flex -o core/lex.yy.c core/cfg.lex CC (gcc) [kamailio] core/lex.yy.o LD (gcc) [kamailio] kamailio core/ut.o: In function `ksr_clock_gettime': /root/rpmbuild/BUILD/kamailio-5.6.0-dev2/src/core/ut.c:175: undefined reference to `clock_gettime' collect2: ld returned 1 exit status make[1]: *** [kamailio] Error 1 make[1]: Leaving directory `/root/rpmbuild/BUILD/kamailio-5.6.0-dev2/src' make: *** [default] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.RFyzKs (%build) ``` Should we continue support CentOS 6? -- 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/2921

2 8

git:master:225a5947: Makefile.defs: use sed instead of awk for detecting glibc version
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 225a59475c91e154ce0a7f0ec252be841a5a8ce5 URL: https://github.com/kamailio/kamailio/commit/225a59475c91e154ce0a7f0ec252be8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T09:29:06+01:00 Makefile.defs: use sed instead of awk for detecting glibc version --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/225a59475c91e154ce0a7f0ec252be8… Patch: https://github.com/kamailio/kamailio/commit/225a59475c91e154ce0a7f0ec252be8… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 8fab3fd812..57bccfe725 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1890,7 +1890,7 @@ ifeq ($(OS), linux) endif ifeq ($(CC_NAME), gcc) # link librt for glibc <= 2.17 - GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + GLIBCVER=$(shell ldd --version | head -1 | sed -e 's/^.* //' -e 's/\.//' ) ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) LIBS+=-lrt endif

1 0

[kamailio/kamailio] Using undefined environmental variables with #!defenv (Issue #2967)
by Ben Kaufman 13 Dec '21

13 Dec '21

### Description Currently, an undefined environmental variable with `#!defenv` results in Kamailio failing to start. The proposal here that if the environmental variable is not defined, then the macro value would be undefined as well. For example: ``` !#KAMAILIO loadmodule "xlog" loadmodule "pv" #!defenv FOO request_route { #!ifdef FOO xlog("L_INFO","Environmental variable $$FOO is set\n"); #!else xlog("L_WARN","Environmental variable $$FOO is NOT set\n"); #!endif forward(); } ``` Currently this configuration will fail to load if environmental variable is not set. My proposal is to either allow `#!envdef` to accept an undefined environmental variable and have the preprocessor macro undefined, or to add a new keyword (`#!envdefn` perhaps?) to allow this behavior. -- 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/2967

2 6

[kamailio/kamailio] dialog: add local_only paramter to RPC dlg.stats_active (PR #2935)
by Victor Seva 13 Dec '21

13 Dec '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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x ] Tested changes locally - [ x] Related to issue #2920 #### Description allows to filter out non local dialogs from stats using a new argument fix #2920 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2935 -- Commit Summary -- * dialog: add local_only paramter to RPC dlg.stats_active -- File Changes -- M src/modules/dialog/dialog.c (5) M src/modules/dialog/doc/dialog_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2935.patch https://github.com/kamailio/kamailio/pull/2935.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/2935

3 4

git:master:f639dfb5: dialog: docs - typo and clarification about local socket bind address
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: f639dfb5f5b74d77026bec7b8bb493b40ce6d47c URL: https://github.com/kamailio/kamailio/commit/f639dfb5f5b74d77026bec7b8bb493b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T09:22:39+01:00 dialog: docs - typo and clarification about local socket bind address --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f639dfb5f5b74d77026bec7b8bb493b… Patch: https://github.com/kamailio/kamailio/commit/f639dfb5f5b74d77026bec7b8bb493b… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 745efb51f0..d456d545ef 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2805,7 +2805,8 @@ dlg_reset_property("timeout-noreset"); <itemizedlist> <listitem><para> <emphasis>local_only</emphasis> (optional) - if not 0 then filter out - non local dialogues. No bind_addr info in memory. + non local dialogs (the receiving socket is not found locally, + from C code point of view, the bind_addr info is not set). </para></listitem> </itemizedlist> <para>Returned fields</para>

1 0

git:master:506672e5: dialog: add local_only paramter to RPC dlg.stats_active
by Victor Seva 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 506672e523a48985f89e2c35bdab3d024df0a34d URL: https://github.com/kamailio/kamailio/commit/506672e523a48985f89e2c35bdab3d0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T18:23:10+01:00 dialog: add local_only paramter to RPC dlg.stats_active allows to filter out non local dialogs from stats fix #2920 --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/506672e523a48985f89e2c35bdab3d0… Patch: https://github.com/kamailio/kamailio/commit/506672e523a48985f89e2c35bdab3d0… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 243bb9bd9fe..7361887fe59 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2858,16 +2858,21 @@ static void rpc_dlg_stats_active(rpc_t *rpc, void *c) { dlg_cell_t *dlg; unsigned int i; + int dlg_own = 0; int dlg_starting = 0; int dlg_connecting = 0; int dlg_answering = 0; int dlg_ongoing = 0; void *h; + if(rpc->scan(c, "*d", &dlg_own) < 1) + dlg_own = 0; for( i=0 ; i<d_table->size ; i++ ) { dlg_lock( d_table, &(d_table->entries[i]) ); for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { + if(dlg_own != 0 && dlg->bind_addr[0] == NULL) + continue; switch(dlg->state) { case DLG_STATE_UNCONFIRMED: dlg_starting++; diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 987bd545450..745efb51f07 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2801,7 +2801,13 @@ dlg_reset_property("timeout-noreset"); (not relying on core stats framework). </para> <para>Name: <emphasis>dlg.stats_active</emphasis></para> - <para>Parameters: none.</para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>local_only</emphasis> (optional) - if not 0 then filter out + non local dialogues. No bind_addr info in memory. + </para></listitem> + </itemizedlist> <para>Returned fields</para> <itemizedlist> <listitem><para>

1 0

git:master:c3e7b1e4: Merge pull request #2935 from kamailio/vseva/dlg_rpc
by GitHub 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: c3e7b1e4f402081b122ca6f0967f92005e1cfeaf URL: https://github.com/kamailio/kamailio/commit/c3e7b1e4f402081b122ca6f0967f920… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-12-13T09:20:03+01:00 Merge pull request #2935 from kamailio/vseva/dlg_rpc dialog: add local_only paramter to RPC dlg.stats_active --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c3e7b1e4f402081b122ca6f0967f920… Patch: https://github.com/kamailio/kamailio/commit/c3e7b1e4f402081b122ca6f0967f920… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 243bb9bd9fe..7361887fe59 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2858,16 +2858,21 @@ static void rpc_dlg_stats_active(rpc_t *rpc, void *c) { dlg_cell_t *dlg; unsigned int i; + int dlg_own = 0; int dlg_starting = 0; int dlg_connecting = 0; int dlg_answering = 0; int dlg_ongoing = 0; void *h; + if(rpc->scan(c, "*d", &dlg_own) < 1) + dlg_own = 0; for( i=0 ; i<d_table->size ; i++ ) { dlg_lock( d_table, &(d_table->entries[i]) ); for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { + if(dlg_own != 0 && dlg->bind_addr[0] == NULL) + continue; switch(dlg->state) { case DLG_STATE_UNCONFIRMED: dlg_starting++; diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 987bd545450..745efb51f07 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2801,7 +2801,13 @@ dlg_reset_property("timeout-noreset"); (not relying on core stats framework). </para> <para>Name: <emphasis>dlg.stats_active</emphasis></para> - <para>Parameters: none.</para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>local_only</emphasis> (optional) - if not 0 then filter out + non local dialogues. No bind_addr info in memory. + </para></listitem> + </itemizedlist> <para>Returned fields</para> <itemizedlist> <listitem><para>

1 0

[kamailio/kamailio] ims_usrloc_scscf: Add capability to skip a specific realm (PR #2951)
by alexyosifov 13 Dec '21

13 Dec '21

Capability to skip realm in NOTIFY's Message body reginfo tag. Added realm(string) and skip_realm(int) parameters.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2951 -- Commit Summary -- * ims_usrloc_scscf: Add capability to skip a specific realm -- File Changes -- M src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml (28) M src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c (5) M src/modules/ims_usrloc_scscf/udomain.c (59) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2951.patch https://github.com/kamailio/kamailio/pull/2951.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/2951

3 4

git:master:d39bbb08: ims_usrloc_scscf: Add capability to skip a specific realm (#2951)
by GitHub 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: d39bbb080ba9e3d44cc66a35a7934732c5a5e058 URL: https://github.com/kamailio/kamailio/commit/d39bbb080ba9e3d44cc66a35a793473… Author: alexyosifov <47529095+alexyosifov(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2021-12-13T09:19:00+01:00 ims_usrloc_scscf: Add capability to skip a specific realm (#2951) * ims_usrloc_scscf: Add capability to skip a specific realm Capability to skip realm in NOTIFY's Message body reginfo tag. Added realm(string) and skip_realm(int) parameters. * Update ims_usrloc_scscf_admin.xml Revert changes for user_data_xsd --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml Modified: src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c Modified: src/modules/ims_usrloc_scscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/d39bbb080ba9e3d44cc66a35a793473… Patch: https://github.com/kamailio/kamailio/commit/d39bbb080ba9e3d44cc66a35a793473…

1 0

git:master:f42b6c5c: presence: info logs instead of error for not maching conditions
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: f42b6c5cf2ee9861cb1eed016a5ddcc499d2b854 URL: https://github.com/kamailio/kamailio/commit/f42b6c5cf2ee9861cb1eed016a5ddcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T08:31:07+01:00 presence: info logs instead of error for not maching conditions --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/f42b6c5cf2ee9861cb1eed016a5ddcc… Patch: https://github.com/kamailio/kamailio/commit/f42b6c5cf2ee9861cb1eed016a5ddcc… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index a7629a4e92..0ba00f0197 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1369,10 +1369,10 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, send_412: if(!ruid) { - LM_ERR("No E_Tag match %*s\n", presentity->etag.len, + LM_INFO("No E-Tag match %*s\n", presentity->etag.len, presentity->etag.s); } else { - LM_ERR("No ruid match %*s\n", ruid->len, ruid->s); + LM_INFO("No ruid match %*s\n", ruid->len, ruid->s); } if(msg != NULL) {

1 0

git:master:b83810eb: core: parser/sdp - check for delimiter size done before comparison
by Daniel-Constantin Mierla 12 Dec '21

12 Dec '21

Module: kamailio Branch: master Commit: b83810eb1eb70f326698db874a1f67cf6a8d06cf URL: https://github.com/kamailio/kamailio/commit/b83810eb1eb70f326698db874a1f67c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-12T13:29:00+01:00 core: parser/sdp - check for delimiter size done before comparison --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b83810eb1eb70f326698db874a1f67c… Patch: https://github.com/kamailio/kamailio/commit/b83810eb1eb70f326698db874a1f67c… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 144d63b537..c62a347ddc 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -794,12 +794,12 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) return NULL; /* We matched '--', * now let's match the boundary delimiter */ + if(cp1+2+delimiter.len >= plimit) + return NULL; if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) break; else cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; } if (cp1[-1] == '\n' || cp1[-1] == '\r') return cp1;

1 0

git:master:c1ec3857: core: parser/sdp - cast to unsigned for left shifting
by Daniel-Constantin Mierla 12 Dec '21

12 Dec '21

Module: kamailio Branch: master Commit: c1ec3857f360c806b7cc856b8e6ae3d5362ef49f URL: https://github.com/kamailio/kamailio/commit/c1ec3857f360c806b7cc856b8e6ae3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-12T12:31:29+01:00 core: parser/sdp - cast to unsigned for left shifting --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c1ec3857f360c806b7cc856b8e6ae3d… Patch: https://github.com/kamailio/kamailio/commit/c1ec3857f360c806b7cc856b8e6ae3d… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 8f189cf2072..e118b4ac331 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -52,7 +52,10 @@ static struct { #define READ(val) \ - (*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16) + (*(val + 3) << 24)) + ((unsigned int)(*(val + 0)) \ + + ((unsigned int)(*(val + 1)) << 8) \ + + ((unsigned int)(*(val + 2)) << 16) \ + + ((unsigned int)(*(val + 3)) << 24)) #define advance(_ptr,_n,_str,_error) \ do{\ if ((_ptr)+(_n)>(_str).s+(_str).len)\

1 0

git:master:1b5756ae: core: parser/sdp - coherent indentation of two functions
by Daniel-Constantin Mierla 12 Dec '21

12 Dec '21

Module: kamailio Branch: master Commit: 1b5756ae9f67c3907c134eb725f19c875cccd913 URL: https://github.com/kamailio/kamailio/commit/1b5756ae9f67c3907c134eb725f19c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-12T13:13:32+01:00 core: parser/sdp - coherent indentation of two functions --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/1b5756ae9f67c3907c134eb725f19c8… Patch: https://github.com/kamailio/kamailio/commit/1b5756ae9f67c3907c134eb725f19c8… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index e118b4ac33..144d63b537 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -742,7 +742,7 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) } /* eliminate leading whitespace */ - tmp=eat_lws_end(tmp, end); + tmp=eat_lws_end(tmp, end); if (tmp>=end) { LM_ERR("hf empty\n"); goto error; @@ -781,32 +781,32 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) { - static char delimiterhead[3] = "--"; - char *cp, *cp1; - /* Iterate through body */ - cp = p; - for (;;) { - if (cp >= plimit) - return NULL; - for(;;) { - cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); - if (cp1 == NULL) - return NULL; - /* We matched '--', - * now let's match the boundary delimiter */ - if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) - break; - else - cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; - } - if (cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; - if (plimit - cp1 < 2 + delimiter.len) - return NULL; - cp = cp1 + 2 + delimiter.len; - } + static char delimiterhead[3] = "--"; + char *cp, *cp1; + /* Iterate through body */ + cp = p; + for (;;) { + if (cp >= plimit) + return NULL; + for(;;) { + cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); + if (cp1 == NULL) + return NULL; + /* We matched '--', + * now let's match the boundary delimiter */ + if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) + break; + else + cp = cp1 + 2 + delimiter.len; + if (cp >= plimit) + return NULL; + } + if (cp1[-1] == '\n' || cp1[-1] == '\r') + return cp1; + if (plimit - cp1 < 2 + delimiter.len) + return NULL; + cp = cp1 + 2 + delimiter.len; + } } @@ -815,10 +815,10 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) */ char *find_next_sdp_line_delimiter(char* p, char* plimit, str delimiter, char* defptr) { - char *t; - if (p >= plimit || plimit - p < 3) - return defptr; - t = find_sdp_line_delimiter(p + 2, plimit, delimiter); - return t ? t : defptr; + char *t; + if (p >= plimit || plimit - p < 3) + return defptr; + t = find_sdp_line_delimiter(p + 2, plimit, delimiter); + return t ? t : defptr; }

1 0

git:master:48dc90df: core: parser - print start of buffer on error for identity info
by Daniel-Constantin Mierla 11 Dec '21

11 Dec '21

Module: kamailio Branch: master Commit: 48dc90dfa1839a405e7d090b23c1fdc907107731 URL: https://github.com/kamailio/kamailio/commit/48dc90dfa1839a405e7d090b23c1fdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-11T18:40:51+01:00 core: parser - print start of buffer on error for identity info --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/48dc90dfa1839a405e7d090b23c1fdc… Patch: https://github.com/kamailio/kamailio/commit/48dc90dfa1839a405e7d090b23c1fdc… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index e58bcd26ff..6aaabf2377 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -313,7 +313,7 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) parseerror: if(p<end) { LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p, status, (int)(p-buffer), ZSW(p)); + *p, status, (int)(p-buffer), buffer); } else { LM_ERR("unexpected end of buffer - status %d\n", status); }

1 0

[kamailio/kamailio] ims_charging: fix charging reply route with kemi (PR #2972)
by Riccardo-78 10 Dec '21

10 Dec '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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2972 -- Commit Summary -- * ims_charging: fix charging reply route with kemi -- File Changes -- M src/modules/ims_charging/ims_charging_mod.c (30) M src/modules/ims_charging/ims_ro.c (35) M src/modules/ims_charging/ims_ro.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2972.patch https://github.com/kamailio/kamailio/pull/2972.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/2972

1 1

git:master:43c48edc: core: cfg.lex - renamed defenv value mode parameter
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 43c48edc5064cdef9d4a41a579d59dfbb2cfb865 URL: https://github.com/kamailio/kamailio/commit/43c48edc5064cdef9d4a41a579d59df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T12:11:00+01:00 core: cfg.lex - renamed defenv value mode parameter --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/43c48edc5064cdef9d4a41a579d59df… Patch: https://github.com/kamailio/kamailio/commit/43c48edc5064cdef9d4a41a579d59df…

1 0

[kamailio/kamailio] websockets: enable KEEPALIVE_MECHANISM_CONCHECK (PR #2966)
by lazedo 10 Dec '21

10 Dec '21

KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled   #### 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  add case for KEEPALIVE_MECHANISM_CONCHECK in mod_init validation of ws_keepalive_mechanism You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2966 -- Commit Summary -- * websockets: enable KEEPALIVE_MECHANISM_CONCHECK -- File Changes -- M src/modules/websocket/websocket.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2966.patch https://github.com/kamailio/kamailio/pull/2966.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/2966

2 2

git:master:29c3b865: websockets: enable KEEPALIVE_MECHANISM_CONCHECK
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 29c3b865d8efde8435c2217df44d1df684caaea2 URL: https://github.com/kamailio/kamailio/commit/29c3b865d8efde8435c2217df44d1df… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T12:02:18+01:00 websockets: enable KEEPALIVE_MECHANISM_CONCHECK KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled --- Modified: src/modules/websocket/websocket.c --- Diff: https://github.com/kamailio/kamailio/commit/29c3b865d8efde8435c2217df44d1df… Patch: https://github.com/kamailio/kamailio/commit/29c3b865d8efde8435c2217df44d1df… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 5cef5d6b1a7..f7273048e36 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -221,6 +221,7 @@ static int mod_init(void) switch(ws_keepalive_mechanism) { case KEEPALIVE_MECHANISM_PING: case KEEPALIVE_MECHANISM_PONG: + case KEEPALIVE_MECHANISM_CONCHECK: break; default: ws_keepalive_mechanism = DEFAULT_KEEPALIVE_MECHANISM;

1 0

[kamailio/kamailio] core: cfg.lex support for undefned env vars (PR #2969)
by Ben Kaufman 10 Dec '21

10 Dec '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] New feature (non-breaking change which adds new functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #2967 #### Description Add new preprocessor keywords `trydefenv` and `trydefenvs` that work like `defenv` and `defenvs` respectively, with the difference that if the environmental variable is not defined, then the value in Kamailio will not be defined. For example: ``` #!KAMAILIO loadmodule "xlog" loadmodule "pv" #!trydefenv EXTRALOG request_route { #!ifdef EXTRALOG xlog("L_I", "Some Extra Logging here\n"); #!endif forward (); } ``` If the environmental variable `$EXTRALOG` is defined, the log line will be written. If the environmental variable is not set, then in Kamailio `EXTRALOG` will not be defined and the `#!ifdef` section will not be loaded. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2969 -- Commit Summary -- * core: cfg.lex support for undefned env vars -- File Changes -- M src/core/cfg.lex (56) M src/core/ppcfg.h (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2969.patch https://github.com/kamailio/kamailio/pull/2969.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/2969

2 2

git:master:03cd22b4: core: cfg.lex support for undefned env vars
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 03cd22b41b80a81a4260c0dee2c500cf1007e1f8 URL: https://github.com/kamailio/kamailio/commit/03cd22b41b80a81a4260c0dee2c500c… Author: Ben Kaufman <bkaufman(a)nexvortex.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T12:01:19+01:00 core: cfg.lex support for undefned env vars Feature Request GH #2967 for undefined defenv Add new keywords for preprocessing: - #!trydefenv - The same as #!defenv, except if the variable is undefined, the def value will be undefined as well. - #!trydefenvs - The same as #!defenvs, except if the variable is undefined, the def value will be undefined as well. --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/03cd22b41b80a81a4260c0dee2c500c… Patch: https://github.com/kamailio/kamailio/commit/03cd22b41b80a81a4260c0dee2c500c…

1 0

git:master:3136d479: app_ruby: update to handle xval return for functions with 3 parameters
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 3136d47993a9f08ea1c7e4de715f5fbbdf18a4e4 URL: https://github.com/kamailio/kamailio/commit/3136d47993a9f08ea1c7e4de715f5fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:43:17+01:00 app_ruby: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/3136d47993a9f08ea1c7e4de715f5fb… Patch: https://github.com/kamailio/kamailio/commit/3136d47993a9f08ea1c7e4de715f5fb…

1 0

git:master:7658cc9f: misc: kemi-code-gen.py - generate code for sqlang functions with xval return
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 7658cc9fdbfaba2001d538dbef23deaec4af8557 URL: https://github.com/kamailio/kamailio/commit/7658cc9fdbfaba2001d538dbef23dea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:57:38+01:00 misc: kemi-code-gen.py - generate code for sqlang functions with xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/7658cc9fdbfaba2001d538dbef23dea… Patch: https://github.com/kamailio/kamailio/commit/7658cc9fdbfaba2001d538dbef23dea… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index 7def9fcf25..b7b4bba8c8 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="ruby" +PRINTMODE="sqlang" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -169,33 +169,16 @@ def printCodeIfRuby(prefix): def printCodeIfSQLang(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" - for i, c in enumerate(prefix): - if i==0: - if c == 's': - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " - PRINTELSE = "} else " - elif i==PRINTPARAMS-1: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" - else: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " - - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_sqlang_return_int(J, ket, ret);") + sparams = printCodeIfParams(prefix) + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_sqlang_return_xval(J, ket, xret);") + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_sqlang_return_int(J, ket, ret);") + print("\t\t\t\t}") # generated possible strings of length k with chars from set.

1 0

git:master:53fc8c1d: app_sqlang: update to handle xval return for functions with 3 parameters
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 53fc8c1dfeeff8231278563595cd3ae46ba81e22 URL: https://github.com/kamailio/kamailio/commit/53fc8c1dfeeff8231278563595cd3ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:58:10+01:00 app_sqlang: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/53fc8c1dfeeff8231278563595cd3ae… Patch: https://github.com/kamailio/kamailio/commit/53fc8c1dfeeff8231278563595cd3ae…

1 0

git:master:e9690b36: misc: kemi-code-gen.py - relocate code for generate conditions and params
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: e9690b36e44fc65fb6d368f7231bfa15faaeed59 URL: https://github.com/kamailio/kamailio/commit/e9690b36e44fc65fb6d368f7231bfa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:31:58+01:00 misc: kemi-code-gen.py - relocate code for generate conditions and params --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/e9690b36e44fc65fb6d368f7231bfa1… Patch: https://github.com/kamailio/kamailio/commit/e9690b36e44fc65fb6d368f7231bfa1… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index 2a024f826e..ba5d4bcfff 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="python" +PRINTMODE="lua" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -29,7 +29,7 @@ def printCodeIfEnd(sretfunc): print(PRINTTABS + "}") -def printCodeIfJS(prefix): +def printCodeIfParams(prefix): global PRINTELSE sparams = "" for i, c in enumerate(prefix): @@ -55,7 +55,12 @@ def printCodeIfJS(prefix): else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") sparams += "vps[" + str(i) +"].n, " + return sparams + +def printCodeIfJS(prefix): + global PRINTELSE + sparams = printCodeIfParams(prefix) print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" print(sfunc + sparams) @@ -69,31 +74,7 @@ def printCodeIfJS(prefix): def printCodeIfLua(prefix): global PRINTELSE - sparams = "" - for i, c in enumerate(prefix): - if i==0: - if c == 's': - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sparams += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sparams += "vps[" + str(i) +"].n, " - PRINTELSE = "} else " - elif i==PRINTPARAMS-1: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sparams += "&vps[" + str(i) +"].s);" - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sparams += "vps[" + str(i) +"].n);" - else: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sparams += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sparams += "vps[" + str(i) +"].n, " - + sparams = printCodeIfParams(prefix) print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" print(sfunc + sparams) @@ -107,31 +88,7 @@ def printCodeIfLua(prefix): def printCodeIfPython(prefix): global PRINTELSE - sparams = "" - for i, c in enumerate(prefix): - if i==0: - if c == 's': - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sparams += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sparams += "vps[" + str(i) +"].n, " - PRINTELSE = "} else " - elif i==PRINTPARAMS-1: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sparams += "&vps[" + str(i) +"].s);" - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sparams += "vps[" + str(i) +"].n);" - else: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sparams += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sparams += "vps[" + str(i) +"].n, " - + sparams = printCodeIfParams(prefix) print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(lmsg,\n" + PRINTTABS + "\t\t\t" print(sfunc + sparams)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev