sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

git:master:133917db: modules: readme files regenerated - db_redis ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 133917db7a033218e54931b6cf532552d274af6c URL: https://github.com/kamailio/kamailio/commit/133917db7a033218e54931b6cf53255… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-26T20:16:30+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/133917db7a033218e54931b6cf53255… Patch: https://github.com/kamailio/kamailio/commit/133917db7a033218e54931b6cf53255…

6 years, 2 months

git:master:ee956751: db_redis: use SHARE_DIR define for default value of schema path param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ee95675177466a7ae5f9575db300df32e42661f2 URL: https://github.com/kamailio/kamailio/commit/ee95675177466a7ae5f9575db300df3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T20:07:20+02:00 db_redis: use SHARE_DIR define for default value of schema path param - point to the folder where the schema files are deployed by make install --- Modified: src/modules/db_redis/db_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ee95675177466a7ae5f9575db300df3… Patch: https://github.com/kamailio/kamailio/commit/ee95675177466a7ae5f9575db300df3… --- diff --git a/src/modules/db_redis/db_redis_mod.c b/src/modules/db_redis/db_redis_mod.c index 60547eeee1..a360327c28 100644 --- a/src/modules/db_redis/db_redis_mod.c +++ b/src/modules/db_redis/db_redis_mod.c @@ -32,7 +32,7 @@ MODULE_VERSION str redis_keys = str_init(""); -str redis_schema_path = str_init("/usr/share/kamailio/db_redis/kamailio"); +str redis_schema_path = str_init(SHARE_DIR "db_redis/kamailio"); int db_redis_verbosity = 1; static int db_redis_bind_api(db_func_t *dbb);

6 years, 2 months

git:master:41c4391f: Makefile.defs: propagate share dir target via -DSHARE_DIR compile switch

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 41c4391f5d98b1f5128774b81b4923e66cb9cc0d URL: https://github.com/kamailio/kamailio/commit/41c4391f5d98b1f5128774b81b4923e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T20:07:20+02:00 Makefile.defs: propagate share dir target via -DSHARE_DIR compile switch --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/41c4391f5d98b1f5128774b81b4923e… Patch: https://github.com/kamailio/kamailio/commit/41c4391f5d98b1f5128774b81b4923e… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c29ae8bf9d..dd12e6e60b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -495,6 +495,7 @@ bin_target = $(prefix)/$(bin_dir) #modules_target = $(prefix)/$(modules_dir) lib_target = $(prefix)/$(lib_dir) run_target = $(run_prefix)/$(run_dir) +share_target = $(share_prefix)/$(share_dir) doc_target = $(prefix)/$(doc_dir) data_target = $(prefix)/$(data_dir) @@ -655,6 +656,7 @@ C_DEFS= $(extra_defs) \ -D__CPU_$(ARCH) $(os_defs) \ -DVERSIONVAL=$(VERSIONVAL) \ -DCFG_DIR='"$(cfg_target)"'\ + -DSHARE_DIR='"$(share_target)"'\ -DRUN_DIR='"$(run_target)"' ifneq ($(MEMPKG), sys)

6 years, 2 months

git:master:c583fa74: db_redis: docs for verbosity param, default values for other params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c583fa740083b4b246c39bcf8e55622d1d66cb2c URL: https://github.com/kamailio/kamailio/commit/c583fa740083b4b246c39bcf8e55622… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T20:07:20+02:00 db_redis: docs for verbosity param, default values for other params - bits of formatting --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c583fa740083b4b246c39bcf8e55622… Patch: https://github.com/kamailio/kamailio/commit/c583fa740083b4b246c39bcf8e55622…

6 years, 2 months

