- sr-dev - kamailio.org

git:master:d7ae9f14: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: d7ae9f14502a90301455efbdf776eb785bcbbb50 URL: https://github.com/kamailio/kamailio/commit/d7ae9f14502a90301455efbdf776eb7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-20T11:16:33+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/d7ae9f14502a90301455efbdf776eb7… Patch: https://github.com/kamailio/kamailio/commit/d7ae9f14502a90301455efbdf776eb7…

1 0

[kamailio/kamailio] Adding TLS support to db_redis (also password support) and ndb_redis (PR #3477)
by joelbax 20 Jun '23

20 Jun '23

#### Pre-Submission Checklist    - [ /] Commit message has the format required by CONTRIBUTING guide - [ /] Commits are split per component (core, individual modules, libs, utils, ...) - [ /] Each component has a single commit (if not, squash them into one commit) - [ /] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [/ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ /] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description A couple of commits into db_redis and ndb_redis adding TLS support and also password support to db_redis. This mainly includes checking if proper parameter is provided (for ndb_redis is `tls` option in the DB URL and, for db_redis, a new `opt_tls` parameter) and creates a temporary SSL context that is used to initialise the redis context. Also added `ca_path` parameter to both modules to be able to define a valid folder containing the root certificates used to validate TLS' certificate chain. db_redis is also updated with a `db_pass` parameter to provide a DB access password. TLS support is automatically enabled by checking libhiredis_ssl.so existence in each Makefile and defining a `WITH_SSL` flag that enables all the corresponding code lines. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3477 -- Commit Summary -- * db_redis: Adding TLS support * ndb_redis: Adding TLS support -- File Changes -- M src/modules/db_redis/Makefile (24) M src/modules/db_redis/db_redis_mod.c (13) M src/modules/db_redis/doc/db_redis.xml (5) M src/modules/db_redis/doc/db_redis_admin.xml (59) M src/modules/db_redis/redis_connection.c (98) M src/modules/db_redis/redis_connection.h (6) M src/modules/ndb_redis/Makefile (15) M src/modules/ndb_redis/doc/ndb_redis.xml (5) M src/modules/ndb_redis/doc/ndb_redis_admin.xml (26) M src/modules/ndb_redis/ndb_redis_mod.c (10) M src/modules/ndb_redis/redis_client.c (69) M src/modules/ndb_redis/redis_client.h (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3477.patch https://github.com/kamailio/kamailio/pull/3477.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3477 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3477(a)github.com>

3 17

git:master:d29d435c: ndb_redis: Makefile - updated find command for libhiredis_ssl
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: d29d435cad3ec52f4171035446870ad2fe991858 URL: https://github.com/kamailio/kamailio/commit/d29d435cad3ec52f4171035446870ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T11:04:30+02:00 ndb_redis: Makefile - updated find command for libhiredis_ssl - silent warnings about not existing directories --- Modified: src/modules/ndb_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d29d435cad3ec52f4171035446870ad… Patch: https://github.com/kamailio/kamailio/commit/d29d435cad3ec52f4171035446870ad… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index 6b27f72386..ba085ca273 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -25,7 +25,7 @@ else HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) ifeq ($(HIREDISLIBSPATH),) GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Po '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') - ifneq ($(shell find $(GCCSEARCHDIRS) libhiredis_ssl.so),) + ifneq ($(shell find $(GCCSEARCHDIRS) -name libhiredis_ssl.so 2>/dev/null),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl endif

1 0

git:master:d88d60a0: db_redis: Makefile - updated find command for libhiredis_ssl
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: d88d60a0f3d67f42e4201d6c871bbf993e6fa87b URL: https://github.com/kamailio/kamailio/commit/d88d60a0f3d67f42e4201d6c871bbf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-20T11:03:04+02:00 db_redis: Makefile - updated find command for libhiredis_ssl - silent warnings about not existing directories --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d88d60a0f3d67f42e4201d6c871bbf9… Patch: https://github.com/kamailio/kamailio/commit/d88d60a0f3d67f42e4201d6c871bbf9… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index f2231c26aec..815cd056b9d 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -31,7 +31,7 @@ else HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) ifeq ($(HIREDISLIBSPATH),) GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Po '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') - ifneq ($(shell find $(GCCSEARCHDIRS) libhiredis_ssl.so),) + ifneq ($(shell find $(GCCSEARCHDIRS) -name libhiredis_ssl.so 2>/dev/null),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl endif

1 0

git:master:cb96de74: db_redis: Format fixes
by Daniel-Constantin Mierla 20 Jun '23

20 Jun '23

Module: kamailio Branch: master Commit: cb96de742f1d729d01bf9c8c255a12aa089d6974 URL: https://github.com/kamailio/kamailio/commit/cb96de742f1d729d01bf9c8c255a12a… 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: Format fixes Fixing some spaces --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/cb96de742f1d729d01bf9c8c255a12a… Patch: https://github.com/kamailio/kamailio/commit/cb96de742f1d729d01bf9c8c255a12a… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 0bf001d1528..5a49346b431 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -150,7 +150,7 @@ int db_redis_connect(km_redis_con_t *con) char hosts[MAX_URL_LENGTH]; char *host_begin; char *host_end; - LM_DBG("connecting to redis cluster at %.*s\n", con->id->url.len, + LM_DBG("connecting to redis cluster at %.*s\n", con->id->url.len, con->id->url.s); host_begin = strstr(con->id->url.s, "redis://"); if(host_begin) { @@ -164,7 +164,8 @@ int db_redis_connect(km_redis_con_t *con) if(db_redis_opt_tls != 0) { /* Create SSL context*/ redisInitOpenSSL(); - ssl = redisCreateSSLContext(NULL, db_redis_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; @@ -197,7 +198,7 @@ int db_redis_connect(km_redis_con_t *con) #endif status = redisClusterConnect2(con->con); if(status != REDIS_OK) { - LM_ERR("cannot open connection to cluster with hosts: %s, error: %s\n", + LM_ERR("cannot open connection to cluster with hosts: %s, error: %s\n", hosts, con->con->errstr); goto err; } @@ -208,7 +209,8 @@ int db_redis_connect(km_redis_con_t *con) if(db_redis_opt_tls != 0) { /* Create SSL context*/ redisInitOpenSSL(); - ssl = redisCreateSSLContext(NULL, db_redis_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; @@ -218,7 +220,7 @@ int db_redis_connect(km_redis_con_t *con) con->con = redisConnectWithTimeout(con->id->host, con->id->port, tv); if(!con->con) { - LM_ERR("cannot open connection: %.*s\n", con->id->url.len, + LM_ERR("cannot open connection: %.*s\n", con->id->url.len, con->id->url.s); goto err; }

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev