sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:master:86990ab5: db_redis: add examples about usage with dialog module

by Federico Cabiddu

Module: kamailio Branch: master Commit: 86990ab53c4b5e5ede49b95e17b02f96ae00a01c URL: https://github.com/kamailio/kamailio/commit/86990ab53c4b5e5ede49b95e17b02f9… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-09-08T09:56:43+02:00 db_redis: add examples about usage with dialog module --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/86990ab53c4b5e5ede49b95e17b02f9… Patch: https://github.com/kamailio/kamailio/commit/86990ab53c4b5e5ede49b95e17b02f9… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 0c8ba2ed04..6439c79b6f 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -226,12 +226,15 @@ loadmodule "db_redis.so" #!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" +#!define DBURL_DLG "redis://127.0.0.1:6379/9" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") modparam("db_redis", "keys", "version=entry:table_name") 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("db_redis", "keys", "dialog=entry:hash_entry,hash_id&cid:callid") +modparam("db_redis", "keys", "dialog_vars=entry:hash_entry,hash_id,dialog_key&dialog:hash_entry,hash_id") ... modparam("usrloc", "db_url", DBURL_USRLOC) ... @@ -240,6 +243,8 @@ modparam("acc_db", "db_url", DBURL_ACC) modparam("auth_db", "db_url", DBURL_AUTH) ... modparam("permissions", "db_url", DBURL_PERM) +... +modparam("dialog", "db_url", DBURL_DLG) ... </programlisting> </example>

5 years, 5 months

git:5.2:761758b1: dialog: check xdata length when loading profile from db

by Federico Cabiddu

Module: kamailio Branch: 5.2 Commit: 761758b1d8a7ebdb72caf8d5442a38988cf2e951 URL: https://github.com/kamailio/kamailio/commit/761758b1d8a7ebdb72caf8d5442a389… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-09-08T10:20:56+02:00 dialog: check xdata length when loading profile from db (cherry picked from commit d05dfc20632fde1d65017ff5d7f41713a9c79825) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/761758b1d8a7ebdb72caf8d5442a389… Patch: https://github.com/kamailio/kamailio/commit/761758b1d8a7ebdb72caf8d5442a389… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 1b9d704cf6..b15cc86485 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -452,7 +452,7 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dlg_set_toroute(dlg, &toroute_name); GET_STR_VALUE(xdata, values, 21, 0, 0); - if(xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) + if(xdata.len > 0 && xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) { srjson_InitDoc(&jdoc, NULL); jdoc.buf = xdata;

5 years, 5 months

git:5.1:75dc482c: dialog: check xdata length when loading profile from db

by Federico Cabiddu

Module: kamailio Branch: 5.1 Commit: 75dc482cf327e3a707281f903c7e75d3b28cf52c URL: https://github.com/kamailio/kamailio/commit/75dc482cf327e3a707281f903c7e75d… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-09-08T10:20:36+02:00 dialog: check xdata length when loading profile from db (cherry picked from commit d05dfc20632fde1d65017ff5d7f41713a9c79825) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/75dc482cf327e3a707281f903c7e75d… Patch: https://github.com/kamailio/kamailio/commit/75dc482cf327e3a707281f903c7e75d… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 8e8b5b088b..92d469852e 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -414,7 +414,7 @@ static int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows) dlg_set_toroute(dlg, &toroute_name); GET_STR_VALUE(xdata, values, 21, 0, 0); - if(xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) + if(xdata.len > 0 && xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) { srjson_InitDoc(&jdoc, NULL); jdoc.buf = xdata;

5 years, 5 months

[kamailio/kamailio] dialog: check xdata length when loading profile from db (#2058)

by Federico Cabiddu

#### 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  When using a backend not supporting "NULL", like Redis, which store it as an empty string, xdata.s can be not null (it contains '\0'). This leads to an error trying to read it as a json document. Not really a bug, but it leads to the error "invalid json doc [[]]" being printed each time a dialog is loaded from db (Redis). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2058 -- Commit Summary -- * dialog: check xdata length when loading profile from db -- File Changes -- M src/modules/dialog/dlg_db_handler.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2058.patch https://github.com/kamailio/kamailio/pull/2058.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/2058

5 years, 5 months

git:master:5a380e95: Merge pull request #2058 from kamailio/grumvalski/dlg_check_xdata_len

by GitHub

Module: kamailio Branch: master Commit: 5a380e95b0914f9ae3b24ce9638404ad0b0afd6b URL: https://github.com/kamailio/kamailio/commit/5a380e95b0914f9ae3b24ce9638404a… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-08T10:17:13+02:00 Merge pull request #2058 from kamailio/grumvalski/dlg_check_xdata_len dialog: check xdata length when loading profile from db --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/5a380e95b0914f9ae3b24ce9638404a… Patch: https://github.com/kamailio/kamailio/commit/5a380e95b0914f9ae3b24ce9638404a… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 2c89685ffc..56c7ef39a2 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -457,7 +457,7 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dlg_set_toroute(dlg, &toroute_name); GET_STR_VALUE(xdata, values, 21, 0, 0); - if(xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) + if(xdata.len > 0 && xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) { srjson_InitDoc(&jdoc, NULL); jdoc.buf = xdata;

5 years, 5 months

git:master:d05dfc20: dialog: check xdata length when loading profile from db

by Federico Cabiddu

Module: kamailio Branch: master Commit: d05dfc20632fde1d65017ff5d7f41713a9c79825 URL: https://github.com/kamailio/kamailio/commit/d05dfc20632fde1d65017ff5d7f4171… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-09-08T09:01:10+02:00 dialog: check xdata length when loading profile from db --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/d05dfc20632fde1d65017ff5d7f4171… Patch: https://github.com/kamailio/kamailio/commit/d05dfc20632fde1d65017ff5d7f4171… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 2c89685ffc..56c7ef39a2 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -457,7 +457,7 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dlg_set_toroute(dlg, &toroute_name); GET_STR_VALUE(xdata, values, 21, 0, 0); - if(xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) + if(xdata.len > 0 && xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) { srjson_InitDoc(&jdoc, NULL); jdoc.buf = xdata;

5 years, 5 months

git:master:8f6e8265: core: ensure index of preprocessor directive conditions is not negative

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8f6e826576e52270f21c22a7d94b3026cc22c172 URL: https://github.com/kamailio/kamailio/commit/8f6e826576e52270f21c22a7d94b302… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-06T20:35:08+02:00 core: ensure index of preprocessor directive conditions is not negative - avoid accessing the array at negative index for else processing --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/8f6e826576e52270f21c22a7d94b302… Patch: https://github.com/kamailio/kamailio/commit/8f6e826576e52270f21c22a7d94b302… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 00fd4b5e49..53f33431df 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1942,14 +1942,24 @@ static void pp_ifdef() static void pp_else() { + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } pp_ifdef_stack[pp_sptr-1] ^= 1; pp_update_state(); } static void pp_endif() { - pp_sptr--; pp_ifdef_level_update(-1); + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } + pp_sptr--; pp_update_state(); }

5 years, 5 months

git:5.2:cf9b59a5: core: spelling fix in error message related to pid/pgid chown

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: cf9b59a54a49201bd1022a3fb1b7688b45ed3536 URL: https://github.com/kamailio/kamailio/commit/cf9b59a54a49201bd1022a3fb1b7688… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-06T12:14:26+02:00 core: spelling fix in error message related to pid/pgid chown (cherry picked from commit 21afc6081c3044b4f754e6a34ea67fd98f2e3af9) --- Modified: src/core/daemonize.c --- Diff: https://github.com/kamailio/kamailio/commit/cf9b59a54a49201bd1022a3fb1b7688… Patch: https://github.com/kamailio/kamailio/commit/cf9b59a54a49201bd1022a3fb1b7688… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index 98bf04dc78..7301ddc7c8 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -357,7 +357,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PID file: %s\n", strerror(errno)); goto error; } } @@ -385,7 +385,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pgid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PGID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PGID file: %s\n", strerror(errno)); goto error; } }

5 years, 5 months

git:5.1:412ea460: core: spelling fix in error message related to pid/pgid chown

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 412ea460b57f1c84cecd9fe834f51158339e986e URL: https://github.com/kamailio/kamailio/commit/412ea460b57f1c84cecd9fe834f5115… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-06T12:14:31+02:00 core: spelling fix in error message related to pid/pgid chown (cherry picked from commit 21afc6081c3044b4f754e6a34ea67fd98f2e3af9) --- Modified: src/core/daemonize.c --- Diff: https://github.com/kamailio/kamailio/commit/412ea460b57f1c84cecd9fe834f5115… Patch: https://github.com/kamailio/kamailio/commit/412ea460b57f1c84cecd9fe834f5115… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index 98bf04dc78..7301ddc7c8 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -357,7 +357,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PID file: %s\n", strerror(errno)); goto error; } } @@ -385,7 +385,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pgid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PGID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PGID file: %s\n", strerror(errno)); goto error; } }

5 years, 5 months

git:master:21afc608: core: spelling fix in error message related to pid/pgid chown

by Henning Westerholt

Module: kamailio Branch: master Commit: 21afc6081c3044b4f754e6a34ea67fd98f2e3af9 URL: https://github.com/kamailio/kamailio/commit/21afc6081c3044b4f754e6a34ea67fd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-06T12:13:19+02:00 core: spelling fix in error message related to pid/pgid chown --- Modified: src/core/daemonize.c --- Diff: https://github.com/kamailio/kamailio/commit/21afc6081c3044b4f754e6a34ea67fd… Patch: https://github.com/kamailio/kamailio/commit/21afc6081c3044b4f754e6a34ea67fd… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index 4fa33ac063..d6692523c7 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -357,7 +357,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PID file: %s\n", strerror(errno)); goto error; } } @@ -385,7 +385,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pgid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PGID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PGID file: %s\n", strerror(errno)); goto error; } }

5 years, 5 months

← Newer
1
...
29
30
31
32
33
34
35
36
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019