git:master:2bf7b941: db_redis: control printing all db tables via parameter verbosity

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2bf7b94146971ad3cbefe167c52036a18c8566c0 URL: https://github.com/kamailio/kamailio/commit/2bf7b94146971ad3cbefe167c52036a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T20:07:20+02:00 db_redis: control printing all db tables via parameter verbosity - the list can be long and the output can make waching logs harder for rpc commands that connect/disconnect each time --- Modified: src/modules/db_redis/db_redis_mod.c Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/2bf7b94146971ad3cbefe167c52036a… Patch: https://github.com/kamailio/kamailio/commit/2bf7b94146971ad3cbefe167c52036a… --- diff --git a/src/modules/db_redis/db_redis_mod.c b/src/modules/db_redis/db_redis_mod.c index 2b3b07fead..60547eeee1 100644 --- a/src/modules/db_redis/db_redis_mod.c +++ b/src/modules/db_redis/db_redis_mod.c @@ -33,6 +33,7 @@ MODULE_VERSION str redis_keys = str_init(""); str redis_schema_path = str_init("/usr/share/kamailio/db_redis/kamailio"); +int db_redis_verbosity = 1; static int db_redis_bind_api(db_func_t *dbb); static int mod_init(void); @@ -51,6 +52,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"keys", PARAM_STRING|USE_FUNC_PARAM, (void*)keys_param}, {"schema_path", PARAM_STR, &redis_schema_path }, + {"verbosity", PARAM_INT, &db_redis_verbosity }, {0, 0, 0} }; diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 69bb099800..2720c2753d 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -24,6 +24,8 @@ #include "redis_connection.h" #include "redis_table.h" +extern int db_redis_verbosity; + static void print_query(redis_key_t *query) { redis_key_t *k; @@ -217,7 +219,7 @@ km_redis_con_t* db_redis_new_connection(const struct db_id* id) { goto err; } - db_redis_print_all_tables(ptr); + if(db_redis_verbosity > 0) db_redis_print_all_tables(ptr); ptr->ref = 1; ptr->append_counter = 0;

6 years, 2 months

git:master:616689bf: db_redis: detect if pkg config for hiredis gives lib name in path

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 616689bf8b76d64e4b0eadd5a108fbcfa7e726a7 URL: https://github.com/kamailio/kamailio/commit/616689bf8b76d64e4b0eadd5a108fbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T14:51:58+02:00 db_redis: detect if pkg config for hiredis gives lib name in path - try to cope with inconsistency of output for pkg-config --cflags in older and newer debian/ubuntu distros --- Modified: src/modules/db_redis/Makefile Modified: src/modules/db_redis/redis_connection.h --- Diff: https://github.com/kamailio/kamailio/commit/616689bf8b76d64e4b0eadd5a108fbc… Patch: https://github.com/kamailio/kamailio/commit/616689bf8b76d64e4b0eadd5a108fbc… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index bf3b66e8fb..90770df35c 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -16,9 +16,13 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) -I/usr/include/hiredis + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) +ifeq (,$(findstring hiredis,$(HIREDISDEFS))) + DEFS+=-DWITH_HIREDIS_PATH +endif + ifeq ($(HIREDISLIBS),-L -lhiredis) HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include HIREDISLIBS = -L/opt/local/lib -lhiredis diff --git a/src/modules/db_redis/redis_connection.h b/src/modules/db_redis/redis_connection.h index 11cadf5500..7b6a836b5e 100644 --- a/src/modules/db_redis/redis_connection.h +++ b/src/modules/db_redis/redis_connection.h @@ -23,7 +23,11 @@ #ifndef _REDIS_CONNECTION_H_ #define _REDIS_CONNECTION_H_ +#ifdef WITH_HIREDIS_PATH +#include <hiredis/hiredis.h> +#else #include <hiredis.h> +#endif #include "db_redis_mod.h"

6 years, 2 months

