sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:master:37ec84b6: Merge branch 'master' of https://github.com/kamailio/kamailio

by wkampich

Module: kamailio Branch: master Commit: 37ec84b6718bf34c325f5cb522f7e41d8d345849 URL: https://github.com/kamailio/kamailio/commit/37ec84b6718bf34c325f5cb522f7e41… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: wkampich <wolfgang.kampichler(a)gmail.com> Date: 2019-09-06T16:27:25+02:00 Merge branch 'master' of https://github.com/kamailio/kamailio --- Modified: src/core/daemonize.c Modified: src/core/ppcfg.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/37ec84b6718bf34c325f5cb522f7e41… Patch: https://github.com/kamailio/kamailio/commit/37ec84b6718bf34c325f5cb522f7e41… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index 98bf04dc78..d6692523c7 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -350,14 +350,14 @@ int daemonize(char* name, int status_wait) } pid=getpid(); if ((pid_stream=fopen(pid_file, "w"))==NULL){ - LM_WARN("unable to create pid file %s: %s\n", + LM_WARN("unable to create pid file %s: %s, check directory permissions\n", pid_file, strerror(errno)); goto error; }else{ 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; } } diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 3b026f9978..49065938af 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -219,8 +219,13 @@ void pp_ifdef_level_update(int val) void pp_ifdef_level_check(void) { if(_pp_ifdef_level!=0) { - LM_WARN("different number of preprocessor directives:" - " N(#!IF[N]DEF) - N(#!ENDIF) = %d\n", _pp_ifdef_level); + if (_pp_ifdef_level > 0) { + LM_WARN("different number of preprocessor directives:" + " %d more #!if[n]def as #!endif\n", _pp_ifdef_level); + } else { + LM_WARN("different number of preprocessor directives:" + " %d more #!endif as #!if[n]def\n", (_pp_ifdef_level)*-1); + } } else { LM_DBG("same number of pairing preprocessor directives" " #!IF[N]DEF - #!ENDIF\n"); diff --git a/src/main.c b/src/main.c index 1b7004d8b0..ba64af67db 100644 --- a/src/main.c +++ b/src/main.c @@ -2211,7 +2211,8 @@ int main(int argc, char** argv) cfg_stream=fopen (cfg_file, "r"); } if (cfg_stream==0){ - fprintf(stderr, "ERROR: loading config file(%s): %s\n", cfg_file, + fprintf(stderr, "ERROR: loading config file(%s): %s," + " check file and directory permissions\n", cfg_file, strerror(errno)); goto error; } @@ -2551,8 +2552,8 @@ int main(int argc, char** argv) /* create runtime dir if doesn't exist */ if (stat(runtime_dir, &st) == -1) { if(mkdir(runtime_dir, 0700) == -1) { - LM_ERR("failed to create runtime dir %s\n", runtime_dir); - fprintf(stderr, "failed to create runtime dir %s\n", runtime_dir); + LM_ERR("failed to create runtime dir %s, check directory permissions\n", runtime_dir); + fprintf(stderr, "failed to create runtime dir %s, check directory permissions\n", runtime_dir); goto error; } if(sock_uid!=-1 || sock_gid!=-1) {

4 years, 8 months

git:master:56bf76bb: kamailio.cfg: set_forward_no_connect() only for initial requests going through nat

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 56bf76bba043ae02eefa8263d352caa7bb3af213 URL: https://github.com/kamailio/kamailio/commit/56bf76bba043ae02eefa8263d352caa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-09T09:09:49+02:00 kamailio.cfg: set_forward_no_connect() only for initial requests going through nat --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/56bf76bba043ae02eefa8263d352caa… Patch: https://github.com/kamailio/kamailio/commit/56bf76bba043ae02eefa8263d352caa… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 20871fbc62..c41b933e5c 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -559,10 +559,6 @@ route[RELAY] { route[REQINIT] { # no connect for sending replies set_reply_no_connect(); - if(has_totag()) { - # no connect for requests within dialog - set_forward_no_connect(); - } #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while @@ -834,7 +830,11 @@ route[NATMANAGE] { if(isbflagset(FLB_NATB)) { # no connect message in a dialog involving NAT traversal - set_forward_no_connect(); + if (is_request()) { + if(has_totag()) { + set_forward_no_connect(); + } + } } #!endif return;

4 years, 8 months

git:master:ce19d921: siptrace: turn warn into info message about loading dlg api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ce19d9212feb0ff4b017b5eaa71e4637a71aa4b9 URL: https://github.com/kamailio/kamailio/commit/ce19d9212feb0ff4b017b5eaa71e463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-09T08:34:08+02:00 siptrace: turn warn into info message about loading dlg api - dialog tracking is optional --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ce19d9212feb0ff4b017b5eaa71e463… Patch: https://github.com/kamailio/kamailio/commit/ce19d9212feb0ff4b017b5eaa71e463… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 211ddac363..35bfb1c78a 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -335,9 +335,8 @@ static int mod_init(void) } if (load_dlg_api(&dlgb) < 0) { - LM_WARN("can't load dlg api. Will not install dialog callbacks.\n"); - } - else { + LM_INFO("can't load dlg api. Will not install dialog callbacks.\n"); + } else { if (dlgb.register_dlgcb(NULL, DLGCB_CREATED, trace_dialog, NULL, NULL) != 0) { LM_ERR("failed to register dialog callbacks! Tracing dialogs won't be available\n"); }

4 years, 8 months

git:master:d80bccc3: github: small additition related to file line endings and windows editors

