sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

git:master:6794815c: db_redis: fixed compile warning on testing array address

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6794815cf9b1f4dae0a4a7791d16e56fe7dcceb6 URL: https://github.com/kamailio/kamailio/commit/6794815cf9b1f4dae0a4a7791d16e56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T20:05:26+02:00 db_redis: fixed compile warning on testing array address --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/6794815cf9b1f4dae0a4a7791d16e56… Patch: https://github.com/kamailio/kamailio/commit/6794815cf9b1f4dae0a4a7791d16e56… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 62c63f0530..69bb099800 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -405,9 +405,9 @@ void db_redis_consume_replies(km_redis_con_t *con) { } const char *db_redis_get_error(km_redis_con_t *con) { - if (con && con->con && con->con->errstr) { + if (con && con->con && con->con->errstr[0]) { return con->con->errstr; } else { return "<broken redis connection>"; } -} \ No newline at end of file +}

6 years, 2 months

git:master:510cfca6: db_redis: updated include paths for pkg-config usage

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 510cfca61d2df1dcc2baa492c9f1f2f3b129ceb7 URL: https://github.com/kamailio/kamailio/commit/510cfca61d2df1dcc2baa492c9f1f2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T19:59:23+02:00 db_redis: updated include paths for pkg-config usage --- Modified: src/modules/db_redis/Makefile Modified: src/modules/db_redis/redis_connection.h --- Diff: https://github.com/kamailio/kamailio/commit/510cfca61d2df1dcc2baa492c9f1f2f… Patch: https://github.com/kamailio/kamailio/commit/510cfca61d2df1dcc2baa492c9f1f2f… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index c4aa0d0731..8e7ad1f74b 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -13,7 +13,7 @@ HIREDIS_BUILDER = $(shell \ endif ifeq ($(HIREDIS_BUILDER),) - HIREDISDEFS=-I$(LOCALBASE)/include + HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) diff --git a/src/modules/db_redis/redis_connection.h b/src/modules/db_redis/redis_connection.h index 8261e2bf96..11cadf5500 100644 --- a/src/modules/db_redis/redis_connection.h +++ b/src/modules/db_redis/redis_connection.h @@ -23,7 +23,7 @@ #ifndef _REDIS_CONNECTION_H_ #define _REDIS_CONNECTION_H_ -#include <hiredis/hiredis.h> +#include <hiredis.h> #include "db_redis_mod.h" @@ -79,4 +79,4 @@ void db_redis_consume_replies(km_redis_con_t *con); void db_redis_free_reply(redisReply **reply); const char *db_redis_get_error(km_redis_con_t *con); -#endif /* _REDIS_CONNECTION_H_ */ \ No newline at end of file +#endif /* _REDIS_CONNECTION_H_ */

6 years, 2 months

git:master:3f0ca2f8: ndb_redis: updated include paths for pkg-config usage

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3f0ca2f88afbd0819df2e4fecf603b72f757b3f4 URL: https://github.com/kamailio/kamailio/commit/3f0ca2f88afbd0819df2e4fecf603b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T19:55:34+02:00 ndb_redis: updated include paths for pkg-config usage --- Modified: src/modules/ndb_redis/Makefile Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/3f0ca2f88afbd0819df2e4fecf603b7… Patch: https://github.com/kamailio/kamailio/commit/3f0ca2f88afbd0819df2e4fecf603b7… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index 939a5cc680..e426088489 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -13,7 +13,7 @@ HIREDIS_BUILDER = $(shell \ endif ifeq ($(HIREDIS_BUILDER),) - HIREDISDEFS=-I$(LOCALBASE)/include + HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index c1d907042f..c9e3d80424 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -28,7 +28,7 @@ #ifndef _REDIS_CLIENT_H_ #define _REDIS_CLIENT_H_ -#include <hiredis/hiredis.h> +#include <hiredis.h> #include "../../core/str.h" #include "../../core/parser/parse_param.h"

6 years, 2 months

git:master:bfcb600e: ndb_redis: replaced printf with dbg, formatted sentinel code and long lines

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bfcb600ed7bc94898f86d4ce1225c36a972b5916 URL: https://github.com/kamailio/kamailio/commit/bfcb600ed7bc94898f86d4ce1225c36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T19:49:38+02:00 ndb_redis: replaced printf with dbg, formatted sentinel code and long lines --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/bfcb600ed7bc94898f86d4ce1225c36… Patch: https://github.com/kamailio/kamailio/commit/bfcb600ed7bc94898f86d4ce1225c36…

6 years, 2 months

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

by Kamailio Dev

Module: kamailio Branch: master Commit: c11f9d5284dbc2eaefeb6569d3af0caabb28d4d1 URL: https://github.com/kamailio/kamailio/commit/c11f9d5284dbc2eaefeb6569d3af0ca… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-24T16:01:32+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/c11f9d5284dbc2eaefeb6569d3af0ca… Patch: https://github.com/kamailio/kamailio/commit/c11f9d5284dbc2eaefeb6569d3af0ca…

