sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
263 discussions

git:master:083de68b: htable: added rpc command to set expire for an intem
by Daniel-Constantin Mierla 21 Jan '22

21 Jan '22

Module: kamailio Branch: master Commit: 083de68b8e930b3be151a56f7452e14ea5bcc752 URL: https://github.com/kamailio/kamailio/commit/083de68b8e930b3be151a56f7452e14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-21T08:46:03+01:00 htable: added rpc command to set expire for an intem --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/083de68b8e930b3be151a56f7452e14… Patch: https://github.com/kamailio/kamailio/commit/083de68b8e930b3be151a56f7452e14… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index ed28190880..5599ffe0e6 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1413,6 +1413,10 @@ static const char* htable_seti_doc[2] = { "Set one key in a hash table to an integer value.", 0 }; +static const char* htable_setex_doc[2] = { + "Set expire in a hash table for the item referenced by key.", + 0 +}; static const char* htable_list_doc[2] = { "List all htables.", 0 @@ -1611,6 +1615,35 @@ static void htable_rpc_seti(rpc_t* rpc, void* c) { return; } +/*! \brief RPC htable.setex command to set expire for one item */ +static void htable_rpc_setex(rpc_t* rpc, void* c) { + str htname, itname; + int exval; + ht_t *ht; + + if (rpc->scan(c, "SS.d", &htname, &itname, &exval) < 3) { + rpc->fault(c, 500, + "Not enough parameters (htable name, item name and expire)"); + return; + } + + /* check if htable exists */ + ht = ht_get_table(&htname); + if (!ht) { + rpc->fault(c, 500, "No such htable"); + return; + } + + + if(ki_ht_setex(NULL, &htname, &itname, exval)<0) { + rpc->fault(c, 500, "Failed to set the item"); + return; + } + + rpc->rpl_printf(c, "Ok"); + return; +} + /*! \brief RPC htable.dump command to print content of a hash table */ static void htable_rpc_dump(rpc_t* rpc, void* c) { @@ -1973,6 +2006,7 @@ rpc_export_t htable_rpc[] = { {"htable.get", htable_rpc_get, htable_get_doc, 0}, {"htable.sets", htable_rpc_sets, htable_sets_doc, 0}, {"htable.seti", htable_rpc_seti, htable_seti_doc, 0}, + {"htable.setex", htable_rpc_setex, htable_setex_doc, 0}, {"htable.listTables", htable_rpc_list, htable_list_doc, RET_ARRAY}, {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, {"htable.store", htable_rpc_store, htable_store_doc, 0},

1 0

