- sr-dev - kamailio.org

git:master:043f31ea: ndb_redis: Fixing format
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 043f31ea0314c5d1d60a6ce8ce81e626922223c4 URL: https://github.com/kamailio/kamailio/commit/043f31ea0314c5d1d60a6ce8ce81e62… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 ndb_redis: Fixing format Fixing some spaces and indentations --- Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/043f31ea0314c5d1d60a6ce8ce81e62… Patch: https://github.com/kamailio/kamailio/commit/043f31ea0314c5d1d60a6ce8ce81e62… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 48c04a0bcc..4d0491547d 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -134,7 +134,7 @@ static param_export_t params[] = { {"allowed_timeouts", INT_PARAM, &redis_allowed_timeouts_param}, {"flush_on_reconnect", INT_PARAM, &redis_flush_on_reconnect_param}, {"allow_dynamic_nodes", INT_PARAM, &redis_allow_dynamic_nodes_param}, - {"debug", PARAM_INT, &ndb_redis_debug}, + {"debug", PARAM_INT, &ndb_redis_debug}, #ifdef WITH_SSL {"ca_path", PARAM_STRING, &ndb_redis_ca_path}, #endif diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 39b33d2066..13701438f1 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -140,14 +140,14 @@ int redisc_init(void) 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) enable_ssl = 0; #endif - } else if(pit->name.len == 14 + } else if(pit->name.len == 14 && strncmp(pit->name.s, "sentinel_group", 14) == 0) { snprintf(sentinel_group, sizeof(sentinel_group) - 1, "%.*s", pit->body.len, pit->body.s); @@ -236,8 +236,8 @@ int redisc_init(void) if(enable_ssl) { /* Create SSL context*/ redisInitOpenSSL(); - rsrv->sslCtxRedis = - redisCreateSSLContext(NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); + rsrv->sslCtxRedis = redisCreateSSLContext( + NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); } @@ -251,8 +251,8 @@ int redisc_init(void) redisConnectUnixWithTimeout(unix_sock_path, tv_conn); } else { #ifdef WITH_SSL - LOG(ndb_redis_debug, "Connecting to %s %s:%d\n", - (enable_ssl) ?"TLS" :"UDP", addr, port); + LOG(ndb_redis_debug, "Connecting to %s %s:%d\n", + (enable_ssl) ? "TLS" : "UDP", addr, port); #else LOG(ndb_redis_debug, "Connecting to %s:%d\n", addr, port); #endif @@ -500,7 +500,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) #ifdef WITH_SSL } 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); + pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); if(str2int(&pit->body, &enable_ssl) < 0) enable_ssl = 0; #endif @@ -598,8 +598,8 @@ int redisc_reconnect_server(redisc_server_t *rsrv) if(enable_ssl) { /* Create SSL context*/ redisInitOpenSSL(); - rsrv->sslCtxRedis = - redisCreateSSLContext(NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); + rsrv->sslCtxRedis = redisCreateSSLContext( + NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); }

1 0

git:master:f7a712b3: db_redis: Searching SSL support in gcc search library path
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: f7a712b36918bd9c01256fb2b283754ad9ed7422 URL: https://github.com/kamailio/kamailio/commit/f7a712b36918bd9c01256fb2b283754… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Searching SSL support in gcc search library path Checking libhiredis_ssl.so in gcc --print-search-dirs --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f7a712b36918bd9c01256fb2b283754… Patch: https://github.com/kamailio/kamailio/commit/f7a712b36918bd9c01256fb2b283754… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index 7d427586e98..f2231c26aec 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -29,10 +29,18 @@ else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) - ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),) + ifeq ($(HIREDISLIBSPATH),) + GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Po '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') + ifneq ($(shell find $(GCCSEARCHDIRS) libhiredis_ssl.so),) + HIREDISDEFS += -DWITH_SSL + HIREDISLIBS += -lhiredis_ssl + endif + else + ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl - endif + endif + endif ifeq (,$(findstring hiredis,$(HIREDISDEFS))) DEFS+=-DWITH_HIREDIS_PATH

1 0

