sr-dev November 2018

sr-dev@lists.kamailio.org

22 participants
298 discussions

[kamailio/kamailio] ims_diameter_server: fixing avp nested list #1686 (#1707)

by Rick

#### 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 - [x] Related to issue #1686 (replace XXXX with an open issue number) #### Description  Fixes nested lists avp You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1707 -- Commit Summary -- * ims_diameter_server: fixing avp nested list #1686 -- File Changes -- M src/modules/ims_diameter_server/avp_helper.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1707.patch https://github.com/kamailio/kamailio/pull/1707.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/1707

6 years

git:master:7925c374: ims_diameter_server: fixing avp nested list #1686

by Rick Barenthin

Module: kamailio Branch: master Commit: 7925c3749b36a24615695b026983862ba03301b0 URL: https://github.com/kamailio/kamailio/commit/7925c3749b36a24615695b026983862… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Rick Barenthin <rick(a)ng-voice.com> Date: 2018-11-04T10:48:17+01:00 ims_diameter_server: fixing avp nested list #1686 --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/7925c3749b36a24615695b026983862… Patch: https://github.com/kamailio/kamailio/commit/7925c3749b36a24615695b026983862… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 9f6b67cf2e..9bfde85571 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -338,8 +338,17 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level avp_list_s = cdpb.AAAGroupAVPS(avp_list); cdpb.AAAFreeAVPList(&avp_list); - diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, - cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_FREE_DATA, __FUNCTION__); + if(list) { + diameterserver_add_avp_list(list, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } else { + diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } } else if (cJSON_GetObjectItem(item,"int32")) { set_4bytes(x, cJSON_GetObjectItem(item,"int32")->valueint); if (list) {

6 years

git:master:54f71b4d: Merge pull request #1707 from dunst0/fix/ims_diameter_server

by GitHub

Module: kamailio Branch: master Commit: 54f71b4df5e64a87463098a081b1014458637766 URL: https://github.com/kamailio/kamailio/commit/54f71b4df5e64a87463098a081b1014… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-05T14:49:05+01:00 Merge pull request #1707 from dunst0/fix/ims_diameter_server ims_diameter_server: fixing avp nested list #1686 --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/54f71b4df5e64a87463098a081b1014… Patch: https://github.com/kamailio/kamailio/commit/54f71b4df5e64a87463098a081b1014… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index ab3974ac1f..04e2d6d967 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -342,8 +342,17 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level avp_list_s = cdpb.AAAGroupAVPS(avp_list); cdpb.AAAFreeAVPList(&avp_list); - diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, - cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_FREE_DATA, __FUNCTION__); + if(list) { + diameterserver_add_avp_list(list, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } else { + diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } } else if (cJSON_GetObjectItem(item,"int32")) { set_4bytes(x, cJSON_GetObjectItem(item,"int32")->valueint); if (list) {

6 years

git:master:e8aec6d1: regex: fixed section ids for functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e8aec6d15bcef95f628108398e682571763464c5 URL: https://github.com/kamailio/kamailio/commit/e8aec6d15bcef95f628108398e68257… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-05T12:53:06+01:00 regex: fixed section ids for functions - removed trailing whitespaces --- Modified: src/modules/regex/doc/regex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e8aec6d15bcef95f628108398e68257… Patch: https://github.com/kamailio/kamailio/commit/e8aec6d15bcef95f628108398e68257…

6 years

