sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
242 discussions

[kamailio/kamailio] Not enough parameters for htable.seti (Issue #3774)

by Jon Bergli Heier

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

8 months, 1 week

git:5.7:29b6562d: ctl: handle int input for double storage

by Daniel-Constantin Mierla

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)

8 months, 1 week

git:master:68c69966: gcrypt: docs - module name used for section ids

by Daniel-Constantin Mierla

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>

8 months, 1 week

git:5.8:7bcef8ef: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

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

8 months, 1 week

git:5.7:a7e9a265: ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server()

by Daniel-Constantin Mierla

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

8 months, 1 week

git:5.7:4cc28e45: ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server()

by Daniel-Constantin Mierla

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

8 months, 1 week

git:5.7:f654b9c1: keepalive: small formatting updates and comments to the ka dest structure

by Daniel-Constantin Mierla

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;

8 months, 1 week

git:5.7:6a9caa09: keepalive: proper storing of last up/down timestamps

by Daniel-Constantin Mierla

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

8 months, 1 week

git:5.8:60fd6c26: ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server()

by Daniel-Constantin Mierla

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

8 months, 1 week

git:5.8:86df978b: ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server()

by Daniel-Constantin Mierla

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

8 months, 1 week

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024