6 years, 2 months

git:master:5c71f593: db_redis: fixed typos from previous commit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5c71f59324cd0ced6f73577acd56e234337dfd30 URL: https://github.com/kamailio/kamailio/commit/5c71f59324cd0ced6f73577acd56e23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T15:56:10+02:00 db_redis: fixed typos from previous commit --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5c71f59324cd0ced6f73577acd56e23… Patch: https://github.com/kamailio/kamailio/commit/5c71f59324cd0ced6f73577acd56e23… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 12d054712a..50271ac735 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -220,7 +220,7 @@ HMSET address:entry::4 id 4 grp 2 ip_addr "127.0.0.4" mask 32 port 0 tag "test" </example> <para> Note that is some cases, the optional values in database tables can be - ommitted. For 'address' table, the 'tag' value may be ommitted. To avoid + omitted. For 'address' table, the 'tag' value may be omitted. To avoid any issues, set unused fields to their default values as defined by database schema. When definition allows 'NULL', that field can be unset. </para>

6 years, 2 months

git:master:76b1f3bf: rtpengine: add block_media and unblock_media function calls

by Richard Fuchs

Module: kamailio Branch: master Commit: 76b1f3bfae32490547c5b1500ab7356bcf463e9e URL: https://github.com/kamailio/kamailio/commit/76b1f3bfae32490547c5b1500ab7356… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-09-24T09:47:25-04:00 rtpengine: add block_media and unblock_media function calls --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/76b1f3bfae32490547c5b1500ab7356… Patch: https://github.com/kamailio/kamailio/commit/76b1f3bfae32490547c5b1500ab7356…

6 years, 2 months

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

by Kamailio Dev

Module: kamailio Branch: master Commit: cc2714a8df27c4e4a5e179bc0443600ec673ff63 URL: https://github.com/kamailio/kamailio/commit/cc2714a8df27c4e4a5e179bc0443600… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-24T15:46:28+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/cc2714a8df27c4e4a5e179bc0443600… Patch: https://github.com/kamailio/kamailio/commit/cc2714a8df27c4e4a5e179bc0443600… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index 8378057da5..4f6d8150be 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -45,6 +45,7 @@ Alex Balashov 1.1. Setting schema_path module parameter 1.2. Setting keys module parameter 1.3. Usage + 1.4. Usage Chapter 1. Admin Guide @@ -121,6 +122,15 @@ nce/string,server_id/int,connection_id/int,keepalive/int,partition/int module also write mappings besides the actual records for billing systems to correlate start and stop records faster). + The key is always prefixed with 'tablename:entry::'. For example the + record in 'subscriber' table for user 'alice(a)sip.com' has the key: + 'subscriber:entry::alice:sip.com'. If all the records are just loaded + at startup (or all reloaded at runtime), the key can just be made + unique using whatever values added after 'tablename:entry::' prefix. + For example, keys for 'address' table records can be: + 'address:entry::1', address:entry::2', address:entry::3', ... No 'keys' + modparam of 'db_redis' for 'address' table needs to be defined. + The mappings can be freely defined in the "keys" module parameter, which is composed of a semi-colon separated list of definitions in the format @@ -182,7 +192,7 @@ m:username,domain&timer:partition,keepalive") 6. Usage Load the module and set the "db_url" modparam for specific modules to: - redis://[username]@host:port/database. Username is optional. The + 'redis://[username]@host:port/database'. Username is optional. The database portion must be a valid Redis database number. Example 1.3. Usage @@ -192,16 +202,39 @@ loadmodule "db_redis.so" #!define DBURL_USRLOC "redis://127.0.0.1:6379/5" #!define DBURL_ACC "redis://127.0.0.1:6379/6" #!define DBURL_AUTH "redis://127.0.0.1:6379/7" +#!define DBURL_PERM "redis://127.0.0.1:6379/8" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:p artition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain") +... modparam("usrloc", "db_url", DBURL_USRLOC) +... modparam("acc_db", "db_url", DBURL_ACC) +... modparam("auth_db", "db_url", DBURL_AUTH) ... +modparam("permissions", "db_url", DBURL_PERM) +... + + Samples adding records for address table using 'redis-cli': + + Example 1.4. Usage +... +SELECT 8 +HMSET address:entry::1 id 1 grp 1 ip_addr "127.0.0.1" mask 32 port 0 +HMSET address:entry::2 id 2 grp 1 ip_addr "127.0.0.2" mask 32 port 0 +HMSET address:entry::3 id 3 grp 2 ip_addr "127.0.0.3" mask 32 port 0 +HMSET address:entry::4 id 4 grp 2 ip_addr "127.0.0.4" mask 32 port 0 tag "test" +... + + Note that is some cases, the optional values in database tables can be + ommitted. For 'address' table, the 'tag' value may be ommitted. To + avoid any issues, set unused fields to their default values as defined + by database schema. When definition allows 'NULL', that field can be + unset. 7. Module specific considerations

