- sr-dev - kamailio.org

git:master:d75e10f9: pvtpl: renamed pvtpl_apply() to pvtpl_render()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: master Commit: d75e10f983e7afaa7779e8fde6524d7eccdfd497 URL: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T16:07:16+01:00 pvtpl: renamed pvtpl_apply() to pvtpl_render() --- Modified: src/modules/pvtpl/doc/pvtpl_admin.xml Modified: src/modules/pvtpl/pvtpl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… Patch: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… --- diff --git a/src/modules/pvtpl/doc/pvtpl_admin.xml b/src/modules/pvtpl/doc/pvtpl_admin.xml index 8ccfb8f9a23..8ca0174d3c4 100644 --- a/src/modules/pvtpl/doc/pvtpl_admin.xml +++ b/src/modules/pvtpl/doc/pvtpl_admin.xml @@ -105,24 +105,22 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;") <section> <title>Functions</title> - <section id="pvtpl.f.pvtpl_apply"> + <section id="pvtpl.f.pvtpl_render"> <title> - <function moreinfo="none">pvtpl_apply(tplname, res)</function> + <function moreinfo="none">pvtpl_render(tplname, res)</function> </title> <para> - Encrypts the text with the key using AES256 ECB encryption algorithm. - The result is encoded in base64 format and stored in res. The parameter - res must be a read-write variables. The parameters text and key can - be static strings or strings with variables (dynamic strings). + Render the template 'tplname' using config variables, setting the result + in the variable specified by 'res'. </para> <para> This function can be used from ANY_ROUTE. </para> <example> - <title><function>gcrypt_aes_encrypt</function> usage</title> + <title><function>pvtpl_render</function> usage</title> <programlisting format="linespecific"> ... -gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); +pvtpl_render("t1", "$var(out)") ... </programlisting> </example> diff --git a/src/modules/pvtpl/pvtpl_mod.c b/src/modules/pvtpl/pvtpl_mod.c index 15ee74b6838..9862a225236 100644 --- a/src/modules/pvtpl/pvtpl_mod.c +++ b/src/modules/pvtpl/pvtpl_mod.c @@ -42,7 +42,7 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); -static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv); +static int w_pvtpl_render(sip_msg_t *msg, char *ptplname, char *popv); /* clang-format off */ typedef struct pvtpl_item { @@ -61,7 +61,7 @@ static pvtpl_item_t *_pvtpl_list = NULL; /* clang-format off */ static cmd_export_t cmds[]={ - {"pvtpl_apply", (cmd_function)w_pvtpl_apply, 2, fixup_spve_pvar, + {"pvtpl_render", (cmd_function)w_pvtpl_render, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -278,7 +278,7 @@ static int pvtpl_tpl_param(modparam_t type, void *val) /** * */ -static int pvtpl_apply(sip_msg_t *msg, str *tplname, pv_spec_t *dst) +static int pvtpl_render(sip_msg_t *msg, str *tplname, pv_spec_t *dst) { pvtpl_item_t *it; pv_value_t val; @@ -313,7 +313,7 @@ static int pvtpl_apply(sip_msg_t *msg, str *tplname, pv_spec_t *dst) /** * */ -static int ki_pvtpl_apply(sip_msg_t *msg, str *tplname, str *opv) +static int ki_pvtpl_render(sip_msg_t *msg, str *tplname, str *opv) { pv_spec_t *dst; @@ -324,13 +324,13 @@ static int ki_pvtpl_apply(sip_msg_t *msg, str *tplname, str *opv) return -1; } - return pvtpl_apply(msg, tplname, dst); + return pvtpl_render(msg, tplname, dst); } /** * */ -static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) +static int w_pvtpl_render(sip_msg_t *msg, char *ptplname, char *popv) { str tplname; pv_spec_t *dst; @@ -341,7 +341,7 @@ static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) } dst = (pv_spec_t *)popv; - return pvtpl_apply(msg, &tplname, dst); + return pvtpl_render(msg, &tplname, dst); } /** @@ -349,8 +349,8 @@ static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) */ /* clang-format off */ static sr_kemi_t sr_kemi_pvtpl_exports[] = { - { str_init("pvtpl"), str_init("pvtpl_apply"), - SR_KEMIP_INT, ki_pvtpl_apply, + { str_init("pvtpl"), str_init("pvtpl_render"), + SR_KEMIP_INT, ki_pvtpl_render, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

