<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [ ] 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: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> 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
Could you make a single patch and format the commit message as per contributing guidelines?
* https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md#com...
If not coming handy to you, is still ok. Once @ngvoice and others approve this PR, I can merge it manually, fixing the commit message format -- so do not merge it from the web interface here.
@miconda ok, sorry
I guess @ngvoice has been busy.
One question @szcom - is this change backwards compatible, in the way that is not breaking things when used together with older versions? If not, maybe it is better to add a mod param to control that, making it also easier to decide to merge.
Merged #1528.
Hi,
sorry, we seem to do "Worldwide voice"*) these days... ;-)
Reviewed and Okay!
Thanks for the commit, Carsten
*) "Worldwide-Voice" was the claim of my former employer, but they never lived up to it.....
ngvoice commented on this pull request.
Everything looks okay.