6 years, 2 months

git:master:d4cd7711: db_redis: docs about keys format and sample records

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d4cd77119b55478a6bd35b76a9e7c196c0a71698 URL: https://github.com/kamailio/kamailio/commit/d4cd77119b55478a6bd35b76a9e7c19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T15:39:27+02:00 db_redis: docs about keys format and sample records --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d4cd77119b55478a6bd35b76a9e7c19… Patch: https://github.com/kamailio/kamailio/commit/d4cd77119b55478a6bd35b76a9e7c19… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index f57fa8064e..12d054712a 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -67,6 +67,15 @@ username/string,domain/string,contact/string,received/string,path/string,expires also write mappings besides the actual records for billing systems to correlate start and stop records faster). </para> + <para> + The key is always prefixed with 'tablename:entry::'. For example the record in + 'subscriber' table for user 'alice(a)sip.com' has the key: + 'subscriber:entry::alice:sip.com'. If all the records are just loaded at + startup (or all reloaded at runtime), the key can just be made unique using whatever + values added after 'tablename:entry::' prefix. For example, keys for 'address' table + records can be: 'address:entry::1', address:entry::2', address:entry::3', ... No + 'keys' modparam of 'db_redis' for 'address' table needs to be defined. + </para> <para> The mappings can be freely defined in the "keys" module parameter, which is composed of a semi-colon separated list of definitions in the format @@ -165,7 +174,7 @@ modparam("db_redis", "keys", "version=entry:table_name;location=entry:ruid&u <title>Usage</title> <para> Load the module and set the "db_url" modparam for specific modules to: - redis://[username]@host:port/database. Username is optional. + 'redis://[username]@host:port/database'. Username is optional. The database portion must be a valid Redis database number. </para> <example> @@ -177,17 +186,44 @@ loadmodule "db_redis.so" #!define DBURL_USRLOC "redis://127.0.0.1:6379/5" #!define DBURL_ACC "redis://127.0.0.1:6379/6" #!define DBURL_AUTH "redis://127.0.0.1:6379/7" +#!define DBURL_PERM "redis://127.0.0.1:6379/8" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:partition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain") +... modparam("usrloc", "db_url", DBURL_USRLOC) +... modparam("acc_db", "db_url", DBURL_ACC) +... modparam("auth_db", "db_url", DBURL_AUTH) +... +modparam("permissions", "db_url", DBURL_PERM) ... </programlisting> </example> + <para> + Samples adding records for address table using 'redis-cli': + </para> + <example> + <title>Usage</title> + <programlisting format="linespecific"> +... +SELECT 8 +HMSET address:entry::1 id 1 grp 1 ip_addr "127.0.0.1" mask 32 port 0 +HMSET address:entry::2 id 2 grp 1 ip_addr "127.0.0.2" mask 32 port 0 +HMSET address:entry::3 id 3 grp 2 ip_addr "127.0.0.3" mask 32 port 0 +HMSET address:entry::4 id 4 grp 2 ip_addr "127.0.0.4" mask 32 port 0 tag "test" +... + </programlisting> + </example> + <para> + Note that is some cases, the optional values in database tables can be + ommitted. For 'address' table, the 'tag' value may be ommitted. To avoid + any issues, set unused fields to their default values as defined by database + schema. When definition allows 'NULL', that field can be unset. + </para> </section> <section>

6 years, 2 months

git:master:1d24e36d: tm: warn message on unexpected fcount value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1d24e36d95b97e41bc76949bdd8ba2a24babdffe URL: https://github.com/kamailio/kamailio/commit/1d24e36d95b97e41bc76949bdd8ba2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T15:01:57+02:00 tm: warn message on unexpected fcount value --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/1d24e36d95b97e41bc76949bdd8ba2a… Patch: https://github.com/kamailio/kamailio/commit/1d24e36d95b97e41bc76949bdd8ba2a… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 998bdfad8e..1ec5747207 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -146,6 +146,9 @@ void free_cell_helper( release_cell_lock(dead_cell); /* does nothing */ dead_cell->fcount++; + if(dead_cell->fcount!=1) { + LM_WARN("unexpected fcount value: %d\n", dead_cell->fcount); + } if(unlikely(has_tran_tmcbs(dead_cell, TMCB_DESTROY))) run_trans_callbacks(TMCB_DESTROY, dead_cell, 0, 0, 0);

6 years, 2 months

← Newer
1
...
14
15
16
17
18
19
20
...
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