[kamailio/kamailio] Not enough parameters for htable.seti (Issue #3774)
by Jon Bergli Heier 20 Mar '24

20 Mar '24

### Description Since 5.7.4, the `htable.seti` RPC command returns error 500. This seems to occur whenever an integer value is passed. If the integer is passed as a decimal (eg. `1.0` or `1.`) the error disappears. Also reproducible with latest master. ### Troubleshooting Bisecting shows the offending commit to be https://github.com/kamailio/kamailio/commit/dc59286c26e9799f86e698a9698c9da…. Reverting this commit fixes the 500 error but reintroduces the previous error referenced in the commit. #### Reproduction ``` $ kamcmd htable.seti rconfig foo 1 error: 500 - Not enough parameters (htable name, key name and value) ``` #### Log Messages No messages in the kamailio log when the error occurs. The RPC command responds with ``` error: 500 - Not enough parameters (htable name, key name and value) ``` ### Possible Solutions A workaround is to pass the value as a decimal value, eg. `1.0`. Any decimals are ignored since the value is treated as an integer. For XMLRPC this can be worked around by explicitly passing the value as an integer (passing the value as `i/1`). ### Additional Information ``` version: kamailio 5.9.0-dev0 (x86_64/linux) f6f9d9 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_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: f6f9d9 compiled on 11:57:50 Mar 5 2024 with gcc 13.2.1 ``` * **Operating System**: Reproduced on the following: ``` Linux jon 6.6.2-arch1-1 #1 SMP PREEMPT_DYNAMIC Mon, 20 Nov 2023 23:18:21 +0000 x86_64 GNU/Linux ``` ``` Linux ip-10-105-240-190 4.9.0-19-amd64 #1 SMP Debian 4.9.320-2 (2022-06-30) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3774 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3774(a)github.com>

2 4

git:5.7:29b6562d: ctl: handle int input for double storage
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.7 Commit: 29b6562d8ebe6277fda5524dda18b88cf2a4e1a9 URL: https://github.com/kamailio/kamailio/commit/29b6562d8ebe6277fda5524dda18b88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:42:36+01:00 ctl: handle int input for double storage (cherry picked from commit 1380a4a0d18159c7130b70c0216134a253ad83f7) (cherry picked from commit 90f8117f9669069b4dab7e9d747dfa06245ec8a0) --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/29b6562d8ebe6277fda5524dda18b88… Patch: https://github.com/kamailio/kamailio/commit/29b6562d8ebe6277fda5524dda18b88… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index fd247bc603a..7909bc930d4 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -719,10 +719,12 @@ inline static unsigned char *binrpc_read_record(struct binrpc_parse_ctx *ctx, *err = E_BINRPC_MORE_DATA; goto error; } - if((v->type != type) && (v->type != BINRPC_T_ALL)) { - goto error_type; + if(!(v->type == BINRPC_T_DOUBLE && type == BINRPC_T_INT)) { + if((v->type != type) && (v->type != BINRPC_T_ALL)) { + goto error_type; + } + v->type = type; } - v->type = type; switch(type) { case BINRPC_T_STRUCT: if(ctx->in_struct) { @@ -779,7 +781,12 @@ inline static unsigned char *binrpc_read_record(struct binrpc_parse_ctx *ctx, case BINRPC_T_INT: if(ctx->in_struct && smode == 0) goto error_record; - p = binrpc_read_int(&v->u.intval, len, p, end, err); + if(v->type == BINRPC_T_DOUBLE) { + p = binrpc_read_int(&tmp, len, p, end, err); + v->u.fval = tmp; + } else { + p = binrpc_read_int(&v->u.intval, len, p, end, err); + } break; case BINRPC_T_STR: if(ctx->in_struct && smode == 0)

1 0

git:master:68c69966: gcrypt: docs - module name used for section ids
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: master Commit: 68c69966c38b56775a3966d07c33ff94c2a8ba95 URL: https://github.com/kamailio/kamailio/commit/68c69966c38b56775a3966d07c33ff9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:40:28+01:00 gcrypt: docs - module name used for section ids --- Modified: src/modules/gcrypt/doc/gcrypt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/68c69966c38b56775a3966d07c33ff9… Patch: https://github.com/kamailio/kamailio/commit/68c69966c38b56775a3966d07c33ff9… --- diff --git a/src/modules/gcrypt/doc/gcrypt_admin.xml b/src/modules/gcrypt/doc/gcrypt_admin.xml index 533ec5c80f9..3fc03d3eabc 100644 --- a/src/modules/gcrypt/doc/gcrypt_admin.xml +++ b/src/modules/gcrypt/doc/gcrypt_admin.xml @@ -127,7 +127,7 @@ modparam("gcrypt", "register_callid", 1) <section> <title>Functions</title> - <section id="async.f.gcrypt_aes_encrypt"> + <section id="gcrypt.f.gcrypt_aes_encrypt"> <title> <function moreinfo="none">gcrypt_aes_encrypt(text, key, res)</function> </title> @@ -150,7 +150,7 @@ gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); </example> </section> - <section id="async.f.gcrypt_aes_decrypt"> + <section id="gcrypt.f.gcrypt_aes_decrypt"> <title> <function moreinfo="none">gcrypt_aes_decrypt(text, key, res)</function> </title>

1 0

git:5.8:7bcef8ef: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 7bcef8ef487a713f5b6c6fadb7a3166ed41fb136 URL: https://github.com/kamailio/kamailio/commit/7bcef8ef487a713f5b6c6fadb7a3166… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-20T13:31:25+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/7bcef8ef487a713f5b6c6fadb7a3166… Patch: https://github.com/kamailio/kamailio/commit/7bcef8ef487a713f5b6c6fadb7a3166… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 79fc82ec175..209d77f4c87 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1489,9 +1489,16 @@ if(ds_list_exists("10")) { ignoring the protocol (value 2). If parameter is 0, all ip, port and proto are matched and active status is ignored. If bit one is set, then port is ignored. If bit two is set, then protocol is - ignored. If bit three is set, then state must be active. The - parameter can be an integer or a variable holding an integer value. - It must be provided if the uri parameter is provided. + ignored. If bit three is set, then state must be active. If bit + four is set, then socket/sockname be matched. If bit five is set, + then try to find the most closest target from all dispatcher + targets with the mandatory ip and combination of local socket, + protocol, port, the weighted search result is combined from bit + flags of matched components: ip - 1, port - 2, protocol - 4, local + socket - 8, the target with the maximum value of flags combination + will be selected. The parameter can be an integer or a variable + holding an integer value. It must be provided if the uri parameter + is provided. * uri (optional) - if parameter is empty or missing, the matching is done against source IP, port and protocol. Otherwise the value has to be a valid SIP URI, used to match against addresses in the

1 0

git:5.7:a7e9a265: ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.7 Commit: a7e9a26542010e1677fcb0e305e7d371e5467dba URL: https://github.com/kamailio/kamailio/commit/a7e9a26542010e1677fcb0e305e7d37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:27:15+01:00 ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server() (cherry picked from commit 951ab118bb7d9955f8e69b66bec1f0c107d474a2) (cherry picked from commit 60fd6c2622c9c5edbe82908c0e461d646225c8a6) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/a7e9a26542010e1677fcb0e305e7d37… Patch: https://github.com/kamailio/kamailio/commit/a7e9a26542010e1677fcb0e305e7d37… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index e85fdcec7aa..eed2e1bcc88 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -485,6 +485,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) for(i = 0; i < sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; + int srvfound = 0; redisContext *redis; redisReply *res, *res2; @@ -507,6 +508,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) port = atoi(res->element[1]->str); LOG(ndb_redis_debug, "sentinel replied: %s:%d\n", addr, port); + srvfound = 1; } } else { res = redisCommand( @@ -530,9 +532,13 @@ int redisc_reconnect_server(redisc_server_t *rsrv) } LOG(ndb_redis_debug, "slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound == 1) { + break; + } } }

1 0

git:5.7:4cc28e45: ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.7 Commit: 4cc28e453d8e62b9f6e2725b9496600c662a8811 URL: https://github.com/kamailio/kamailio/commit/4cc28e453d8e62b9f6e2725b9496600… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:27:08+01:00 ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server() (cherry picked from commit c8f3b496a05ae5bf29341dc7e2630f951d4effc5) (cherry picked from commit 86df978bc9842687035d6673ee1b71e542dcbd71) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/4cc28e453d8e62b9f6e2725b9496600… Patch: https://github.com/kamailio/kamailio/commit/4cc28e453d8e62b9f6e2725b9496600… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index a0865dc6125..e85fdcec7aa 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -491,7 +491,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) port = 6379; if((pos = strchr(sentinelAddr, ':')) != NULL) { port = atoi(pos + 1); - pos[i] = '\0'; + pos[0] = '\0'; } redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn);

1 0

git:5.7:f654b9c1: keepalive: small formatting updates and comments to the ka dest structure
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.7 Commit: f654b9c1943be6816827f9048627a7c8a7fe50f6 URL: https://github.com/kamailio/kamailio/commit/f654b9c1943be6816827f9048627a7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:26:43+01:00 keepalive: small formatting updates and comments to the ka dest structure (cherry picked from commit cee82c92b06a026b88fea654944f6146eb5cb4d8) (cherry picked from commit a7d4ce95b383dc26c547ef9ee07b05d51abc50f9) --- Modified: src/modules/keepalive/keepalive.h --- Diff: https://github.com/kamailio/kamailio/commit/f654b9c1943be6816827f9048627a7c… Patch: https://github.com/kamailio/kamailio/commit/f654b9c1943be6816827f9048627a7c… --- diff --git a/src/modules/keepalive/keepalive.h b/src/modules/keepalive/keepalive.h index d5a8fcb2197..5ca1ce3561d 100644 --- a/src/modules/keepalive/keepalive.h +++ b/src/modules/keepalive/keepalive.h @@ -69,13 +69,15 @@ typedef struct _ka_initial_dest typedef struct _ka_dest { str uri; - str owner; // name of destination "owner" - // (module asking to monitor this destination - str uuid; // Universal id for this record + str owner; /*!< Name of destination "owner" */ + /*!< Module asking to monitor this destination */ + str uuid; /*!< Universal id for this record */ int flags; int state; - time_t last_checked, last_up, last_down; - int counter; // counts unreachable attempts + time_t last_checked; + time_t last_up; /*!< Time of last successful SIP reply */ + time_t last_down; /*!< Time of last failure SIP reply */ + int counter; /*!< Counts unreachable attempts */ ticks_t ping_interval; /*!< Actual interval between OPTIONS */ void *user_attr;

1 0

git:5.7:6a9caa09: keepalive: proper storing of last up/down timestamps
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.7 Commit: 6a9caa099352a31a2f14012d16c01d55c9250f02 URL: https://github.com/kamailio/kamailio/commit/6a9caa099352a31a2f14012d16c01d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:26:29+01:00 keepalive: proper storing of last up/down timestamps - GH #3790 (cherry picked from commit 9e2a0ee545646bd4491ecdbe58d7fea770764b54) (cherry picked from commit 0b3aa00775a5c0b4b1dc4990f4c26bc637fc6de5) --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/6a9caa099352a31a2f14012d16c01d5… Patch: https://github.com/kamailio/kamailio/commit/6a9caa099352a31a2f14012d16c01d5… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 0aaafa8c8da..b1b3581cb34 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -131,11 +131,11 @@ static void ka_options_callback( // accepting 2XX return codes if(ps->code >= 200 && ps->code <= 299) { state = KA_STATE_UP; - ka_dest->last_down = time(NULL); + ka_dest->last_up = time(NULL); ka_dest->counter = 0; } else { state = KA_STATE_DOWN; - ka_dest->last_up = time(NULL); + ka_dest->last_down = time(NULL); ka_dest->counter++; }

1 0

git:5.8:60fd6c26: ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 60fd6c2622c9c5edbe82908c0e461d646225c8a6 URL: https://github.com/kamailio/kamailio/commit/60fd6c2622c9c5edbe82908c0e461d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:16:29+01:00 ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server() (cherry picked from commit 951ab118bb7d9955f8e69b66bec1f0c107d474a2) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/60fd6c2622c9c5edbe82908c0e461d6… Patch: https://github.com/kamailio/kamailio/commit/60fd6c2622c9c5edbe82908c0e461d6… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index dbbaecbcebe..c9280991ff3 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -533,6 +533,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) for(i = 0; i < sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; + int srvfound = 0; redisContext *redis; redisReply *res, *res2; @@ -555,6 +556,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) port = atoi(res->element[1]->str); LOG(ndb_redis_debug, "sentinel replied: %s:%d\n", addr, port); + srvfound = 1; } } else { res = redisCommand( @@ -578,9 +580,13 @@ int redisc_reconnect_server(redisc_server_t *rsrv) } LOG(ndb_redis_debug, "slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound == 1) { + break; + } } }

1 0

git:5.8:86df978b: ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 86df978bc9842687035d6673ee1b71e542dcbd71 URL: https://github.com/kamailio/kamailio/commit/86df978bc9842687035d6673ee1b71e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:16:19+01:00 ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server() (cherry picked from commit c8f3b496a05ae5bf29341dc7e2630f951d4effc5) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/86df978bc9842687035d6673ee1b71e… Patch: https://github.com/kamailio/kamailio/commit/86df978bc9842687035d6673ee1b71e… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 9b755e42d6b..dbbaecbcebe 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -539,7 +539,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) port = 6379; if((pos = strchr(sentinelAddr, ':')) != NULL) { port = atoi(pos + 1); - pos[i] = '\0'; + pos[0] = '\0'; } redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn);

1 0

git:5.8:a0dfa0ac: ndb_redis: clang-format for WITH_SSL code
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: a0dfa0ac81ed4aec33863fc20cf5cb3ee077a90c URL: https://github.com/kamailio/kamailio/commit/a0dfa0ac81ed4aec33863fc20cf5cb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:16:11+01:00 ndb_redis: clang-format for WITH_SSL code (cherry picked from commit e54051d698b059aa168229493dc2d6bf3cdd757c) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/a0dfa0ac81ed4aec33863fc20cf5cb3… Patch: https://github.com/kamailio/kamailio/commit/a0dfa0ac81ed4aec33863fc20cf5cb3… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index ab0edf28187..9b755e42d6b 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -233,15 +233,15 @@ int redisc_init(void) } #ifdef WITH_SSL - if(enable_ssl) { - /* Create SSL context*/ - redisInitOpenSSL(); - rsrv->sslCtxRedis = redisCreateSSLContext( + if(enable_ssl) { + /* Create SSL context*/ + redisInitOpenSSL(); + rsrv->sslCtxRedis = redisCreateSSLContext( NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); - if(rsrv->sslCtxRedis == NULL) { + if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); - } - } + } + } #endif if(sock != 0) { @@ -260,10 +260,10 @@ int redisc_init(void) } #ifdef WITH_SSL - if(enable_ssl) { - /* Negotiate SSL/TLS handshake*/ - redisInitiateSSLWithContext(rsrv->ctxRedis, rsrv->sslCtxRedis); - } + if(enable_ssl) { + /* Negotiate SSL/TLS handshake*/ + redisInitiateSSLWithContext(rsrv->ctxRedis, rsrv->sslCtxRedis); + } #endif LOG(ndb_redis_debug, "rsrv->ctxRedis = %p\n", rsrv->ctxRedis); @@ -498,10 +498,10 @@ int redisc_reconnect_server(redisc_server_t *rsrv) pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); haspass = 1; #ifdef WITH_SSL - } else if(pit->name.len == 3 && strncmp(pit->name.s, "tls", 3) == 0) { + } else if(pit->name.len == 3 && strncmp(pit->name.s, "tls", 3) == 0) { snprintf( pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); - if(str2int(&pit->body, &enable_ssl) < 0) + if(str2int(&pit->body, &enable_ssl) < 0) enable_ssl = 0; #endif } else if(pit->name.len == 14

1 0

git:5.8:a7d4ce95: keepalive: small formatting updates and comments to the ka dest structure
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: a7d4ce95b383dc26c547ef9ee07b05d51abc50f9 URL: https://github.com/kamailio/kamailio/commit/a7d4ce95b383dc26c547ef9ee07b05d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:16:00+01:00 keepalive: small formatting updates and comments to the ka dest structure (cherry picked from commit cee82c92b06a026b88fea654944f6146eb5cb4d8) --- Modified: src/modules/keepalive/keepalive.h --- Diff: https://github.com/kamailio/kamailio/commit/a7d4ce95b383dc26c547ef9ee07b05d… Patch: https://github.com/kamailio/kamailio/commit/a7d4ce95b383dc26c547ef9ee07b05d… --- diff --git a/src/modules/keepalive/keepalive.h b/src/modules/keepalive/keepalive.h index d5a8fcb2197..5ca1ce3561d 100644 --- a/src/modules/keepalive/keepalive.h +++ b/src/modules/keepalive/keepalive.h @@ -69,13 +69,15 @@ typedef struct _ka_initial_dest typedef struct _ka_dest { str uri; - str owner; // name of destination "owner" - // (module asking to monitor this destination - str uuid; // Universal id for this record + str owner; /*!< Name of destination "owner" */ + /*!< Module asking to monitor this destination */ + str uuid; /*!< Universal id for this record */ int flags; int state; - time_t last_checked, last_up, last_down; - int counter; // counts unreachable attempts + time_t last_checked; + time_t last_up; /*!< Time of last successful SIP reply */ + time_t last_down; /*!< Time of last failure SIP reply */ + int counter; /*!< Counts unreachable attempts */ ticks_t ping_interval; /*!< Actual interval between OPTIONS */ void *user_attr;

1 0

git:5.8:0b3aa007: keepalive: proper storing of last up/down timestamps
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 0b3aa00775a5c0b4b1dc4990f4c26bc637fc6de5 URL: https://github.com/kamailio/kamailio/commit/0b3aa00775a5c0b4b1dc4990f4c26bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:15:36+01:00 keepalive: proper storing of last up/down timestamps - GH #3790 (cherry picked from commit 9e2a0ee545646bd4491ecdbe58d7fea770764b54) --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/0b3aa00775a5c0b4b1dc4990f4c26bc… Patch: https://github.com/kamailio/kamailio/commit/0b3aa00775a5c0b4b1dc4990f4c26bc… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 0aaafa8c8da..b1b3581cb34 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -131,11 +131,11 @@ static void ka_options_callback( // accepting 2XX return codes if(ps->code >= 200 && ps->code <= 299) { state = KA_STATE_UP; - ka_dest->last_down = time(NULL); + ka_dest->last_up = time(NULL); ka_dest->counter = 0; } else { state = KA_STATE_DOWN; - ka_dest->last_up = time(NULL); + ka_dest->last_down = time(NULL); ka_dest->counter++; }

1 0

git:5.8:91b09626: acc: more log messages of failure arsing extra acc string
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 91b0962679092f28abb5022d1505372356460f7d URL: https://github.com/kamailio/kamailio/commit/91b0962679092f28abb5022d1505372… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:15:21+01:00 acc: more log messages of failure arsing extra acc string (cherry picked from commit 04a73ace6572dd5c95a8f50b39b2ce712f7ebe84) --- Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/91b0962679092f28abb5022d1505372… Patch: https://github.com/kamailio/kamailio/commit/91b0962679092f28abb5022d1505372… --- diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index 255057a99c4..a84f02bbe02 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -127,8 +127,10 @@ struct acc_extra *parse_acc_extra(char *extra_str) foo = s; while(*s && !isspace((int)*s) && EQUAL != *s) s++; - if(*s == 0) + if(*s == 0) { + LM_ERR("unexpected end of string\n"); goto parse_error; + } if(*s == EQUAL) { extra->name.len = (s++) - foo; } else { @@ -136,8 +138,10 @@ struct acc_extra *parse_acc_extra(char *extra_str) /* skip spaces */ while(*s && isspace((int)*s)) s++; - if(*s != EQUAL) + if(*s != EQUAL) { + LM_ERR("unexpected char '%c' instead of '='\n", *s); goto parse_error; + } s++; } extra->name.s = foo; @@ -149,15 +153,19 @@ struct acc_extra *parse_acc_extra(char *extra_str) /* get value type */ stmp.s = s; stmp.len = strlen(s); - if((foo = pv_parse_spec(&stmp, &extra->spec)) == 0) + if((foo = pv_parse_spec(&stmp, &extra->spec)) == 0) { + LM_ERR("failed to parse variable name\n"); goto parse_error; + } s = foo; /* skip spaces */ while(*s && isspace((int)*s)) s++; - if(*s && (*(s++) != SEPARATOR || *s == 0)) + if(*s && (*(s++) != SEPARATOR || *s == 0)) { + LM_ERR("unexpected char at end of name=var group\n"); goto parse_error; + } } /* go throught all extras and make the names null terminated */

1 0

git:5.8:5daadecd: ims_ipsec_pcscf: TLS support in ipsec_forward() improved
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 5daadecd248322e5f8eaf15555e46692f3d1c267 URL: https://github.com/kamailio/kamailio/commit/5daadecd248322e5f8eaf15555e4669… Author: Axel Sommerfeldt <axel.sommerfeldt(a)fastmail.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:14:42+01:00 ims_ipsec_pcscf: TLS support in ipsec_forward() improved This patch was initially done by Herle Supreeth in his fork but isn't present upstream yet: https://github.com/kamailio/kamailio/commit/8b9a2977e111d9adb8595d98ab59f8c… See also: https://github.com/kamailio/kamailio/issues/3772 (cherry picked from commit 3154a0aba5543cab75153429bc8ec617c3484f71) --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/5daadecd248322e5f8eaf15555e4669… Patch: https://github.com/kamailio/kamailio/commit/5daadecd248322e5f8eaf15555e4669… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 47f9e401702..4f7301b56c1 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1126,6 +1126,10 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", ci.via_host.len, ci.via_host.s, dst_port); + } else if((_cflags & IPSEC_SETDSTURI_FULL) && (dst_proto == PROTO_TLS)) { + buf_len = + snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tls", + ci.via_host.len, ci.via_host.s, dst_port); } else { buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, ci.via_host.s, dst_port);

1 0

git:5.8:7df7508d: dispatcher: refine documentation
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 7df7508d7d2b7b9495dafab8b515a5721bd669ee URL: https://github.com/kamailio/kamailio/commit/7df7508d7d2b7b9495dafab8b515a57… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:14:16+01:00 dispatcher: refine documentation - more clear documentation for the new ds_is_from_list flags (cherry picked from commit 761e963c0f7d9bf1b66c1ef18a409756b919ae2c) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7df7508d7d2b7b9495dafab8b515a57… Patch: https://github.com/kamailio/kamailio/commit/7df7508d7d2b7b9495dafab8b515a57… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 4708ca06c92..83ef06285a0 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1805,9 +1805,12 @@ if(ds_list_exists("10")) { If bit two is set, then protocol is ignored. If bit three is set, then state must be active. If bit four is set, then socket/sockname be matched. - If bit five is set, then try to find the most complete - "address/protocol/port/local socket" combination for all dispatcher targets. The parameter - can be an integer or a variable holding an integer value. + If bit five is set, then try to find the most closest target from all + dispatcher targets with the mandatory ip and combination of local socket, protocol, port, + the weighted search result is combined from bit flags of matched components: + ip - 1, port - 2, protocol - 4, local socket - 8, + the target with the maximum value of flags combination will be selected. + The parameter can be an integer or a variable holding an integer value. It must be provided if the uri parameter is provided. </para> </listitem>

1 0

git:5.8:90f8117f: ctl: handle int input for double storage
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 90f8117f9669069b4dab7e9d747dfa06245ec8a0 URL: https://github.com/kamailio/kamailio/commit/90f8117f9669069b4dab7e9d747dfa0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-19T18:20:18+01:00 ctl: handle int input for double storage (cherry picked from commit 1380a4a0d18159c7130b70c0216134a253ad83f7) --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/90f8117f9669069b4dab7e9d747dfa0… Patch: https://github.com/kamailio/kamailio/commit/90f8117f9669069b4dab7e9d747dfa0… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index fd247bc603a..7909bc930d4 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -719,10 +719,12 @@ inline static unsigned char *binrpc_read_record(struct binrpc_parse_ctx *ctx, *err = E_BINRPC_MORE_DATA; goto error; } - if((v->type != type) && (v->type != BINRPC_T_ALL)) { - goto error_type; + if(!(v->type == BINRPC_T_DOUBLE && type == BINRPC_T_INT)) { + if((v->type != type) && (v->type != BINRPC_T_ALL)) { + goto error_type; + } + v->type = type; } - v->type = type; switch(type) { case BINRPC_T_STRUCT: if(ctx->in_struct) { @@ -779,7 +781,12 @@ inline static unsigned char *binrpc_read_record(struct binrpc_parse_ctx *ctx, case BINRPC_T_INT: if(ctx->in_struct && smode == 0) goto error_record; - p = binrpc_read_int(&v->u.intval, len, p, end, err); + if(v->type == BINRPC_T_DOUBLE) { + p = binrpc_read_int(&tmp, len, p, end, err); + v->u.fval = tmp; + } else { + p = binrpc_read_int(&v->u.intval, len, p, end, err); + } break; case BINRPC_T_STR: if(ctx->in_struct && smode == 0)

1 0

git:master:3e3e9039: pvtpl: new module to process pv templates loaded from files
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: master Commit: 3e3e9039b6bbd8922af5aa5ab81eb1addb8fb05c URL: https://github.com/kamailio/kamailio/commit/3e3e9039b6bbd8922af5aa5ab81eb1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T12:57:04+01:00 pvtpl: new module to process pv templates loaded from files --- Added: src/modules/pvtpl/Makefile Added: src/modules/pvtpl/README Added: src/modules/pvtpl/doc/Makefile Added: src/modules/pvtpl/doc/pvtpl.xml Added: src/modules/pvtpl/doc/pvtpl_admin.xml Added: src/modules/pvtpl/pvtpl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3e3e9039b6bbd8922af5aa5ab81eb1a… Patch: https://github.com/kamailio/kamailio/commit/3e3e9039b6bbd8922af5aa5ab81eb1a…

1 0

git:master:951ab118: ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server()
by Daniel-Constantin Mierla 19 Mar '24

19 Mar '24

Module: kamailio Branch: master Commit: 951ab118bb7d9955f8e69b66bec1f0c107d474a2 URL: https://github.com/kamailio/kamailio/commit/951ab118bb7d9955f8e69b66bec1f0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-19T17:39:19+01:00 ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server() --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/951ab118bb7d9955f8e69b66bec1f0c… Patch: https://github.com/kamailio/kamailio/commit/951ab118bb7d9955f8e69b66bec1f0c… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index dbbaecbcebe..c9280991ff3 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -533,6 +533,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) for(i = 0; i < sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; + int srvfound = 0; redisContext *redis; redisReply *res, *res2; @@ -555,6 +556,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) port = atoi(res->element[1]->str); LOG(ndb_redis_debug, "sentinel replied: %s:%d\n", addr, port); + srvfound = 1; } } else { res = redisCommand( @@ -578,9 +580,13 @@ int redisc_reconnect_server(redisc_server_t *rsrv) } LOG(ndb_redis_debug, "slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound == 1) { + break; + } } }

1 0

git:master:c8f3b496: ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server()
by Daniel-Constantin Mierla 19 Mar '24

19 Mar '24

Module: kamailio Branch: master Commit: c8f3b496a05ae5bf29341dc7e2630f951d4effc5 URL: https://github.com/kamailio/kamailio/commit/c8f3b496a05ae5bf29341dc7e2630f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-19T14:29:11+01:00 ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server() --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/c8f3b496a05ae5bf29341dc7e2630f9… Patch: https://github.com/kamailio/kamailio/commit/c8f3b496a05ae5bf29341dc7e2630f9… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 9b755e42d6b..dbbaecbcebe 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -539,7 +539,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) port = 6379; if((pos = strchr(sentinelAddr, ':')) != NULL) { port = atoi(pos + 1); - pos[i] = '\0'; + pos[0] = '\0'; } redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn);

1 0

git:master:e54051d6: ndb_redis: clang-format for WITH_SSL code
by Daniel-Constantin Mierla 19 Mar '24

19 Mar '24

Module: kamailio Branch: master Commit: e54051d698b059aa168229493dc2d6bf3cdd757c URL: https://github.com/kamailio/kamailio/commit/e54051d698b059aa168229493dc2d6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-19T14:26:27+01:00 ndb_redis: clang-format for WITH_SSL code --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/e54051d698b059aa168229493dc2d6b… Patch: https://github.com/kamailio/kamailio/commit/e54051d698b059aa168229493dc2d6b… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index ab0edf28187..9b755e42d6b 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -233,15 +233,15 @@ int redisc_init(void) } #ifdef WITH_SSL - if(enable_ssl) { - /* Create SSL context*/ - redisInitOpenSSL(); - rsrv->sslCtxRedis = redisCreateSSLContext( + if(enable_ssl) { + /* Create SSL context*/ + redisInitOpenSSL(); + rsrv->sslCtxRedis = redisCreateSSLContext( NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); - if(rsrv->sslCtxRedis == NULL) { + if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); - } - } + } + } #endif if(sock != 0) { @@ -260,10 +260,10 @@ int redisc_init(void) } #ifdef WITH_SSL - if(enable_ssl) { - /* Negotiate SSL/TLS handshake*/ - redisInitiateSSLWithContext(rsrv->ctxRedis, rsrv->sslCtxRedis); - } + if(enable_ssl) { + /* Negotiate SSL/TLS handshake*/ + redisInitiateSSLWithContext(rsrv->ctxRedis, rsrv->sslCtxRedis); + } #endif LOG(ndb_redis_debug, "rsrv->ctxRedis = %p\n", rsrv->ctxRedis); @@ -498,10 +498,10 @@ int redisc_reconnect_server(redisc_server_t *rsrv) pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); haspass = 1; #ifdef WITH_SSL - } else if(pit->name.len == 3 && strncmp(pit->name.s, "tls", 3) == 0) { + } else if(pit->name.len == 3 && strncmp(pit->name.s, "tls", 3) == 0) { snprintf( pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); - if(str2int(&pit->body, &enable_ssl) < 0) + if(str2int(&pit->body, &enable_ssl) < 0) enable_ssl = 0; #endif } else if(pit->name.len == 14

1 0

[kamailio/kamailio] ERROR: acc [acc_extra.c:169]: parse_acc_extra() (Issue #3785)
by fulhade 19 Mar '24

19 Mar '24

This started happening with 5.8.0. I was to update our project with Docker image from 5.7.1 to 5.8.0 ``` kamailio[594]: ERROR: acc [acc_extra.c:169]: parse_acc_extra(): parse failed in <callid=$dlg(callid);src_user=$(dlg(from_uri){uri.user});dst_user=$(dlg(to_uri){uri.user});xxx_channel_id=$dlg_var(xxx_channel_id);t_error=$dlg_var(to_original_user);src_original_user=$dlg_var(from_original_user);dst_original_user=$dlg_var(to_original_user)id);src_user=$(dlg(from_uri){uri.user});dst_user=$(dlg(to_uri){uri.user});xxx_channel_id=$dlg_var(xxx_channel_id);t_error=$dlg_var(to_original_user);src_original_user=$dlg_var(from_original_user);dst_original_user=$dlg_var(to_original_user> around position 257 kamailio[594]: ERROR: acc [acc_extra.c:173]: parse_acc_extra(): error kamailio[594]: ERROR: acc [acc_cdr.c:827]: set_cdr_extra(): failed to parse crd_extra param kamailio[594]: ERROR: acc [acc_mod.c:528]: mod_init(): failed to set cdr extra 'callid=$dlg(callid);src_user=$(dlg(from_uri){uri.user});dst_user=$(dlg(to_uri){uri.user});xxx_channel_id=$dlg_var(xxx_channel_id);t_error=$dlg_var(to_original_user);src_original_user=$dlg_var(from_original_user);dst_original_user=$dlg_var(to_original_user)id);src_user=$(dlg(from_uri){uri.user});dst_user=$(dlg(to_uri){uri.user});xxx_channel_id=$dlg_var(xxx_channel_id);t_error=$dlg_var(to_original_user);src_original_user=$dlg_var(from_original_user);dst_original_user=$dlg_var(to_original_user' kamailio[594]: ERROR: <core> [core/sr_module.c:1039]: init_mod(): Error while initializing module acc (/usr/lib/x86_64-linux-gnu/kamailio/modules/acc.so) ``` This is how it looks in cfg: ``` modparam("acc", "cdr_extra", "callid=$dlg(callid);src_user=$(dlg(from_uri){uri.user});dst_user=$(dlg(to_uri){uri.user});" "xxx_channel_id=$dlg_var(xxx_channel_id);t_error=$dlg_var(to_original_user);" "src_original_user=$dlg_var(from_original_user);dst_original_user=$dlg_var(to_original_user)") ``` I have tested and it looks like it only happen if cdr_extra fields are bigger > 255 char. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3785 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3785(a)github.com>

2 4

git:master:cee82c92: keepalive: small formatting updates and comments to the ka dest structure
by Daniel-Constantin Mierla 19 Mar '24

19 Mar '24

Module: kamailio Branch: master Commit: cee82c92b06a026b88fea654944f6146eb5cb4d8 URL: https://github.com/kamailio/kamailio/commit/cee82c92b06a026b88fea654944f614… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-19T10:21:51+01:00 keepalive: small formatting updates and comments to the ka dest structure --- Modified: src/modules/keepalive/keepalive.h --- Diff: https://github.com/kamailio/kamailio/commit/cee82c92b06a026b88fea654944f614… Patch: https://github.com/kamailio/kamailio/commit/cee82c92b06a026b88fea654944f614… --- diff --git a/src/modules/keepalive/keepalive.h b/src/modules/keepalive/keepalive.h index d5a8fcb2197..5ca1ce3561d 100644 --- a/src/modules/keepalive/keepalive.h +++ b/src/modules/keepalive/keepalive.h @@ -69,13 +69,15 @@ typedef struct _ka_initial_dest typedef struct _ka_dest { str uri; - str owner; // name of destination "owner" - // (module asking to monitor this destination - str uuid; // Universal id for this record + str owner; /*!< Name of destination "owner" */ + /*!< Module asking to monitor this destination */ + str uuid; /*!< Universal id for this record */ int flags; int state; - time_t last_checked, last_up, last_down; - int counter; // counts unreachable attempts + time_t last_checked; + time_t last_up; /*!< Time of last successful SIP reply */ + time_t last_down; /*!< Time of last failure SIP reply */ + int counter; /*!< Counts unreachable attempts */ ticks_t ping_interval; /*!< Actual interval between OPTIONS */ void *user_attr;

1 0

git:master:9e2a0ee5: keepalive: proper storing of last up/down timestamps
by Daniel-Constantin Mierla 19 Mar '24

19 Mar '24

Module: kamailio Branch: master Commit: 9e2a0ee545646bd4491ecdbe58d7fea770764b54 URL: https://github.com/kamailio/kamailio/commit/9e2a0ee545646bd4491ecdbe58d7fea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-19T09:51:28+01:00 keepalive: proper storing of last up/down timestamps - GH #3790 --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/9e2a0ee545646bd4491ecdbe58d7fea… Patch: https://github.com/kamailio/kamailio/commit/9e2a0ee545646bd4491ecdbe58d7fea… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 0aaafa8c8da..b1b3581cb34 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -131,11 +131,11 @@ static void ka_options_callback( // accepting 2XX return codes if(ps->code >= 200 && ps->code <= 299) { state = KA_STATE_UP; - ka_dest->last_down = time(NULL); + ka_dest->last_up = time(NULL); ka_dest->counter = 0; } else { state = KA_STATE_DOWN; - ka_dest->last_up = time(NULL); + ka_dest->last_down = time(NULL); ka_dest->counter++; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev