sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:5.1:c3eec978: pkg/rpm: version set to 5.1.4
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: c3eec978f6456eb238d446686e1db3b5b6de4b7b URL: https://github.com/kamailio/kamailio/commit/c3eec978f6456eb238d446686e1db3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-05T12:11:28+02:00 pkg/rpm: version set to 5.1.4 --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/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 --- Diff: https://github.com/kamailio/kamailio/commit/c3eec978f6456eb238d446686e1db3b… Patch: https://github.com/kamailio/kamailio/commit/c3eec978f6456eb238d446686e1db3b… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 5ba6f7398e..b71a44de05 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.3 +pkgver=5.1.4 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 1a5f233217..49fbef81e3 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d857e53cbf..3b938428b9 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel dev6%{dist} %bcond_with dnssec diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index b274092cd1..b9313c520b 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 333b4cc6ef..27744a2f72 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0%{dist} %if 0%{?fedora} == 25 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index f578cd6723..8177b7d92a 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 2b05409df5..9f9c2ef023 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.4 %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 93b0c933b8..df70f8a0aa 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 5.1.3 +%define ver 5.1.4 %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 a2ac6bdf06..745ca62e00 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index ad2e21fcae..ee3a58c647 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.3 +%define ver 5.1.4 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:5.1:574a0d24: pv: debug message with intermediate message to evaluate by pv_evalx()
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: 574a0d245bf1864ca6b855081fd76c721fd19532 URL: https://github.com/kamailio/kamailio/commit/574a0d245bf1864ca6b855081fd76c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-05T11:39:07+02:00 pv: debug message with intermediate message to evaluate by pv_evalx() (cherry picked from commit 03698a4b2ec49896c08a3989403d7e33ff9fb844) --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/574a0d245bf1864ca6b855081fd76c7… Patch: https://github.com/kamailio/kamailio/commit/574a0d245bf1864ca6b855081fd76c7… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 5743dd6d4d..63c158680b 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -933,6 +933,7 @@ int w_pv_evalx(struct sip_msg *msg, char *dst, str *fmt) goto error; } + LM_DBG("preparing to evaluate: [%.*s]\n", tstr.len, tstr.s); if(pv_eval_str(msg, &val.rs, &tstr)<0){ LM_ERR("cannot eval reparsed value of second parameter\n"); return -1;

1 0

git:5.1:12ddd127: dialog: check CSeq careful with track_cseq_updates
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: 12ddd127343f1be98a4556aadd9ccfeafc3fbdc7 URL: https://github.com/kamailio/kamailio/commit/12ddd127343f1be98a4556aadd9ccfe… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-05T11:38:39+02:00 dialog: check CSeq careful with track_cseq_updates to avoid null pointer access for malformed messages (cherry picked from commit 59c7bf4f43a8cd5dcb0555835a064d88679956c5) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/12ddd127343f1be98a4556aadd9ccfe… Patch: https://github.com/kamailio/kamailio/commit/12ddd127343f1be98a4556aadd9ccfe… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 1e343c9981..b97e8f7123 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -73,7 +73,8 @@ static int dlg_cseq_prepare_msg(sip_msg_t *msg) return 1; } - if (parse_headers(msg, HDR_CSEQ_F, 0)==-1) { + if((!msg->cseq && (parse_headers(msg,HDR_CSEQ_F,0)<0 || !msg->cseq)) + || !msg->cseq->parsed){ LM_DBG("parsing cseq header failed\n"); return 2; }

1 0

Releasing Kamailio v5.1.4
by Daniel-Constantin Mierla 05 Jun '18

05 Jun '18

Hello, I am considering to release a new minor version out of branch 5.1, respectively the v5.1.4, sometime next week, likely on Tuesday, June 5, 2018. As usual, if there is any issue not yet reported on github tracker, do it as soon as possible to give it a chance to be fixed. Soon I am going to do the backports of commits with fixes in master that apply in branch 5.1, so keep a close eye and if someone is missing, let me know to push it in the stable branch. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com

3 3

git:5.1:fa87c0be: pkg/kamailio/deb: version set to 5.1.4
by Victor Seva 05 Jun '18

05 Jun '18