by Henning Westerholt

Module: kamailio Branch: master Commit: d80bccc3b85256fe0d440cc47c90fc1020ae1d8d URL: https://github.com/kamailio/kamailio/commit/d80bccc3b85256fe0d440cc47c90fc1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-08T22:57:27+02:00 github: small additition related to file line endings and windows editors --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/d80bccc3b85256fe0d440cc47c90fc1… Patch: https://github.com/kamailio/kamailio/commit/d80bccc3b85256fe0d440cc47c90fc1… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ea6ba9cdd8..28c16586a7 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -65,6 +65,8 @@ and commit history, there are several *rules* required for each contribution. * code **should** be formatted with **clang-format** or to match the style of the component that the commit applies to. The `.clang-format` file is part of Kamailio source code tree, in the root folder. + * code **should** be use Linux style line endings and not Windows style + (CRLF). If you use a Windows editor, please configure it this way. ### Commit Message Rules ###

4 years, 8 months

git:master:26c13797: core: fix log message with the proper preprocessor directive name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 26c137977d2892f67e80f07759bec17ddfe99172 URL: https://github.com/kamailio/kamailio/commit/26c137977d2892f67e80f07759bec17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-06T20:48:31+02:00 core: fix log message with the proper preprocessor directive name --- Modified: pkg/docker Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/26c137977d2892f67e80f07759bec17… Patch: https://github.com/kamailio/kamailio/commit/26c137977d2892f67e80f07759bec17… --- diff --git a/pkg/docker b/pkg/docker index 5d6f46a758..b92a1c899b 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 5d6f46a758e0d98fa4258925d40aa1521b1e27d0 +Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 53f33431df..a640bd158f 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1955,7 +1955,7 @@ static void pp_endif() { pp_ifdef_level_update(-1); if(pp_sptr==0) { - LM_WARN("invalid position for preprocessor directive 'else'" + LM_WARN("invalid position for preprocessor directive 'endif'" " - at %s line %d\n", (finame)?finame:"cfg", line); return; }

4 years, 8 months

git:5.2:de9a03f1: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.2 Commit: de9a03f1353456d8e0165cd673d660c3d8e1e27e URL: https://github.com/kamailio/kamailio/commit/de9a03f1353456d8e0165cd673d660c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-08T22:16:41+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/de9a03f1353456d8e0165cd673d660c… Patch: https://github.com/kamailio/kamailio/commit/de9a03f1353456d8e0165cd673d660c… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index ec3af10e5e..ef76592a83 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -235,6 +235,7 @@ 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") @@ -242,6 +243,9 @@ 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("db_redis", "keys", "dialog=entry:hash_entry,hash_id&cid:callid") +modparam("db_redis", "keys", "dialog_vars=entry:hash_entry,hash_id,dialog_key&di +alog:hash_entry,hash_id") ... modparam("usrloc", "db_url", DBURL_USRLOC) ... @@ -250,6 +254,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) ... Samples adding records for address table using 'redis-cli':

4 years, 8 months

git:5.2:307939e8: db_redis: add examples about usage with dialog module

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 307939e892877603357af11ff452ca8c62d7bef5 URL: https://github.com/kamailio/kamailio/commit/307939e892877603357af11ff452ca8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-08T22:10:30+02:00 db_redis: add examples about usage with dialog module (cherry picked from commit 86990ab53c4b5e5ede49b95e17b02f96ae00a01c) --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/307939e892877603357af11ff452ca8… Patch: https://github.com/kamailio/kamailio/commit/307939e892877603357af11ff452ca8… --- 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>

4 years, 8 months

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

by Kamailio Dev

Module: kamailio Branch: master Commit: e7468184151c20919428ab10dc72391f25c93d4f URL: https://github.com/kamailio/kamailio/commit/e7468184151c20919428ab10dc72391… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-08T10:31:59+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/e7468184151c20919428ab10dc72391… Patch: https://github.com/kamailio/kamailio/commit/e7468184151c20919428ab10dc72391… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index ec3af10e5e..ef76592a83 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -235,6 +235,7 @@ 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") @@ -242,6 +243,9 @@ 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("db_redis", "keys", "dialog=entry:hash_entry,hash_id&cid:callid") +modparam("db_redis", "keys", "dialog_vars=entry:hash_entry,hash_id,dialog_key&di +alog:hash_entry,hash_id") ... modparam("usrloc", "db_url", DBURL_USRLOC) ... @@ -250,6 +254,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) ... Samples adding records for address table using 'redis-cli':

4 years, 8 months

[kamailio/kamailio] db_redis: add examples about usage with dialog module (#2059)

by Federico Cabiddu

Small contribution to db_redis module documentation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2059 -- Commit Summary -- * db_redis: add examples about usage with dialog module -- File Changes -- M src/modules/db_redis/doc/db_redis_admin.xml (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2059.patch https://github.com/kamailio/kamailio/pull/2059.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/2059

4 years, 8 months

git:master:a638c714: Merge pull request #2059 from kamailio/grumvalski/db_redis_keys_doc

by GitHub

Module: kamailio Branch: master Commit: a638c71454499d78363c5f213769c57a78772278 URL: https://github.com/kamailio/kamailio/commit/a638c71454499d78363c5f213769c57… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-08T10:21:34+02:00 Merge pull request #2059 from kamailio/grumvalski/db_redis_keys_doc 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/a638c71454499d78363c5f213769c57… Patch: https://github.com/kamailio/kamailio/commit/a638c71454499d78363c5f213769c57… --- 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>

4 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019