git:master:08d001bb: ndb_redis: detect if pkg config for hiredis gives lib name in path

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 08d001bb8e0ac336dc84e0541a9cf0104f6d9ee3 URL: https://github.com/kamailio/kamailio/commit/08d001bb8e0ac336dc84e0541a9cf01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T14:41:14+02:00 ndb_redis: detect if pkg config for hiredis gives lib name in path - try to cope with inconsistency of output for pkg-config --cflags in older and newer debian/ubuntu distros --- Modified: src/modules/ndb_redis/Makefile Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/08d001bb8e0ac336dc84e0541a9cf01… Patch: https://github.com/kamailio/kamailio/commit/08d001bb8e0ac336dc84e0541a9cf01… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index 58a476ecd5..f6c78dee7e 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -16,9 +16,13 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) -I/usr/include/hiredis + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) +ifeq (,$(findstring hiredis,$(HIREDISDEFS))) + DEFS+=-DWITH_HIREDIS_PATH +endif + ifeq ($(HIREDISLIBS),-L -lhiredis) HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include HIREDISLIBS = -L/opt/local/lib -lhiredis diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index c9e3d80424..0249b1eef4 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -28,7 +28,11 @@ #ifndef _REDIS_CLIENT_H_ #define _REDIS_CLIENT_H_ +#ifdef WITH_HIREDIS_PATH +#include <hiredis/hiredis.h> +#else #include <hiredis.h> +#endif #include "../../core/str.h" #include "../../core/parser/parse_param.h"

6 years, 2 months

git:master:dc6057be: modules: readme files regenerated - http_client ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: dc6057be7baafa5b4d1d385a0af4031fe3a05e73 URL: https://github.com/kamailio/kamailio/commit/dc6057be7baafa5b4d1d385a0af4031… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-26T13:31:57+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/dc6057be7baafa5b4d1d385a0af4031… Patch: https://github.com/kamailio/kamailio/commit/dc6057be7baafa5b4d1d385a0af4031… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 182eb32a3f..de8b9ddd12 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -452,7 +452,7 @@ modparam("http_client", "tlsversion", 6) Example 1.14. Set authmethod parameter ... # Use the best of BASIC and Digest authentication. -modparam("http_client", "authmetod", 3) +modparam("http_client", "authmethod", 3) ... 3.15. keep_connections (int)

6 years, 2 months

[kamailio/kamailio] Fix Typeo: authmetod -> authmethod (#1651)

by Barry Flanagan

Exported parameter for authmethod was mis-spelled as authmetod.   #### 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 - [ X] 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:  - [ X] PR should be backported to stable branches - [ X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Exported parameter for authmethod was mis-spelled as authmetod. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1651 -- Commit Summary -- * Fix Typeo: authmetod -> authmethod -- File Changes -- M src/modules/http_client/doc/http_client_admin.xml (2) M src/modules/http_client/http_client.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1651.patch https://github.com/kamailio/kamailio/pull/1651.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1651

6 years, 2 months

git:master:9c6ec4a8: Fix Typeo: authmetod -> authmethod

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9c6ec4a85b23d4e2795800b632ac9855f2028fec URL: https://github.com/kamailio/kamailio/commit/9c6ec4a85b23d4e2795800b632ac985… Author: Barry flanagan <barry(a)flanagan.ie> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T13:25:23+02:00 Fix Typeo: authmetod -> authmethod Exported parameter for authmethod was mis-spelled as authmetod. --- Modified: src/modules/http_client/doc/http_client_admin.xml Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/9c6ec4a85b23d4e2795800b632ac985… Patch: https://github.com/kamailio/kamailio/commit/9c6ec4a85b23d4e2795800b632ac985… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index cafa86574b..6e772aa9f5 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -404,7 +404,7 @@ modparam("http_client", "tlsversion", 6) <programlisting format="linespecific"> ... # Use the best of BASIC and Digest authentication. -modparam("http_client", "authmetod", 3) +modparam("http_client", "authmethod", 3) ... </programlisting> </example> diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 9b8abc984d..e243953367 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -186,7 +186,7 @@ static param_export_t params[] = { {"maxdatasize", PARAM_INT, &default_maxdatasize }, {"config_file", PARAM_STR, &http_client_config_file }, {"httpcon", PARAM_STRING|USE_FUNC_PARAM, (void*)curl_con_param}, - {"authmetod", PARAM_INT, &default_authmethod }, + {"authmethod", PARAM_INT, &default_authmethod }, {"keep_connections", PARAM_INT, &default_keep_connections }, {0, 0, 0} };

6 years, 2 months

← Newer
1
...
12
13
14
15
16
17
18
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018