[kamailio/kamailio] Crash ims_diameter_server module (#1686)

by iman432

Hi dears When the below format from restful is sent, kamailio crashes List List List (Json with 3 lists), With 2 lists it works properly, When diameter is translated to json with 3 lists by this module it also works properly, Json format is correct too. Where is problem? Thanks -- 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/issues/1686

6 years

git:master:c9845c33: ims_diameter_server: safety check for diameter message parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c9845c330ec0ed323d6dd098a746a7374642f1c6 URL: https://github.com/kamailio/kamailio/commit/c9845c330ec0ed323d6dd098a746a73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-05T10:45:38+01:00 ims_diameter_server: safety check for diameter message parameter - GH #1686 --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/c9845c330ec0ed323d6dd098a746a73… Patch: https://github.com/kamailio/kamailio/commit/c9845c330ec0ed323d6dd098a746a73… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 9f6b67cf2e..ab3974ac1f 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -200,6 +200,10 @@ int pv_get_request(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { */ int diameterserver_add_avp(AAAMessage *m, char *d, int len, int avp_code, int flags, int vendorid, int data_do, const char *func) { AAA_AVP *avp; + if(m==NULL) { + LM_ERR("invalid diamemter message parameter\n"); + return 0; + } if (vendorid != 0) flags |= AAA_AVP_FLAG_VENDOR_SPECIFIC; avp = cdpb.AAACreateAVP(avp_code, flags, vendorid, d, len, data_do); if (!avp) {

6 years

[kamailio/kamailio] [CentOS 7] Kamailio 5.1.x mongodb package missing in OpenSUSE repo (#1702)

by denyspozniak

Hello! @sergey-safarov, please add module DB_MONGODB to the OpenSUSE repo (home:kamailio:v5.1.x-rpms.repo). -- 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/issues/1702

6 years

git:master:2c077b04: pkg/kamailio/obs: Fixed bdb module build on fedora dists

by Sergey Safarov

Module: kamailio Branch: master Commit: 2c077b0434037f1b0f6b37d6026235b206ddbbb2 URL: https://github.com/kamailio/kamailio/commit/2c077b0434037f1b0f6b37d6026235b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-04T11:25:12Z pkg/kamailio/obs: Fixed bdb module build on fedora dists --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2c077b0434037f1b0f6b37d6026235b… Patch: https://github.com/kamailio/kamailio/commit/2c077b0434037f1b0f6b37d6026235b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d5b4dafd9e..c0356d8f73 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -213,6 +213,12 @@ BuildRequires: bison, flex %if 0%{?suse_version} BuildRequires: systemd-mini, shadow %endif +%if 0%{?fedora} == 27 +BuildRequires: python3-devel +%endif +%if 0%{?fedora} == 28 +BuildRequires: python3-devel +%endif %description Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able @@ -271,8 +277,13 @@ Requires: kamailio = %ver Requires: libdb-4_8 BuildRequires: libdb-4_8-devel %else +%if 0%{?rhel} == 6 Requires: db4 BuildRequires: db4-devel +%else +Requires: libdb +BuildRequires: libdb-devel +%endif %endif %description bdb @@ -1141,6 +1152,9 @@ install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ %if 0%{?suse_version} %py_compile -O %{buildroot}%{_libdir}/kamailio/kamctl/dbtextdb %endif +%if 0%{?fedora} +%py_byte_compile %{__python2} %{buildroot}%{_libdir}/kamailio/kamctl/dbtextdb +%endif # Removing devel files rm -f %{buildroot}%{_libdir}/kamailio/lib*.so

6 years

git:master:a1672d29: Merge pull request #1705 from sergey-safarov/mongodb

by GitHub

Module: kamailio Branch: master Commit: a1672d2903c581ff5ae462f6db55979bedbde809 URL: https://github.com/kamailio/kamailio/commit/a1672d2903c581ff5ae462f6db55979… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-05T10:28:51+01:00 Merge pull request #1705 from sergey-safarov/mongodb pkg/kamailio/ops: Added MongoDB rpm package --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/a1672d2903c581ff5ae462f6db55979… Patch: https://github.com/kamailio/kamailio/commit/a1672d2903c581ff5ae462f6db55979…

6 years

git:master:702bfff1: pkg/kamailio/ops: Added MongoDB rpm package

by Sergey Safarov

Module: kamailio Branch: master Commit: 702bfff175efaf25202e1644e39d143886ce7886 URL: https://github.com/kamailio/kamailio/commit/702bfff175efaf25202e1644e39d143… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-04T07:34:34Z pkg/kamailio/ops: Added MongoDB rpm package --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/702bfff175efaf25202e1644e39d143… Patch: https://github.com/kamailio/kamailio/commit/702bfff175efaf25202e1644e39d143… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index db0a6971c6..d5b4dafd9e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -34,6 +35,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -54,6 +56,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -74,6 +77,7 @@ %bcond_without lua %bcond_with kazoo %bcond_without memcached +%bcond_with mongodb %bcond_without perl %bcond_with rabbitmq %bcond_with redis @@ -95,6 +99,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -115,6 +120,7 @@ %bcond_without lua %bcond_with kazoo %bcond_without memcached +%bcond_with mongodb %bcond_without perl %bcond_with rabbitmq %bcond_without redis @@ -135,6 +141,7 @@ %bcond_with lua %bcond_with kazoo %bcond_with memcached +%bcond_with mongodb %bcond_with perl %bcond_with rabbitmq %bcond_with redis @@ -155,6 +162,7 @@ %bcond_with lua %bcond_with kazoo %bcond_with memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -188,7 +196,7 @@ Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver Conflicts: kamailio-rabbitmq < %ver -Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver +Conflicts: kamailio-memcached < %ver, kamailio-mongodb < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver @@ -541,6 +549,19 @@ Memcached configuration file support for Kamailio. %endif +%if %{with mongodb} +%package mongodb +Summary: MongoDB database connectivity for Kamailio +Group: System Environment/Daemons +Requires: kamailio = %ver +Requires: mongo-c-driver +BuildRequires: mongo-c-driver-devel + +%description mongodb +MongoDB database connectivity for Kamailio. +%endif + + %package mysql Summary: MySQL database connectivity for Kamailio Group: System Environment/Daemons @@ -991,6 +1012,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %endif %if %{with xmlrpc} kmi_xmlrpc \ +%endif +%if %{with mongodb} + kmongodb \ %endif kmysql koutbound \ %if %{with perl} @@ -1060,6 +1084,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %endif %if %{with xmlrpc} kmi_xmlrpc \ +%endif +%if %{with mongodb} + kmongodb \ %endif kmysql koutbound \ %if %{with perl} @@ -1668,6 +1695,16 @@ fi %endif +%if %{with mongodb} +%files mongodb +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.db_mongodb +%doc %{_docdir}/kamailio/modules/README.ndb_mongodb +%{_libdir}/kamailio/modules/db_mongodb.so +%{_libdir}/kamailio/modules/ndb_mongodb.so +%endif + + %files mysql %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_mysql

6 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2018