git:master:c23104bd: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: c23104bd16c8b1df983e434dc6017a69bf586604 URL: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-20T16:31:20+01:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6… Patch: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index ba2f50461e..5fe4071d56 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -1295,7 +1295,7 @@ event_route[uac:reply] { * contact_addr - contact address to be used for this record instead of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It - can be set to '.' (dot) to skip setting it and then + can be set to '' (empty string) to skip setting it and then reg_contact_addr modparam is used. * socket - Used socket for sending out registration requests, e.g.:,

1 0

git:master:8014638f: uac: fix wrong documentation regarding contact_addr database, empty string means skip, not dot
by Henning Westerholt 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 8014638fb8a3653868684d00df7dfb8e3f13eb33 URL: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-01-20T15:16:39Z uac: fix wrong documentation regarding contact_addr database, empty string means skip, not dot --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8… Patch: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index b6184a6daa..188d1b913e 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1619,7 +1619,7 @@ event_route[uac:reply] { <listitem><para> <emphasis>contact_addr</emphasis> - contact address to be used for this record instead of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It can - be set to '.' (dot) to skip setting it and then reg_contact_addr modparam is used. + be set to '' (empty string) to skip setting it and then reg_contact_addr modparam is used. </para></listitem> </itemizedlist> <itemizedlist>

1 0

git:master:584eabf7: Makefile.defs: set localbase for macports on macos
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 584eabf7de6af9f835678f9c6d6851cce49a3878 URL: https://github.com/kamailio/kamailio/commit/584eabf7de6af9f835678f9c6d6851c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T13:02:44+01:00 Makefile.defs: set localbase for macports on macos --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/584eabf7de6af9f835678f9c6d6851c… Patch: https://github.com/kamailio/kamailio/commit/584eabf7de6af9f835678f9c6d6851c… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 84f9438bc4..d2d7c60814 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -524,7 +524,12 @@ ifeq ($(OS), darwin) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ + MACPORTS = $(shell which port 2>/dev/null) +ifeq ($(MACPORTS),) LOCALBASE ?= /usr/local +else + LOCALBASE ?= /opt/local +endif endif LOCALBASE ?= /usr/local

1 0

git:master:2e4258f4: websocket: makefile - set library path for localbase
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 2e4258f440a07a2cfd20082af22bba4f9a2448ab URL: https://github.com/kamailio/kamailio/commit/2e4258f440a07a2cfd20082af22bba4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T13:02:44+01:00 websocket: makefile - set library path for localbase --- Modified: src/modules/websocket/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2e4258f440a07a2cfd20082af22bba4… Patch: https://github.com/kamailio/kamailio/commit/2e4258f440a07a2cfd20082af22bba4… --- diff --git a/src/modules/websocket/Makefile b/src/modules/websocket/Makefile index 764453b080..99b1fe1f8c 100644 --- a/src/modules/websocket/Makefile +++ b/src/modules/websocket/Makefile @@ -40,7 +40,7 @@ LIBS+= $(TLS_EXTRA_LIBS) ifeq ($(EMBEDDED_UTF8_DECODE),0) DEFS += -I$(LOCALBASE)/include - LIBS += -lunistring + LIBS += -L$(LOCALBASE)/lib -lunistring else DEFS += -DEMBEDDED_UTF8_DECODE endif

1 0

git:master:ca3b5f3c: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: ca3b5f3ca581c4327d6b02342773fed47ea82ee2 URL: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-20T12:31:24+01:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed… Patch: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index ef76592a83..ab56c61379 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -178,6 +178,11 @@ allid,time_hires&cid:callid running Kamailio with this module loaded: * hiredis - available at https://github.com/redis/hiredis + The following library is an optional dependency to support redis + cluster protocol: + * hiredis-cluster - available at + https://github.com/Nordix/hiredis-cluster + 4. Parameters 4.1. schema_path (string) @@ -227,6 +232,10 @@ modparam("db_redis", "verbosity", 0) 'redis://[username]@host:port/database'. Username is optional. The database portion must be a valid Redis database number. + For cluster support you need to set the "db_url" modparam with a comma + separated list of cluster hosts: 'redis://host1:port1,host2:port2/'. + The database portion is not supported in cluster mode. + Example 1.4. Usage ... loadmodule "db_redis.so"

1 0

[kamailio/kamailio] Db redis cluster support (PR #2995)
by Riccardo-78 20 Jan '22

20 Jan '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [x] Related to issue #2977 #### Description Add support for redis cluster protocol via hiredis-cluster library to db_redis module You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2995 -- Commit Summary -- * db_redis: added hiredis-cluster detection * db_redis: use cluster api * db_redis: update documentation -- File Changes -- M src/modules/db_redis/Makefile (14) M src/modules/db_redis/doc/db_redis_admin.xml (15) M src/modules/db_redis/redis_connection.c (115) M src/modules/db_redis/redis_connection.h (34) M src/modules/db_redis/redis_dbase.c (135) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2995.patch https://github.com/kamailio/kamailio/pull/2995.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2995 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2995(a)github.com>

3 5

git:master:610603da: db_redis: update documentation
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 610603da5fb45eeffba2f7d623f50b358e65d6ed URL: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:30:22+01:00 db_redis: update documentation --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3… Patch: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 6439c79b6f..b3b54c08a2 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -146,6 +146,17 @@ location=entry:ruid&usrdom:username,domain&timer:partition,keepalive;acc </listitem> </itemizedlist> </para> + <para> + The following library is an optional dependency to support redis cluster protocol: + <itemizedlist> + <listitem> + <para> + <emphasis>hiredis-cluster</emphasis> - available at + <ulink url="https://github.com/Nordix/hiredis-cluster">https://github.com/Nordix/hiredis-cluster</ulink> + </para> + </listitem> + </itemizedlist> + </para> </section> </section> @@ -216,6 +227,10 @@ modparam("db_redis", "verbosity", 0) 'redis://[username]@host:port/database'. Username is optional. The database portion must be a valid Redis database number. </para> + <para> + For cluster support you need to set the "db_url" modparam with a comma separated list of cluster hosts: + 'redis://host1:port1,host2:port2/'. The database portion is not supported in cluster mode. + </para> <example> <title>Usage</title> <programlisting format="linespecific">

1 0

git:master:8eec0115: db_redis: use cluster api
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 8eec0115a2689ce1d4bff2b5bab909f2401965f4 URL: https://github.com/kamailio/kamailio/commit/8eec0115a2689ce1d4bff2b5bab909f… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:30:22+01:00 db_redis: use cluster api --- Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_connection.h Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/8eec0115a2689ce1d4bff2b5bab909f… Patch: https://github.com/kamailio/kamailio/commit/8eec0115a2689ce1d4bff2b5bab909f…

1 0

git:master:f15c768c: db_redis: added hiredis-cluster detection
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: f15c768ce89ef78eb87e476d4c6dff0b29585df2 URL: https://github.com/kamailio/kamailio/commit/f15c768ce89ef78eb87e476d4c6dff0… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:30:22+01:00 db_redis: added hiredis-cluster detection --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f15c768ce89ef78eb87e476d4c6dff0… Patch: https://github.com/kamailio/kamailio/commit/f15c768ce89ef78eb87e476d4c6dff0… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index ca8020d543..179bc6f406 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -10,6 +10,12 @@ HIREDIS_BUILDER = $(shell \ if pkg-config --exists hiredis; then \ echo 'pkg-config hiredis'; \ fi) + +HIREDIS_CLUSTER_BUILDER = $(shell \ + if pkg-config --exists hiredis_cluster; then \ + echo 'pkg-config hiredis_cluster'; \ + fi) + endif ifeq ($(HIREDIS_BUILDER),) @@ -33,6 +39,14 @@ endif DEFS+=$(HIREDISDEFS) LIBS=$(HIREDISLIBS) +ifneq ($(HIREDIS_CLUSTER_BUILDER),) + HIREDISCLUSTERDEFS = $(shell $(HIREDIS_CLUSTER_BUILDER) --cflags) + HIREDISCLUSTERLIBS = $(shell $(HIREDIS_CLUSTER_BUILDER) --libs) + DEFS+=-DWITH_HIREDIS_CLUSTER + DEFS+=$(HIREDISCLUSTERDEFS) + LIBS+=$(HIREDISCLUSTERLIBS) +endif + SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022