git:master:d4192486: ndb_redis: Searching SSL support in gcc search library path
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: d41924862a1729de186a5d1f4adddcfeb7fb7b7d URL: https://github.com/kamailio/kamailio/commit/d41924862a1729de186a5d1f4adddcf… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 ndb_redis: Searching SSL support in gcc search library path Checking libhiredis_ssl.so in gcc --print-search-dirs --- Modified: src/modules/ndb_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d41924862a1729de186a5d1f4adddcf… Patch: https://github.com/kamailio/kamailio/commit/d41924862a1729de186a5d1f4adddcf… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index a90e3018b4..6b27f72386 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -23,10 +23,18 @@ else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) - ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),) - HIREDISDEFS += -DWITH_SSL - HIREDISLIBS += -lhiredis_ssl - endif + ifeq ($(HIREDISLIBSPATH),) + GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Po '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') + ifneq ($(shell find $(GCCSEARCHDIRS) libhiredis_ssl.so),) + HIREDISDEFS += -DWITH_SSL + HIREDISLIBS += -lhiredis_ssl + endif + else + ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),) + HIREDISDEFS += -DWITH_SSL + HIREDISLIBS += -lhiredis_ssl + endif + endif ifeq (,$(findstring hiredis,$(HIREDISDEFS))) DEFS+=-DWITH_HIREDIS_PATH

1 0

git:master:90f97720: ndb_redis: Fixing global variables names
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 90f977202af2d132fb63f20f76f9ad696a19656e URL: https://github.com/kamailio/kamailio/commit/90f977202af2d132fb63f20f76f9ad6… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 ndb_redis: Fixing global variables names Adding module name prefixing global variable names to prevent possible conflicts. Also using ca_path info in SSL context creation. --- Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/90f977202af2d132fb63f20f76f9ad6… Patch: https://github.com/kamailio/kamailio/commit/90f977202af2d132fb63f20f76f9ad6… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 11d6cdb9c7..48c04a0bcc 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -55,7 +55,7 @@ int redis_flush_on_reconnect_param = 0; int redis_allow_dynamic_nodes_param = 0; int ndb_redis_debug = L_DBG; #ifdef WITH_SSL -char *ca_path = 0; +char *ndb_redis_ca_path = 0; #endif static int w_redis_cmd3( @@ -136,7 +136,7 @@ static param_export_t params[] = { {"allow_dynamic_nodes", INT_PARAM, &redis_allow_dynamic_nodes_param}, {"debug", PARAM_INT, &ndb_redis_debug}, #ifdef WITH_SSL - {"ca_path", PARAM_STRING, &ca_path}, + {"ca_path", PARAM_STRING, &ndb_redis_ca_path}, #endif {0, 0, 0}}; diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 00b01c9596..39b33d2066 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -63,7 +63,7 @@ extern int redis_flush_on_reconnect_param; extern int redis_allow_dynamic_nodes_param; extern int ndb_redis_debug; #ifdef WITH_SSL -extern char *ca_path; +extern char *ndb_redis_ca_path; #endif /* backwards compatibility with hiredis < 0.12 */ @@ -237,7 +237,7 @@ int redisc_init(void) /* Create SSL context*/ redisInitOpenSSL(); rsrv->sslCtxRedis = - redisCreateSSLContext(NULL, NULL, NULL, NULL, NULL, NULL); + redisCreateSSLContext(NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); } @@ -599,7 +599,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) /* Create SSL context*/ redisInitOpenSSL(); rsrv->sslCtxRedis = - redisCreateSSLContext(NULL, NULL, NULL, NULL, NULL, NULL); + redisCreateSSLContext(NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); }

1 0

git:master:77e74b97: ndb_redis: Missing uprotected redisSSLContext
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 77e74b974249b3c4e2e67cc074cc8ff26d50fde8 URL: https://github.com/kamailio/kamailio/commit/77e74b974249b3c4e2e67cc074cc8ff… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 ndb_redis: Missing uprotected redisSSLContext Fixing unprotected redisSSLContext reference in redis_client.h --- Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/77e74b974249b3c4e2e67cc074cc8ff… Patch: https://github.com/kamailio/kamailio/commit/77e74b974249b3c4e2e67cc074cc8ff… --- diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index 9e1323981da..fd13d712902 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -82,7 +82,9 @@ typedef struct redisc_server param_t *attrs; char *spec; redisContext *ctxRedis; +#ifdef WITH_SSL redisSSLContext *sslCtxRedis; +#endif struct redisc_server *next; redisc_piped_cmds_t piped; redisc_srv_disable_t disable;

1 0

git:master:4cca8c77: db_redis: Fixing build
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 4cca8c777020e5fea49e37940e3c521d766588f9 URL: https://github.com/kamailio/kamailio/commit/4cca8c777020e5fea49e37940e3c521… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Fixing build Removing extra declaration outside from WITH_SSL block --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/4cca8c777020e5fea49e37940e3c521… Patch: https://github.com/kamailio/kamailio/commit/4cca8c777020e5fea49e37940e3c521… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 1bfc8cdad09..f38b6698d41 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -135,7 +135,6 @@ int db_redis_connect(km_redis_con_t *con) #ifndef WITH_HIREDIS_CLUSTER db = atoi(con->id->database); #endif - redisSSLContext *ssl = NULL; reply = NULL; if(con->con) {

1 0

git:master:440e8cba: db_redis: Fixing Makefile
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 440e8cba9f9e8364e100a68283137da589e6f283 URL: https://github.com/kamailio/kamailio/commit/440e8cba9f9e8364e100a68283137da… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Fixing Makefile Removing unprotected references to libhiredis_ssl.so --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/440e8cba9f9e8364e100a68283137da… Patch: https://github.com/kamailio/kamailio/commit/440e8cba9f9e8364e100a68283137da… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index e3a2abdd09c..7d427586e98 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -20,14 +20,14 @@ endif ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis - HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis_ssl -lhiredis + HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis ifneq ($(shell ls $(LOCALBASE) | grep libhiredis_ssl.so),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl endif else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) - HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) -lhiredis_ssl + HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) ifneq ($(shell ls $(HIREDISLIBSPATH) | grep libhiredis_ssl.so),) HIREDISDEFS += -DWITH_SSL @@ -40,7 +40,7 @@ endif ifeq ($(HIREDISLIBS),-L -lhiredis) HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include - HIREDISLIBS = -L/opt/local/lib -lhiredis -lhiredis_ssl + HIREDISLIBS = -L/opt/local/lib -lhiredis ifneq ($(shell ls /opt/local/lib | grep libhiredis_ssl.so),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl

1 0

git:master:30eec549: db_redis: Fixing global variables
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 30eec549396899eae32e651ef58d65c4684ab296 URL: https://github.com/kamailio/kamailio/commit/30eec549396899eae32e651ef58d65c… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Fixing global variables Adding module name prefix to global variables to reduce possible conflicts. --- Modified: src/modules/db_redis/db_redis_mod.c Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/30eec549396899eae32e651ef58d65c… Patch: https://github.com/kamailio/kamailio/commit/30eec549396899eae32e651ef58d65c… --- diff --git a/src/modules/db_redis/db_redis_mod.c b/src/modules/db_redis/db_redis_mod.c index 026abeb148..89da232083 100644 --- a/src/modules/db_redis/db_redis_mod.c +++ b/src/modules/db_redis/db_redis_mod.c @@ -31,9 +31,9 @@ #ifdef WITH_SSL int db_redis_opt_tls = 0; -char *ca_path = 0; +char *db_redis_ca_path = 0; #endif -char *db_pass = 0; +char *db_redis_db_pass = 0; MODULE_VERSION @@ -60,9 +60,9 @@ static param_export_t params[] = { {"verbosity", PARAM_INT, &db_redis_verbosity}, #ifdef WITH_SSL {"opt_tls", PARAM_INT, &db_redis_opt_tls}, - {"ca_path", PARAM_STRING, &ca_path}, + {"ca_path", PARAM_STRING, &db_redis_ca_path}, #endif - {"db_pass", PARAM_STRING, &db_pass}, {0, 0, 0}}; + {"db_pass", PARAM_STRING, &db_redis_db_pass}, {0, 0, 0}}; struct module_exports exports = { diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index f38b6698d4..0bf001d152 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -37,9 +37,9 @@ static unsigned int MAX_URL_LENGTH = 1023; extern int db_redis_verbosity; #ifdef WITH_SSL extern int db_redis_opt_tls; -extern char *ca_path; +extern char *db_redis_ca_path; #endif -extern char *db_pass; +extern char *db_redis_db_pass; static void print_query(redis_key_t *query) { @@ -164,7 +164,7 @@ int db_redis_connect(km_redis_con_t *con) if(db_redis_opt_tls != 0) { /* Create SSL context*/ redisInitOpenSSL(); - ssl = redisCreateSSLContext(NULL, ca_path, NULL, NULL, NULL, NULL); + ssl = redisCreateSSLContext(NULL, db_redis_ca_path, NULL, NULL, NULL, NULL); if(ssl == NULL) { LM_ERR("Unable to create Redis SSL Context.\n"); goto err; @@ -208,7 +208,7 @@ int db_redis_connect(km_redis_con_t *con) if(db_redis_opt_tls != 0) { /* Create SSL context*/ redisInitOpenSSL(); - ssl = redisCreateSSLContext(NULL, ca_path, NULL, NULL, NULL, NULL); + ssl = redisCreateSSLContext(NULL, db_redis_ca_path, NULL, NULL, NULL, NULL); if(ssl == NULL) { LM_ERR("Unable to create Redis SSL Context.\n"); goto err; @@ -236,7 +236,7 @@ int db_redis_connect(km_redis_con_t *con) password = con->id->password; if(!password) { - password = db_pass; + password = db_redis_db_pass; } if(password) { reply = redisCommand(con->con, "AUTH %s", password);

1 0

git:master:077980a0: db_redis: Missing format fixes
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 077980a000c37320bfade650c680da55af92154e URL: https://github.com/kamailio/kamailio/commit/077980a000c37320bfade650c680da5… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Missing format fixes Removing spaces from line ends. --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/077980a000c37320bfade650c680da5… Patch: https://github.com/kamailio/kamailio/commit/077980a000c37320bfade650c680da5… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index bfdc2144547..1bfc8cdad09 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -170,7 +170,7 @@ int db_redis_connect(km_redis_con_t *con) LM_ERR("Unable to create Redis SSL Context.\n"); goto err; } - } + } #endif host_end = strstr(host_begin, "/"); @@ -214,7 +214,7 @@ int db_redis_connect(km_redis_con_t *con) LM_ERR("Unable to create Redis SSL Context.\n"); goto err; } - } + } #endif con->con = redisConnectWithTimeout(con->id->host, con->id->port, tv);

1 0

git:master:dd6ee7a7: ndb_redis: Format fixes
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: dd6ee7a7499fce6ce33c59c0dd15af81a140ae4f URL: https://github.com/kamailio/kamailio/commit/dd6ee7a7499fce6ce33c59c0dd15af8… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 ndb_redis: Format fixes Fixing C formatting issues --- Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/dd6ee7a7499fce6ce33c59c0dd15af8… Patch: https://github.com/kamailio/kamailio/commit/dd6ee7a7499fce6ce33c59c0dd15af8…

1 0

git:master:79d5ab3b: ndb_redis: Adding TLS support
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 79d5ab3b86c0a1cc1b06efeee78ef5baa8d084f9 URL: https://github.com/kamailio/kamailio/commit/79d5ab3b86c0a1cc1b06efeee78ef5b… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 ndb_redis: Adding TLS support Checks for the tls parameter in the BD schema and, if it's enabled, creates a temporary TLS conext that is used to initialize the redis context. Adds 1 new parameter: * ca_path: For specifying a folder containing valid certification chains. --- Modified: src/modules/ndb_redis/Makefile Modified: src/modules/ndb_redis/doc/ndb_redis.xml Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/79d5ab3b86c0a1cc1b06efeee78ef5b… Patch: https://github.com/kamailio/kamailio/commit/79d5ab3b86c0a1cc1b06efeee78ef5b…

1 0

git:master:ba080b16: db_redis: Fixing format
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: ba080b16353b53c29c147740f3541ceecbe31c1d URL: https://github.com/kamailio/kamailio/commit/ba080b16353b53c29c147740f3541ce… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Fixing format Fixing malformed C lines --- Modified: src/modules/db_redis/db_redis_mod.c Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/ba080b16353b53c29c147740f3541ce… Patch: https://github.com/kamailio/kamailio/commit/ba080b16353b53c29c147740f3541ce…

1 0

git:master:67c77289: db_redis: Adding TLS support
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 67c77289afb994178afc1fd7558833097eb2f5b9 URL: https://github.com/kamailio/kamailio/commit/67c77289afb994178afc1fd75588330… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T10:45:31+02:00 db_redis: Adding TLS support Enhancing security options by enabling TLS connections and password definition. Added 3 new parameters: * opt_tls: For enabling TLS connections. * ca_path: For specifying a folder containing valid certification chains. * password: For providing DB access password. If opt_tls is provided a temporary SSL context is created to pass it to existing cluster or normal redis context. TLS support is automatically enabled/disabled by checking libhiredis_ssl.so existence. --- Modified: src/modules/db_redis/Makefile Modified: src/modules/db_redis/db_redis_mod.c Modified: src/modules/db_redis/doc/db_redis.xml Modified: src/modules/db_redis/doc/db_redis_admin.xml Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_connection.h --- Diff: https://github.com/kamailio/kamailio/commit/67c77289afb994178afc1fd75588330… Patch: https://github.com/kamailio/kamailio/commit/67c77289afb994178afc1fd75588330…

1 0

git:5.7:f1ebf365: Makefile.groups: added posops to extra group
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: 5.7 Commit: f1ebf365e8054fbca260b8574bea502b32435382 URL: https://github.com/kamailio/kamailio/commit/f1ebf365e8054fbca260b8574bea502… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T09:15:59+02:00 Makefile.groups: added posops to extra group (cherry picked from commit 87959c23aacf4cfa7ed8acd214f70775939c8a01) --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/f1ebf365e8054fbca260b8574bea502… Patch: https://github.com/kamailio/kamailio/commit/f1ebf365e8054fbca260b8574bea502… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index e70dedb4fe..7d05dc139c 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -23,7 +23,7 @@ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom keepalive ss7ops app_sqlang acc_diameter evrexec \ - sipjson lrkproxy math xhttp_prom + sipjson lrkproxy math posops xhttp_prom # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

git:master:87959c23: Makefile.groups: added posops to extra group
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 87959c23aacf4cfa7ed8acd214f70775939c8a01 URL: https://github.com/kamailio/kamailio/commit/87959c23aacf4cfa7ed8acd214f7077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T09:15:31+02:00 Makefile.groups: added posops to extra group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/87959c23aacf4cfa7ed8acd214f7077… Patch: https://github.com/kamailio/kamailio/commit/87959c23aacf4cfa7ed8acd214f7077… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index e70dedb4fea..7d05dc139c1 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -23,7 +23,7 @@ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom keepalive ss7ops app_sqlang acc_diameter evrexec \ - sipjson lrkproxy math xhttp_prom + sipjson lrkproxy math posops xhttp_prom # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

[kamailio/kamailio] src/Makefile.defs: complete removal of VQ_MALLOC memory manager (PR #3488)
by Дилян Палаузов 20 Jun '23

20 Jun '23

… started in commit f92113d8e16d6e59c170dfa703d9db30980b6877. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3488 -- Commit Summary -- * src/Makefile.defs: complete removal of VQ_MALLOC memory manager -- File Changes -- M src/Makefile.defs (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3488.patch https://github.com/kamailio/kamailio/pull/3488.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3488 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3488(a)github.com>

2 1

git:master:73fdf7a8: src/Makefile.defs: complete removal of VQ_MALLOC memory manager
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: 73fdf7a8eb1ca3e00ff4844e6c797114f17f3525 URL: https://github.com/kamailio/kamailio/commit/73fdf7a8eb1ca3e00ff4844e6c79711… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T09:12:24+02:00 src/Makefile.defs: complete removal of VQ_MALLOC memory manager �� started in commit f92113d8e16d6e59c170dfa703d9db30980b6877. --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/73fdf7a8eb1ca3e00ff4844e6c79711… Patch: https://github.com/kamailio/kamailio/commit/73fdf7a8eb1ca3e00ff4844e6c79711… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d720e708b8..71ebd9ffdb 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -594,10 +594,6 @@ data_target = $(prefix)/$(data_dir) # extra error checking (trying to free the same pointer # twice, trying to free a pointer alloc'ed with a different # malloc etc.) -# -DVQ_MALLOC -# additional option to PKG_MALLOC which utilizes a fater then -# qm version -# (not true anymore, q_malloc performs approx. the same) # -DQ_MALLOC # custom quick malloc, recommended for debugging # -DF_MALLOC @@ -741,7 +737,6 @@ C_DEFS+= -DSHM_MMAP \ #-DDBG_F_MALLOC \ #-DNO_DEBUG \ #-DEXTRA_DEBUG \ - #-DVQ_MALLOC \ #-DDBG_LOCK \ #-DNOSMP \ #-DNO_LOG \

1 0

git:5.6:ada8f757: pkg/docker: submodule update [skip ci]
by Sergey Safarov 20 Jun '23

20 Jun '23

Module: kamailio Branch: 5.6 Commit: ada8f757407712fe757398a38dab6d452545f018 URL: https://github.com/kamailio/kamailio/commit/ada8f757407712fe757398a38dab6d4… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-06-20T09:05:53+03:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/ada8f757407712fe757398a38dab6d4… Patch: https://github.com/kamailio/kamailio/commit/ada8f757407712fe757398a38dab6d4… --- diff --git a/pkg/docker b/pkg/docker index c493ee5e621..5c45c0f8871 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit c493ee5e62179313c312c3359f4fe40f6e92b169 +Subproject commit 5c45c0f8871ceebb1a8f5308653bca924afb0d6f

1 0

git:5.6:5f982c9f: pkg/kamailio/alpine: packaged lwsc
by Sergey Safarov 20 Jun '23

20 Jun '23

Module: kamailio Branch: 5.6 Commit: 5f982c9f46f203d7976a57f12789213f78eaa261 URL: https://github.com/kamailio/kamailio/commit/5f982c9f46f203d7976a57f12789213… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-06-20T09:05:11+03:00 pkg/kamailio/alpine: packaged lwsc (cherry picked from commit 768dd96da6f52e46bc227d9815f7225b33042295) (cherry picked from commit 6005e8e4e3e0d9488693eca1484122dfed303ac6) --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/5f982c9f46f203d7976a57f12789213… Patch: https://github.com/kamailio/kamailio/commit/5f982c9f46f203d7976a57f12789213… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index dd05823c0e5..f517014b482 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -31,7 +31,7 @@ makedepends="bison db-dev flex freeradius-client-dev expat-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev - ruby-dev libmaxminddb-dev libunistring-dev mongo-c-driver-dev" + ruby-dev libmaxminddb-dev libunistring-dev mongo-c-driver-dev libwebsockets-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -137,7 +137,7 @@ _mod_list_tls="auth_identity crypto tls" _mod_list_outbound="outbound" # - modules depending on unistring library -_mod_list_websocket="websocket" +_mod_list_websocket="websocket lwsc" # - modules depending on libval-threads libcrypto libsres libpthread _mod_list_dnssec="dnssec"

1 0

git:5.7:6005e8e4: pkg/kamailio/alpine: packaged lwsc
by Sergey Safarov 20 Jun '23

20 Jun '23

Module: kamailio Branch: 5.7 Commit: 6005e8e4e3e0d9488693eca1484122dfed303ac6 URL: https://github.com/kamailio/kamailio/commit/6005e8e4e3e0d9488693eca1484122d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-06-20T09:02:10+03:00 pkg/kamailio/alpine: packaged lwsc (cherry picked from commit 768dd96da6f52e46bc227d9815f7225b33042295) --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/6005e8e4e3e0d9488693eca1484122d… Patch: https://github.com/kamailio/kamailio/commit/6005e8e4e3e0d9488693eca1484122d… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f895f02ad10..e585cdb66b6 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -31,7 +31,7 @@ makedepends="bison db-dev flex freeradius-client-dev expat-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev - ruby-dev libmaxminddb-dev libunistring-dev mongo-c-driver-dev" + ruby-dev libmaxminddb-dev libunistring-dev mongo-c-driver-dev libwebsockets-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -137,7 +137,7 @@ _mod_list_tls="auth_identity crypto tls" _mod_list_outbound="outbound" # - modules depending on unistring library -_mod_list_websocket="websocket" +_mod_list_websocket="websocket lwsc" # - modules depending on libval-threads libcrypto libsres libpthread _mod_list_dnssec="dnssec"

1 0

git:5.7:85e3a2bc: pkg/docker: submodule update [skip ci]
by Sergey Safarov 20 Jun '23

20 Jun '23

Module: kamailio Branch: 5.7 Commit: 85e3a2bce7ba4d8c6e9c167c732dad11706f99d3 URL: https://github.com/kamailio/kamailio/commit/85e3a2bce7ba4d8c6e9c167c732dad1… Author: Kaufman <bkaufman(a)nexvortex.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-06-20T09:02:10+03:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/85e3a2bce7ba4d8c6e9c167c732dad1… Patch: https://github.com/kamailio/kamailio/commit/85e3a2bce7ba4d8c6e9c167c732dad1… --- diff --git a/pkg/docker b/pkg/docker index d34e8eed77..5c45c0f887 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit d34e8eed77428f84ef15c57bd7402e5161b6021f +Subproject commit 5c45c0f8871ceebb1a8f5308653bca924afb0d6f

1 0

git:5.7:3e510ac6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 19 Jun '23

19 Jun '23

Module: kamailio Branch: 5.7 Commit: 3e510ac68a4b9bc99b6ade5cb7cc862adcbb9eb9 URL: https://github.com/kamailio/kamailio/commit/3e510ac68a4b9bc99b6ade5cb7cc862… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-19T14:17:02+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_usrloc_scscf/README Modified: src/modules/mqueue/README --- Diff: https://github.com/kamailio/kamailio/commit/3e510ac68a4b9bc99b6ade5cb7cc862… Patch: https://github.com/kamailio/kamailio/commit/3e510ac68a4b9bc99b6ade5cb7cc862… --- diff --git a/src/modules/ims_usrloc_scscf/README b/src/modules/ims_usrloc_scscf/README index 384d9ee6742..d128b226b00 100644 --- a/src/modules/ims_usrloc_scscf/README +++ b/src/modules/ims_usrloc_scscf/README @@ -39,7 +39,7 @@ Yasin Caner 3.11. matching_mode (int) 3.12. cseq_delay (int) 3.13. fetch_rows(int) - 3.14. hash_size (string) + 3.14. hash_size (int) 3.15. subs_hash_size (int) 3.16. contacts_hash_size (integer) 3.17. nat_bflag (integer) @@ -108,7 +108,7 @@ Chapter 1. Admin Guide 3.11. matching_mode (int) 3.12. cseq_delay (int) 3.13. fetch_rows(int) - 3.14. hash_size (string) + 3.14. hash_size (int) 3.15. subs_hash_size (int) 3.16. contacts_hash_size (integer) 3.17. nat_bflag (integer) @@ -157,7 +157,7 @@ Chapter 1. Admin Guide 3.11. matching_mode (int) 3.12. cseq_delay (int) 3.13. fetch_rows(int) - 3.14. hash_size (string) + 3.14. hash_size (int) 3.15. subs_hash_size (int) 3.16. contacts_hash_size (integer) 3.17. nat_bflag (integer) @@ -315,7 +315,7 @@ st/scscf") ... modparam("ims_usrloc_scscf", "fetch_rows", 3000) -3.14. hash_size (string) +3.14. hash_size (int) The number of entries of the hash table used by usrloc diff --git a/src/modules/mqueue/README b/src/modules/mqueue/README index a8981a68aee..3db56e8f54b 100644 --- a/src/modules/mqueue/README +++ b/src/modules/mqueue/README @@ -176,12 +176,12 @@ val character varying(4096) DEFAULT "" NOT NULL + size: size of the queue. Specifies the maximum number of items in queue. If exceeded the oldest one is removed. If not set the queue will be limitless. - + dbmode: If set to 1, the content of the queue is written to - database table when the SIP server is stopped (i.e., ensure - persistency over restarts). If set to 2, it is written at - shutdown but not read at startup. If set to 3, it is read at - sartup but not written at shutdown. Default value is 0 (no db - table interaction). + + dbmode: If set to 1, the content of the queue is read from + database at startup and is written to database table when the + SIP server is stopped (i.e., ensure persistency over + restarts). If set to 2, it is read at startup but not written + at shutdown. If set to 3, it is written at shutdown but not + read at startup. Default value is 0 (no db table interaction). + addmode: how to add new (key,value) pairs. o 0: Will push all new (key,value) pairs at the end of the queue. (default)

1 0

git: new commits in branch 5.7
by Daniel-Constantin Mierla 19 Jun '23

19 Jun '23

- URL: https://github.com/kamailio/kamailio/commit/408643ec916bc00f9f9447952e553d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:36:53+02:00 ipops: create container items if not found for srv and naptr functions - GH #3419 (cherry picked from commit 7971d825361bee29d65fcea69f2978d7af31eeaa) - URL: https://github.com/kamailio/kamailio/commit/e95a79eef0589be2f7d0470bfe6ba19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:37:32+02:00 siprepo: check if list is set on insert (cherry picked from commit 423a818cf6e8f6d672630a0365e13877a173508f) - URL: https://github.com/kamailio/kamailio/commit/c29d5299650ddabb9a5b61c7b6a72a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:38:05+02:00 cdp: reworked switch for setting x->state = ACC_CC_ST_DISCON (cherry picked from commit cb6332982edff5fd2f10b6ee41c22388cc9a39b3) - URL: https://github.com/kamailio/kamailio/commit/3b6d0bd508d62b6f6cd0176551311d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:38:31+02:00 cfgt: reworked test on dest.s for freeing (cherry picked from commit b2f99145fa7f4088c80dd3e759372445f93f5492) - URL: https://github.com/kamailio/kamailio/commit/febfc9722f83d992a3c1643fa373468… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:40:03+02:00 sst: fix condition on sst_min_se for sst_check_min() (cherry picked from commit a059af04ac47fd31238ca4f22ad868529e035c43) - URL: https://github.com/kamailio/kamailio/commit/b68cb1ace4d44ba0a471a9fd9a6138f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:40:34+02:00 async: use _async_timer_exec_last_slot = UINT_MAX for initial value (cherry picked from commit bc544daea2ee4bb568cf0314f6d32b8aa0c81ecc) - URL: https://github.com/kamailio/kamailio/commit/9c78c0f55dc2aefa53872b26162ddae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:40:47+02:00 ims_usrloc_scscf: docs - type int for hash_size parameter (cherry picked from commit 1217c9098bc8790e659959a7df97e441e84b54ff) - URL: https://github.com/kamailio/kamailio/commit/cd665a135e0046b915af7afd9135a2c… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-06-19T13:42:43+02:00 mqueue: fix support for db_text - db_operations are safe only after db mod_init() - closes #3474 (cherry picked from commit 848d55388dda0c135820d9f24950561946249bbc) - URL: https://github.com/kamailio/kamailio/commit/14638ef43f9b2ef710ae3a6464fb5db… Author: Akash Gupta <listen2akash(a)gmail.com> Date: 2023-06-19T13:43:28+02:00 tool: port the route_graph.py script to python version 3.x (cherry picked from commit fa2a69e2ae919b7ba221e87e2001bde83113ce2a) - URL: https://github.com/kamailio/kamailio/commit/4f3c32e48b79688ab905802c173b981… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-06-19T13:44:05+02:00 tools: use python3 for route_graph.py tool, for old systems with both python2/python3, fix file closing (cherry picked from commit 7b1fe0483b684693c7baea9b62b471b64c6e22a9) - URL: https://github.com/kamailio/kamailio/commit/c6af81fad763114c1cec74927787388… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:44:17+02:00 Makefile: fixed paths for init.d scripts install on debian and centos - GH #3476 (cherry picked from commit c285b16bc066ca4236ee00cf3e7fb24539fa9f2b) - URL: https://github.com/kamailio/kamailio/commit/39262e50389d41c50d0e6ff2ae2b0a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:48:26+02:00 dialplan: restructured condition on input and output params (cherry picked from commit f99b116e876170709ad364ac2b8093969a939d4a) - URL: https://github.com/kamailio/kamailio/commit/a8094a3b0bb73be70500b4cbbfb2e99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:52:30+02:00 auth_diameter: free req in some cases of errors (cherry picked from commit fb19f0ea4c656afe7b60788efb8804e552fd37f9) - URL: https://github.com/kamailio/kamailio/commit/faf7941042c1e00a68f6ac36d14568b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:55:14+02:00 cdp: check setsockopt() return code (cherry picked from commit 39f09877e650d66e820ca7eb0d61416818d174fc) - URL: https://github.com/kamailio/kamailio/commit/91cb5d0adf887db6a34e2a394ab34aa… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-06-19T13:58:05+02:00 mqueue: fix documentation to match the code (cherry picked from commit 23d43645332451ec1ec6dab11da777f9c3bfe304) - URL: https://github.com/kamailio/kamailio/commit/8087b2fed765115bf0fd238c0c987fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:59:13+02:00 core: kemi - propagate bool as a return value type - some scripting languages differentiate bool false|true vs int 0|1 values (cherry picked from commit f36744cf15c7fcddc7422f97a508cad600ca7d98)

1 0

git:master:bfc5d4bd: dialplan: set right input/output pv references
by Daniel-Constantin Mierla 19 Jun '23

19 Jun '23

Module: kamailio Branch: master Commit: bfc5d4bdcdd1ce60359d1a2e6a097f312879799f URL: https://github.com/kamailio/kamailio/commit/bfc5d4bdcdd1ce60359d1a2e6a097f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:50:28+02:00 dialplan: set right input/output pv references --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/bfc5d4bdcdd1ce60359d1a2e6a097f3… Patch: https://github.com/kamailio/kamailio/commit/bfc5d4bdcdd1ce60359d1a2e6a097f3… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index b5286d2b613..680d40641c8 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -858,12 +858,12 @@ static int ki_dp_translate( } if(input_spv == NULL || input_spv->len <= 0) { - pvs_o = pv_cache_get(&dp_default_param_s); + pvs_i = pv_cache_get(&dp_default_param_s); } else { pvs_i = pv_cache_get(input_spv); } if(output_spv == NULL || output_spv->len <= 0) { - pvs_i = pv_cache_get(&dp_default_param_s); + pvs_o = pv_cache_get(&dp_default_param_s); } else { pvs_o = pv_cache_get(output_spv); }

1 0

git:master:f36744cf: core: kemi - propagate bool as a return value type
by Daniel-Constantin Mierla 19 Jun '23

19 Jun '23

Module: kamailio Branch: master Commit: f36744cf15c7fcddc7422f97a508cad600ca7d98 URL: https://github.com/kamailio/kamailio/commit/f36744cf15c7fcddc7422f97a508cad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:18:59+02:00 core: kemi - propagate bool as a return value type - some scripting languages differentiate bool false|true vs int 0|1 values --- Modified: src/core/kemiexec.c --- Diff: https://github.com/kamailio/kamailio/commit/f36744cf15c7fcddc7422f97a508cad… Patch: https://github.com/kamailio/kamailio/commit/f36744cf15c7fcddc7422f97a508cad… --- diff --git a/src/core/kemiexec.c b/src/core/kemiexec.c index 8e3b096e18..581e174c93 100644 --- a/src/core/kemiexec.c +++ b/src/core/kemiexec.c @@ -40,12 +40,16 @@ static sr_kemi_xval_t _sr_kemi_core_exec_xval; */ static inline sr_kemi_xval_t *sr_kemi_return_int(sr_kemi_t *ket, int ret) { - _sr_kemi_core_exec_xval.vtype = SR_KEMIP_INT; - _sr_kemi_core_exec_xval.v.n = ret; + if(ket->rtype & SR_KEMIP_BOOL) { + _sr_kemi_core_exec_xval.vtype = SR_KEMIP_BOOL; + _sr_kemi_core_exec_xval.v.n = ret; + } else { + _sr_kemi_core_exec_xval.vtype = SR_KEMIP_INT; + _sr_kemi_core_exec_xval.v.n = ret; + } return &_sr_kemi_core_exec_xval; } - /** * */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev