sr-dev February 2018

sr-dev@lists.kamailio.org

33 participants
356 discussions

git:4.4:fc2d822e: pkg/rpm: version set to 4.4.7 in specs
by Daniel-Constantin Mierla 26 Feb '18

26 Feb '18

Module: kamailio Branch: 4.4 Commit: fc2d822e14bb0b23ae082d7479d5a1d0af11b4c9 URL: https://github.com/kamailio/kamailio/commit/fc2d822e14bb0b23ae082d7479d5a1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-26T13:59:19+01:00 pkg/rpm: version set to 4.4.7 in specs --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE Modified: pkg/kamailio/solaris/pkginfo --- Diff: https://github.com/kamailio/kamailio/commit/fc2d822e14bb0b23ae082d7479d5a1d… Patch: https://github.com/kamailio/kamailio/commit/fc2d822e14bb0b23ae082d7479d5a1d… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 95ab45cdde..78cb128fa5 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.6 +%define ver 4.4.7 %define rel 0.0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index cabbc61c66..00935c14a2 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.6 +%define ver 4.4.7 %define rel 1%{dist} %bcond_with dnssec diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index e4f412125b..e092c3bc06 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.6 +%define ver 4.4.7 %define rel 0%{dist} diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 7f1c0fdd85..5741a9558a 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.6 +%define ver 4.4.7 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 902b7bd194..14731025a1 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.6 +%define ver 4.4.7 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index d137a3902f..878d4d5ad8 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.6 +%define ver 4.4.7 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index f18393b3f3..eeb7836691 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.6 +%define ver 4.4.7 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index b28a9f2b1e..6c7426f90a 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.6 +%define ver 4.4.7 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops diff --git a/pkg/kamailio/solaris/pkginfo b/pkg/kamailio/solaris/pkginfo index 116657e95d..372a7be88a 100644 --- a/pkg/kamailio/solaris/pkginfo +++ b/pkg/kamailio/solaris/pkginfo @@ -1,6 +1,6 @@ PKG=Kamailio ARCH=sparc -VERSION=1.2.0 +VERSION=4.4.7 CATEGORY=application EMAIL=miconda(a)gmail.com NAME=Kamailio is a very fast and flexible SIP (RFC3261) proxy server

1 0

[kamailio/kamailio] pkg/docker: Updated reference to packaging scripts (#1455)
by sergey-safarov 26 Feb '18

26 Feb '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1455 -- Commit Summary -- * pkg/docker: Updated reference to packaging scripts -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1455.patch https://github.com/kamailio/kamailio/pull/1455.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/1455

2 1

git:master:2c7099a7: pkg/docker: Updated reference to packaging scripts
by Victor Seva 26 Feb '18

26 Feb '18

Module: kamailio Branch: master Commit: 2c7099a7d0ce852663b189c67b43249957b6a281 URL: https://github.com/kamailio/kamailio/commit/2c7099a7d0ce852663b189c67b43249… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-26T11:45:14+01:00 pkg/docker: Updated reference to packaging scripts --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/2c7099a7d0ce852663b189c67b43249… Patch: https://github.com/kamailio/kamailio/commit/2c7099a7d0ce852663b189c67b43249… --- diff --git a/pkg/docker b/pkg/docker index d5eef889b8..dee22bb1ec 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit d5eef889b8be77c90a4ab1eac29e240132499060 +Subproject commit dee22bb1ec7bda31723349f37602a5ac6ef8445a

1 0

git:4.4:b8ea200e: pkg/kamailio/deb: version set to 4.4.7
by Victor Seva 26 Feb '18

26 Feb '18

Module: kamailio Branch: 4.4 Commit: b8ea200ee2f905b57beccfa4053b5f7d691aa371 URL: https://github.com/kamailio/kamailio/commit/b8ea200ee2f905b57beccfa4053b5f7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-26T11:12:02+01:00 pkg/kamailio/deb: version set to 4.4.7 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b8ea200ee2f905b57beccfa4053b5f7… Patch: https://github.com/kamailio/kamailio/commit/b8ea200ee2f905b57beccfa4053b5f7… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 7b26f390d4..44c2096500 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.7) unstable; urgency=medium + + * version set to 4.4.7 + + -- Victor Seva <vseva(a)debian.org> Mon, 26 Feb 2018 11:11:19 +0100 + kamailio (4.4.6) unstable; urgency=medium * version set to 4.4.6 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 7b26f390d4..44c2096500 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.7) unstable; urgency=medium + + * version set to 4.4.7 + + -- Victor Seva <vseva(a)debian.org> Mon, 26 Feb 2018 11:11:19 +0100 + kamailio (4.4.6) unstable; urgency=medium * version set to 4.4.6 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 7b26f390d4..44c2096500 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.7) unstable; urgency=medium + + * version set to 4.4.7 + + -- Victor Seva <vseva(a)debian.org> Mon, 26 Feb 2018 11:11:19 +0100 + kamailio (4.4.6) unstable; urgency=medium * version set to 4.4.6 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 7b26f390d4..44c2096500 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.7) unstable; urgency=medium + + * version set to 4.4.7 + + -- Victor Seva <vseva(a)debian.org> Mon, 26 Feb 2018 11:11:19 +0100 + kamailio (4.4.6) unstable; urgency=medium * version set to 4.4.6 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 7b26f390d4..44c2096500 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.7) unstable; urgency=medium + + * version set to 4.4.7 + + -- Victor Seva <vseva(a)debian.org> Mon, 26 Feb 2018 11:11:19 +0100 + kamailio (4.4.6) unstable; urgency=medium * version set to 4.4.6 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 7b26f390d4..44c2096500 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.7) unstable; urgency=medium + + * version set to 4.4.7 + + -- Victor Seva <vseva(a)debian.org> Mon, 26 Feb 2018 11:11:19 +0100 + kamailio (4.4.6) unstable; urgency=medium * version set to 4.4.6 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 7b26f390d4..44c2096500 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.7) unstable; urgency=medium + + * version set to 4.4.7 + + -- Victor Seva <vseva(a)debian.org> Mon, 26 Feb 2018 11:11:19 +0100 + kamailio (4.4.6) unstable; urgency=medium * version set to 4.4.6 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 7b26f390d4..44c2096500 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.7) unstable; urgency=medium + + * version set to 4.4.7 + + -- Victor Seva <vseva(a)debian.org> Mon, 26 Feb 2018 11:11:19 +0100 + kamailio (4.4.6) unstable; urgency=medium * version set to 4.4.6 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 7b26f390d4..44c2096500 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.7) unstable; urgency=medium + + * version set to 4.4.7 + + -- Victor Seva <vseva(a)debian.org> Mon, 26 Feb 2018 11:11:19 +0100 + kamailio (4.4.6) unstable; urgency=medium * version set to 4.4.6

1 0

git:master:6eb4d67c: modules: readme files regenerated - auth ... [skip ci]
by Kamailio Dev 26 Feb '18

26 Feb '18

Module: kamailio Branch: master Commit: 6eb4d67c1fd2349506bc0d0d6dbe27a26bad9926 URL: https://github.com/kamailio/kamailio/commit/6eb4d67c1fd2349506bc0d0d6dbe27a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-02-26T08:32:10+01:00 modules: readme files regenerated - auth ... [skip ci] --- Modified: src/modules/auth/README --- Diff: https://github.com/kamailio/kamailio/commit/6eb4d67c1fd2349506bc0d0d6dbe27a… Patch: https://github.com/kamailio/kamailio/commit/6eb4d67c1fd2349506bc0d0d6dbe27a… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index 5967149855..e9337a5b7b 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -700,7 +700,7 @@ modparam("auth", "add_authinfo_hdr", yes) ... if (www_authenticate("realm", "subscriber")) { consume_credentials(); -}; +} ... 4.2. has_credentials(realm) @@ -750,6 +750,7 @@ if (has_credentials("myrealm")) { ... if (!www_authenticate("$td", "subscriber")) { www_challenge("$td", "1"); + exit; } ... @@ -772,7 +773,8 @@ if (!www_authenticate("$td", "subscriber")) { ... if (!proxy_authenticate("$fd", "subscriber")) { proxy_challenge("$fd", "1"); -}; + exit; +} ... 4.5. auth_challenge(realm, flags) @@ -793,7 +795,8 @@ if (!proxy_authenticate("$fd", "subscriber")) { ... if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "1"); -}; + exit; +} ... 4.6. pv_www_authenticate(realm, passwd, flags [, method]) @@ -845,7 +848,8 @@ if (!auth_check("$fd", "subscriber", "1")) { ... if (!pv_www_authenticate("$td", "123abc", "0")) { www_challenge("$td", "1"); -}; + exit; +} ... 4.7. pv_proxy_authenticate(realm, passwd, flags) @@ -868,7 +872,8 @@ if (!pv_www_authenticate("$td", "123abc", "0")) { $avp(password)="xyz"; if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { proxy_challenge("$fd", "1"); -}; + exit; +} ... 4.8. pv_auth_check(realm, passwd, flags, checks) @@ -898,8 +903,9 @@ if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { ... $avp(password)="xyz"; if (!pv_auth_check("$fd", "$avp(password)", "0", "1")) { - proxy_challenge("$fd", "1"); -}; + auth_challenge("$fd", "1"); + exit; +} ... 4.9. auth_get_www_authenticate(realm, flags, pvdest)

1 0

git:master:025b2299: ims_dialog: updated application name
by Daniel-Constantin Mierla 26 Feb '18

26 Feb '18

Module: kamailio Branch: master Commit: 025b22999e2826fdb4183e05b0008407551527d6 URL: https://github.com/kamailio/kamailio/commit/025b22999e2826fdb4183e05b000840… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-26T08:22:31+01:00 ims_dialog: updated application name --- Modified: src/modules/ims_dialog/dlg_var.c Modified: src/modules/ims_dialog/dlg_var.h --- Diff: https://github.com/kamailio/kamailio/commit/025b22999e2826fdb4183e05b000840… Patch: https://github.com/kamailio/kamailio/commit/025b22999e2826fdb4183e05b000840… --- diff --git a/src/modules/ims_dialog/dlg_var.c b/src/modules/ims_dialog/dlg_var.c index 7972333d8a..e0648c6dc7 100644 --- a/src/modules/ims_dialog/dlg_var.c +++ b/src/modules/ims_dialog/dlg_var.c @@ -1,17 +1,16 @@ /** - * $Id$ * * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) * Copyright (C) 2011 Carsten Bock, carsten(a)ng-voice.com * * This file is part of kamailio, a free SIP server. * - * openser is free software; you can redistribute it and/or modify + * kamailio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version * - * openser is distributed in the hope that it will be useful, + * kamailio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/src/modules/ims_dialog/dlg_var.h b/src/modules/ims_dialog/dlg_var.h index f5753075ef..706028dd20 100644 --- a/src/modules/ims_dialog/dlg_var.h +++ b/src/modules/ims_dialog/dlg_var.h @@ -1,17 +1,15 @@ /** - * $Id$ - * * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) * Copyright (C) 2011 Carsten Bock, carsten(a)ng-voice.com * * This file is part of kamailio, a free SIP server. * - * openser is free software; you can redistribute it and/or modify + * kamailio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version * - * openser is distributed in the hope that it will be useful, + * kamailio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -20,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - + #ifndef _DLG_VAR_H_ #define _DLG_VAR_H_

1 0

git:master:998d26ae: auth: docs - adjustments to examples
by Daniel-Constantin Mierla 26 Feb '18

26 Feb '18

Module: kamailio Branch: master Commit: 998d26aef7fcccf52957076acd8fec6b81968b1c URL: https://github.com/kamailio/kamailio/commit/998d26aef7fcccf52957076acd8fec6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-25T08:01:53+01:00 auth: docs - adjustments to examples --- Modified: src/modules/auth/doc/auth_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/998d26aef7fcccf52957076acd8fec6… Patch: https://github.com/kamailio/kamailio/commit/998d26aef7fcccf52957076acd8fec6… --- diff --git a/src/modules/auth/doc/auth_functions.xml b/src/modules/auth/doc/auth_functions.xml index 0f56d0b0b7..581509ee3a 100644 --- a/src/modules/auth/doc/auth_functions.xml +++ b/src/modules/auth/doc/auth_functions.xml @@ -11,7 +11,7 @@ <section id="auth.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>Functions</title> - + <section id="auth.f.consume_credentials"> <title><function>consume_credentials()</function></title> <para> @@ -32,7 +32,7 @@ ... if (www_authenticate("realm", "subscriber")) { consume_credentials(); -}; +} ... </programlisting> </example> @@ -122,6 +122,7 @@ if (has_credentials("myrealm")) { ... if (!www_authenticate("$td", "subscriber")) { www_challenge("$td", "1"); + exit; } ... </programlisting> @@ -152,7 +153,8 @@ if (!www_authenticate("$td", "subscriber")) { ... if (!proxy_authenticate("$fd", "subscriber")) { proxy_challenge("$fd", "1"); -}; + exit; +} ... </programlisting> </example> @@ -181,7 +183,8 @@ if (!proxy_authenticate("$fd", "subscriber")) { ... if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "1"); -}; + exit; +} ... </programlisting> </example> @@ -295,7 +298,8 @@ if (!auth_check("$fd", "subscriber", "1")) { ... if (!pv_www_authenticate("$td", "123abc", "0")) { www_challenge("$td", "1"); -}; + exit; +} ... </programlisting> </example> @@ -329,7 +333,8 @@ if (!pv_www_authenticate("$td", "123abc", "0")) { $avp(password)="xyz"; if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { proxy_challenge("$fd", "1"); -}; + exit; +} ... </programlisting> </example> @@ -372,8 +377,9 @@ if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { ... $avp(password)="xyz"; if (!pv_auth_check("$fd", "$avp(password)", "0", "1")) { - proxy_challenge("$fd", "1"); -}; + auth_challenge("$fd", "1"); + exit; +} ... </programlisting> </example>

1 0

[kamailio/kamailio] db_redis: Implement db_redis generic db driver (#1432)
by Andreas Granig 23 Feb '18

23 Feb '18

This module implements a generic db driver for kamailio. It requires a "schema" and "key" definition of "tables" and corresponding keys for redis in the kamailio config file, otherwise it's supposed to work with every module. Implemented methods are query (w/o order-by), insert, update, delete. Tested with usrloc and acc.   #### 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) - [ ] 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 #1137 #### Description  This module implements a generic db driver for redis, to be used by any module (with the help of some schema configuration in the config file). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1432 -- Commit Summary -- * db_redis: Implement db_redis generic db driver -- File Changes -- M src/Makefile.groups (2) A src/modules/db_redis/Makefile (37) A src/modules/db_redis/README (199) A src/modules/db_redis/db_redis_mod.c (109) A src/modules/db_redis/db_redis_mod.h (31) A src/modules/db_redis/doc/Makefile (4) A src/modules/db_redis/doc/db_redis.xml (37) A src/modules/db_redis/doc/db_redis_admin.xml (190) A src/modules/db_redis/redis_connection.c (287) A src/modules/db_redis/redis_connection.h (71) A src/modules/db_redis/redis_dbase.c (2056) A src/modules/db_redis/redis_dbase.h (92) A src/modules/db_redis/redis_table.c (697) A src/modules/db_redis/redis_table.h (63) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1432.patch https://github.com/kamailio/kamailio/pull/1432.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/1432

3 15

RFC: db_redisusrloc module - review and how to deal with
by Daniel-Constantin Mierla 23 Feb '18

23 Feb '18

Hello, (cross-posting being something I want to get developers and users express their opinions). We were recently in a (lucky) situation to have two new modules submissions targeting more or less the same purpose: allowing to use Kamailio with a Redis backend via database API. One was submitted by Andreas Granig (Sipwise) and already merged with the name db_redis, because it was designed from the beginning as a generic DB connector, so the module can be used with auth_db, acc, usrloc, ... * https://www.kamailio.org/docs/modules/devel/modules/db_redis.html The second one was submitted by Surendra Tiwari (Plivo), initially having a naming conflict with db_redis, but renamed to db_redisusrloc, see the pull request at: * https://github.com/kamailio/kamailio/pull/1446 Now, this email is about deciding the way to go forward with the second module. It was designed to be used only for usrloc in the first phase, with many specific usrloc attributes hard coded inside db_redisusrloc. Surendra said (in a private chat) that the long term plan is to make it work for other modules. Anyhow, at this moment is very tied to usrloc, therefore the name of the module. Given that the backend (Redis) is not an SQL engine, mapping over Kamailio's DB API needs some schema definition (see the readme of db_redis) in order to make it generic and work for all our modules that use a DB backend. On the other hand, to squeeze the best of the backend, specially in no-SQL cases, having a dedicated DB connector module optimized for a specific module might help to get more performances/high-availability/scalability from the backend itself. In this case, for example the expires value for a contact record can be set inside redis, so kamailio module doesn't have to run a timer routine to clean up (it doesn't mean db_redisusrloc does it right now, I didn't have time for a proper review, just giving an example). Surendra said they use it in production for couple of months now and it is several times faster than using usrloc with db_postgres (iirc, not db_mysql) for db_mode=3 (database only mode). But of course, the reverse of the medal with a dedicated db connector for a module: it adds overhead to code maintenance (besides generic updates due to external library changes, I expect changing something relevant in usrloc, like adding new columns, would require updates in this module as well). So, there are few things I want feedback on: 1) how do you fill about splitting from a generic-only DB connectors to have also some dedicated ones? This is more from confusion point of view, as a general rule so far, we do not deny contributions if there are other options for same kind of feature (e.g., many lcr or nat traversal options). As long as the contributor is willing to maintain the code, we were fine. 2) I guess usrloc, presence and dialog modules would be the main suspects that would benefit for such dedicated connectors, in other cases might not worth adding dedicated connectors. Missing any other module one would like to squeeze more performances with a dedicated connector? 3) should we set a different naming policy for such modules, for example: use *dbs_* prefix instead *db_*, to suggest better it is a DataBase Specific connector? 4) Andreas said he plans to do some performance testing of usrloc module with the two modules and see the differences. Anyone else that wants to do it? It can be a good metric to see if it worth going one way or another? 5) Helping to review the pull request, specially if you use Redis, is appreciated. Personally I am very short in available time these days, next week I plan do to new Kamailio stable releases, so the schedule is not getting lighter in my side. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 5-7, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

5 5

git:master:45260517: core: kemi - exported KSR.add_tcp_alias() and KSR.add_tcp_alias_via()
by Daniel-Constantin Mierla 23 Feb '18

23 Feb '18

Module: kamailio Branch: master Commit: 45260517ce4b97387d98bcc7c303bcdec55e4114 URL: https://github.com/kamailio/kamailio/commit/45260517ce4b97387d98bcc7c303bcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-23T09:56:55+01:00 core: kemi - exported KSR.add_tcp_alias() and KSR.add_tcp_alias_via() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/45260517ce4b97387d98bcc7c303bcd… Patch: https://github.com/kamailio/kamailio/commit/45260517ce4b97387d98bcc7c303bcd… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 655d98a767..8348756536 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -933,6 +933,60 @@ static int sr_kemi_core_set_advertised_port(sip_msg_t *msg, str *port) return SR_KEMI_TRUE; } +/** + * + */ +static int sr_kemi_core_add_tcp_alias(sip_msg_t *msg, int port) +{ + if(msg==NULL) { + LM_WARN("invalid msg parameter\n"); + return SR_KEMI_FALSE; + } + +#ifdef USE_TCP + if ( msg->rcv.proto==PROTO_TCP +#ifdef USE_TLS + || msg->rcv.proto==PROTO_TLS +#endif + ) { + if (tcpconn_add_alias(msg->rcv.proto_reserved1, port, + msg->rcv.proto)!=0){ + LM_ERR("adding tcp alias failed\n"); + return SR_KEMI_FALSE; + } + } +#endif + + return SR_KEMI_TRUE; +} + +/** + * + */ +static int sr_kemi_core_add_tcp_alias_via(sip_msg_t *msg) +{ + if(msg==NULL) { + LM_WARN("invalid msg parameter\n"); + return SR_KEMI_FALSE; + } + +#ifdef USE_TCP + if ( msg->rcv.proto==PROTO_TCP +#ifdef USE_TLS + || msg->rcv.proto==PROTO_TLS +#endif + ) { + if (tcpconn_add_alias(msg->rcv.proto_reserved1, msg->via1->port, + msg->rcv.proto)!=0){ + LM_ERR("adding tcp alias failed\n"); + return SR_KEMI_FALSE; + } + } +#endif + return SR_KEMI_TRUE; +} + + /** * */ @@ -1132,6 +1186,16 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("add_tcp_alias"), + SR_KEMIP_INT, sr_kemi_core_add_tcp_alias, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("add_tcp_alias_via"), + SR_KEMIP_INT, sr_kemi_core_add_tcp_alias_via, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2018