sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
242 discussions

git:5.8:a0dfa0ac: ndb_redis: clang-format for WITH_SSL code

by Daniel-Constantin Mierla

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

9 months, 1 week

git:5.8:a7d4ce95: keepalive: small formatting updates and comments to the ka dest structure

by Daniel-Constantin Mierla

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;

9 months, 1 week

git:5.8:0b3aa007: keepalive: proper storing of last up/down timestamps

by Daniel-Constantin Mierla

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

9 months, 1 week

git:5.8:91b09626: acc: more log messages of failure arsing extra acc string

by Daniel-Constantin Mierla

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 */

9 months, 1 week

git:5.8:5daadecd: ims_ipsec_pcscf: TLS support in ipsec_forward() improved

by Daniel-Constantin Mierla

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

9 months, 1 week

git:5.8:7df7508d: dispatcher: refine documentation

by Daniel-Constantin Mierla

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>

9 months, 1 week

git:5.8:90f8117f: ctl: handle int input for double storage

by Daniel-Constantin Mierla

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)

9 months, 1 week

git:master:3e3e9039: pvtpl: new module to process pv templates loaded from files

by Daniel-Constantin Mierla

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…

9 months, 1 week

git:master:951ab118: ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server()

by Daniel-Constantin Mierla

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

9 months, 1 week

git:master:c8f3b496: ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server()

by Daniel-Constantin Mierla

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

9 months, 1 week

← Newer
1
...
10
11
12
13
14
15
16
...
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