Module: kamailio Branch: 5.1 Commit: fa87c0be79e7e12f3ec57c8ec532f0240b7cdb31 URL: https://github.com/kamailio/kamailio/commit/fa87c0be79e7e12f3ec57c8ec532f02… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-05T11:16:16+02:00 pkg/kamailio/deb: version set to 5.1.4 --- Modified: pkg/kamailio/deb/buster/changelog 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/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/fa87c0be79e7e12f3ec57c8ec532f02… Patch: https://github.com/kamailio/kamailio/commit/fa87c0be79e7e12f3ec57c8ec532f02… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index b07aa09c42..b078c9f9a7 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.4) unstable; urgency=medium + + * version set to 5.1.4 + + -- Victor Seva <vseva(a)debian.org> Tue, 05 Jun 2018 11:15:39 +0200 + kamailio (5.1.3) unstable; urgency=medium * version set to 5.1.3

1 0

[kamailio/kamailio] change ims_diameter_server to allow binary data transcoding (#1528)
by Sergey Zyrianov 05 Jun '18

05 Jun '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [ ] 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  Diameter request MAR and corresponding response MAA both contain authentication vectors in binary form. Ims_diameter_server lacks functionality to convert binary arrays to json and back. This pr is a couple of minor fixes to rectify the issue: * when converting Diameter binary vector to json use %02x in sprintf() to form a proper hexdump which is possible to decode on json side. The hexdump is sent in "data" key value pair as string. * introduce new key value pair "hexdump" in json which will contain hex dump of binary vector formed on json side. ims_diameter_server converts it to Diameter AVP using hex dump to binary transcoding. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1528 -- Commit Summary -- * use hexdump type of string to send binary data in json * duplicate before giving it to cdp * converting binary data to hex dump requires fixed width lenght in snprintf -- File Changes -- M src/modules/ims_diameter_server/avp_helper.c (50) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1528.patch https://github.com/kamailio/kamailio/pull/1528.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/1528

3 6

git:master:97fa06d8: Merge pull request #1528 from omnicate/master
by GitHub 05 Jun '18

05 Jun '18

Module: kamailio Branch: master Commit: 97fa06d85ebb4a512ae6d6a35ab0e8189a397226 URL: https://github.com/kamailio/kamailio/commit/97fa06d85ebb4a512ae6d6a35ab0e81… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-05T06:33:46+02:00 Merge pull request #1528 from omnicate/master ims_diameter_server: Allow binary data transcoding --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/97fa06d85ebb4a512ae6d6a35ab0e81… Patch: https://github.com/kamailio/kamailio/commit/97fa06d85ebb4a512ae6d6a35ab0e81… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 3cd878f7d2..9f6b67cf2e 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -42,6 +42,7 @@ #include "../../core/basex.h" #define STRSIZE 8*1024 +#define HEXDUMP "hexdump" // ID of current message static unsigned int current_msg_id = 0; @@ -109,7 +110,7 @@ cJSON * avp2json(AAA_AVP *avp_t) { case AAA_AVP_DATA_TYPE: l = 0; for (i=0; i < avp_t->data.len; i++) { - l+=snprintf(dest+l,STRSIZE-l-1,"%x", ((unsigned char*)avp_t->data.s)[i]); + l+=snprintf(dest+l,STRSIZE-l-1,"%02x", ((unsigned char*)avp_t->data.s)[i]); } cJSON_AddStringToObject(avp, "data", dest); if (avp_t->data.len == 4) { @@ -250,6 +251,34 @@ int diameterserver_add_avp_list(AAA_AVP_LIST *list, char *d, int len, int avp_co return 1; } +unsigned int parse_hex_half_digit(const char * str) { + if (*str>='0' && *str<='9') { + return (*str)-'0'; + } else if (*str>='A' && *str<='F') { + return 10+(*str)-'A'; + } else if (*str>='a' && *str<='f') { + return 10+(*str)-'a'; + } + return 0; + +} + +char* parse_hexdump(const char * hexdump) { + const char *src = hexdump; + char *hexdump_copy = strdup(hexdump); + unsigned char *dst = (unsigned char*)hexdump_copy; + while (*src) { + unsigned h=parse_hex_half_digit(src++); + h=h<<4; + if (!*src) { + return hexdump_copy; + } + h+=parse_hex_half_digit(src++); + *dst++ = (unsigned char) h; + } + return hexdump_copy; +} + void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level) { int flags; char x[4]; @@ -274,13 +303,16 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level if (cJSON_GetObjectItem(item,"string")) { LM_DBG("%i) String: %s\n", level, cJSON_GetObjectItem(item,"string")->valuestring); } + if (cJSON_GetObjectItem(item,HEXDUMP)) { + LM_DBG("%i) String: %s\n", level, cJSON_GetObjectItem(item,HEXDUMP)->valuestring); + } if (cJSON_GetObjectItem(item,"int32")) { LM_DBG("%i) Integer: %i\n", level, cJSON_GetObjectItem(item,"int32")->valueint); } if (!cJSON_GetObjectItem(item,"avpCode")) { LM_WARN("mandatory field missing: avpCode\n"); - return; + return; } if (!cJSON_GetObjectItem(item,"vendorId")) { LM_WARN("mandatory field missing: vendorId (avpCode %i)\n", cJSON_GetObjectItem(item,"avpCode")->valueint); @@ -327,8 +359,20 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level strlen(cJSON_GetObjectItem(item,"string")->valuestring), cJSON_GetObjectItem(item,"avpCode")->valueint, flags, cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); } + } else if (cJSON_GetObjectItem(item,HEXDUMP)) { + char * binary_form = parse_hexdump(cJSON_GetObjectItem(item,HEXDUMP)->valuestring); + if (list) { + diameterserver_add_avp_list(list, binary_form, + strlen(cJSON_GetObjectItem(item,HEXDUMP)->valuestring) / 2, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, + cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); + } else { + diameterserver_add_avp(response, binary_form, + strlen(cJSON_GetObjectItem(item,HEXDUMP)->valuestring) / 2, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, + cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); + } + free(binary_form); } else { - LM_WARN("Not a string, int32, list? Invalid field definition... (%i:%i)\n", + LM_WARN("Not a string, int32, list, hexdump? Invalid field definition... (%i:%i)\n", cJSON_GetObjectItem(item,"avpCode")->valueint, cJSON_GetObjectItem(item,"vendorId")->valueint); } }

1 0

git:master:0d0fb3aa: change to ims_diameter_server module to allow binary data transcoding
by sergey 05 Jun '18

05 Jun '18

Module: kamailio Branch: master Commit: 0d0fb3aae63ec4e05506b5dbeaea97f199e0400a URL: https://github.com/kamailio/kamailio/commit/0d0fb3aae63ec4e05506b5dbeaea97f… Author: sergey <sergey(a)comoyo.com> Committer: sergey <sergey(a)comoyo.com> Date: 2018-05-11T12:40:14+02:00 change to ims_diameter_server module to allow binary data transcoding ims_diameter_server: handle binary data in json/Diameter - parselist() added 'hexdump' key to receive binary array in json - avp2json() added width parameter to snprintf to make proper hexdump which is sent in json as 'data' --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/0d0fb3aae63ec4e05506b5dbeaea97f… Patch: https://github.com/kamailio/kamailio/commit/0d0fb3aae63ec4e05506b5dbeaea97f… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 3cd878f7d2..9f6b67cf2e 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -42,6 +42,7 @@ #include "../../core/basex.h" #define STRSIZE 8*1024 +#define HEXDUMP "hexdump" // ID of current message static unsigned int current_msg_id = 0; @@ -109,7 +110,7 @@ cJSON * avp2json(AAA_AVP *avp_t) { case AAA_AVP_DATA_TYPE: l = 0; for (i=0; i < avp_t->data.len; i++) { - l+=snprintf(dest+l,STRSIZE-l-1,"%x", ((unsigned char*)avp_t->data.s)[i]); + l+=snprintf(dest+l,STRSIZE-l-1,"%02x", ((unsigned char*)avp_t->data.s)[i]); } cJSON_AddStringToObject(avp, "data", dest); if (avp_t->data.len == 4) { @@ -250,6 +251,34 @@ int diameterserver_add_avp_list(AAA_AVP_LIST *list, char *d, int len, int avp_co return 1; } +unsigned int parse_hex_half_digit(const char * str) { + if (*str>='0' && *str<='9') { + return (*str)-'0'; + } else if (*str>='A' && *str<='F') { + return 10+(*str)-'A'; + } else if (*str>='a' && *str<='f') { + return 10+(*str)-'a'; + } + return 0; + +} + +char* parse_hexdump(const char * hexdump) { + const char *src = hexdump; + char *hexdump_copy = strdup(hexdump); + unsigned char *dst = (unsigned char*)hexdump_copy; + while (*src) { + unsigned h=parse_hex_half_digit(src++); + h=h<<4; + if (!*src) { + return hexdump_copy; + } + h+=parse_hex_half_digit(src++); + *dst++ = (unsigned char) h; + } + return hexdump_copy; +} + void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level) { int flags; char x[4]; @@ -274,13 +303,16 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level if (cJSON_GetObjectItem(item,"string")) { LM_DBG("%i) String: %s\n", level, cJSON_GetObjectItem(item,"string")->valuestring); } + if (cJSON_GetObjectItem(item,HEXDUMP)) { + LM_DBG("%i) String: %s\n", level, cJSON_GetObjectItem(item,HEXDUMP)->valuestring); + } if (cJSON_GetObjectItem(item,"int32")) { LM_DBG("%i) Integer: %i\n", level, cJSON_GetObjectItem(item,"int32")->valueint); } if (!cJSON_GetObjectItem(item,"avpCode")) { LM_WARN("mandatory field missing: avpCode\n"); - return; + return; } if (!cJSON_GetObjectItem(item,"vendorId")) { LM_WARN("mandatory field missing: vendorId (avpCode %i)\n", cJSON_GetObjectItem(item,"avpCode")->valueint); @@ -327,8 +359,20 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level strlen(cJSON_GetObjectItem(item,"string")->valuestring), cJSON_GetObjectItem(item,"avpCode")->valueint, flags, cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); } + } else if (cJSON_GetObjectItem(item,HEXDUMP)) { + char * binary_form = parse_hexdump(cJSON_GetObjectItem(item,HEXDUMP)->valuestring); + if (list) { + diameterserver_add_avp_list(list, binary_form, + strlen(cJSON_GetObjectItem(item,HEXDUMP)->valuestring) / 2, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, + cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); + } else { + diameterserver_add_avp(response, binary_form, + strlen(cJSON_GetObjectItem(item,HEXDUMP)->valuestring) / 2, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, + cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_DUPLICATE_DATA, __FUNCTION__); + } + free(binary_form); } else { - LM_WARN("Not a string, int32, list? Invalid field definition... (%i:%i)\n", + LM_WARN("Not a string, int32, list, hexdump? Invalid field definition... (%i:%i)\n", cJSON_GetObjectItem(item,"avpCode")->valueint, cJSON_GetObjectItem(item,"vendorId")->valueint); } }

1 0

[kamailio/kamailio] cfgutils route_if_exists causing leak (#1503)
by Julien Chavanton 04 Jun '18

04 Jun '18

### Description cfgutils route_if_exists can leak when 1: using a $var or $avp 2: some functions are called within the called route ### Troubleshooting #### Reproduction Note the route is executed from `rtimer` in case this is part of the problem somehow. ``` modparam("rtimer", "timer", "name=tmetrics;interval=9;mode=1;") modparam("rtimer", "exec", "timer=tmetrics;route=test") ``` example : ``` route[dummy] { xinfo("[dummy]"); statsd_gauge("dummy_1xx", $stat(1xx_replies)); } route[test] { $var(route_name) = "dummy"; route_if_exists($var(route_name)); ] ``` working alternative ``` route[dummy] { xinfo("[dummy]"); statsd_gauge("dummy_1xx", $stat(1xx_replies)); } route[test] { $var(route_name) = "dummy"; if (check_route_exists($var(route_name))) { route($var(route_name)); } } ``` #### Debugging Data ``` kamcmd pkg.stats you can see the `real_used` of the timer process with leak every time the route is called ``` -- 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/1503

2 5

git:5.1:942445c2: ims_isc: initial fix of issue #1168
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: 5.1 Commit: 942445c2c3844ae5d2692d7c734cb1375caed849 URL: https://github.com/kamailio/kamailio/commit/942445c2c3844ae5d2692d7c734cb13… Author: valentin <christoph.valentin(a)kapsch.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T15:06:15+02:00 ims_isc: initial fix of issue #1168 Function isc_match_filter() got a new local variable firstflag in order to handle the case where a FAILURE_ROUTE callback is received before the first AS has been contacted. The firstflag is also forwarded to function isc_forward() as parameter. --- Modified: src/modules/ims_isc/ims_isc_mod.c Modified: src/modules/ims_isc/isc.c Modified: src/modules/ims_isc/isc.h --- Diff: https://github.com/kamailio/kamailio/commit/942445c2c3844ae5d2692d7c734cb13… Patch: https://github.com/kamailio/kamailio/commit/942445c2c3844ae5d2692d7c734cb13… --- diff --git a/src/modules/ims_isc/ims_isc_mod.c b/src/modules/ims_isc/ims_isc_mod.c index e0f7b940ee..4618ca7db1 100644 --- a/src/modules/ims_isc/ims_isc_mod.c +++ b/src/modules/ims_isc/ims_isc_mod.c @@ -224,6 +224,8 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { //sometimes s is populated by an ims_getter method cscf_get_terminating_user that alloc memory that must be free-ed at the end int free_s = 0; + //the callback from the Cx interface in case of unreg terminating initial message is a FAILURE_ROUTE. Hence we need an addl. flag + int firstflag = 0; int ret = ISC_RETURN_FALSE; isc_mark new_mark, old_mark; @@ -245,9 +247,10 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { LM_DBG("Message returned s=%d;h=%d;d=%d;a=%.*s\n", old_mark.skip, old_mark.handling, old_mark.direction, old_mark.aor.len, old_mark.aor.s); } else { LM_DBG("Starting triggering\n"); + firstflag = 1; } - if (is_route_type(FAILURE_ROUTE)) { + if (is_route_type(FAILURE_ROUTE) && !firstflag) { /* need to find the handling for the failed trigger */ if (dir == DLG_MOBILE_ORIGINATING) { k = cscf_get_originating_user(msg, &s); @@ -345,7 +348,7 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { new_mark.skip = m->index + 1; new_mark.handling = m->default_handling; new_mark.aor = s; - ret = isc_forward(msg, m, &new_mark); + ret = isc_forward(msg, m, &new_mark, firstflag); isc_free_match(m); goto done; } @@ -383,7 +386,7 @@ int isc_match_filter(struct sip_msg *msg, char *str1, udomain_t* d) { new_mark.skip = m->index + 1; new_mark.handling = m->default_handling; new_mark.aor = s; - ret = isc_forward(msg, m, &new_mark); + ret = isc_forward(msg, m, &new_mark, firstflag); isc_free_match(m); goto done; } diff --git a/src/modules/ims_isc/isc.c b/src/modules/ims_isc/isc.c index 3d1fdf5c46..a095e054e7 100644 --- a/src/modules/ims_isc/isc.c +++ b/src/modules/ims_isc/isc.c @@ -56,7 +56,7 @@ * @param mark - the isc_mark that should be used to mark the message * @returns #ISC_RETURN_TRUE if OK, #ISC_RETURN_ERROR if not */ -int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark) { +int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark, int firstflag) { struct cell *t; unsigned int hash, label; ticks_t fr_timeout, fr_inv_timeout; @@ -75,7 +75,7 @@ int isc_forward(struct sip_msg *msg, isc_match *m, isc_mark *mark) { memcpy(msg->dst_uri.s, m->server_name.s, m->server_name.len); /* append branch if last trigger failed */ - if (is_route_type(FAILURE_ROUTE)) + if (is_route_type(FAILURE_ROUTE) && !firstflag) append_branch(msg, &(msg->first_line.u.request.uri), &(msg->dst_uri), 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0); // Determines the tm transaction identifiers. diff --git a/src/modules/ims_isc/isc.h b/src/modules/ims_isc/isc.h index 8c3715e347..ac012162fd 100644 --- a/src/modules/ims_isc/isc.h +++ b/src/modules/ims_isc/isc.h @@ -66,7 +66,7 @@ extern int isc_fr_inv_timeout; /**< default ISC INVITE response timeout in ms * /** SIP Status Code to send to client on Session Termination because AS did not respond */ -int isc_forward( struct sip_msg *msg, isc_match *m,isc_mark *mark); +int isc_forward( struct sip_msg *msg, isc_match *m,isc_mark *mark, int firstflag); #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018