[kamailio/kamailio] auth_radius, misc_radius: Adds VENDOR() definition if the freeradius-client.h does not contain one (#2530)
<!-- 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 --> - [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: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [X] Related to issue #2496
#### Description <!-- Describe your changes in detail -->
freeradius-client removed the `VENDOR()` definition after commit https://github.com/FreeRADIUS/freeradius-client/commit/50d78bb53f4f341aa708e..., since a new way was added in the library to separate vendor attributes. Currently `(((x) >> 8) & 0xffffff)` to determine vendor id works but is considered old-style. This PR adds the `VENDOR()` definition back if the freeradius-client library we are linking against is after 50d78b.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2530
-- Commit Summary --
* auth_radius, misc_radius: Adds VENDOR() definition if the freeradius-client.h does not contain one already.
-- File Changes --
M src/modules/misc_radius/radius.h (3)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2530.patch https://github.com/kamailio/kamailio/pull/2530.diff
Thanks for the pull request. Why do you defined it differently in your implementation then in the library?
- your request: #define VENDOR(x) (((x) >> 16) & 0xffff) - library: #define VENDOR(x) (((x) >> 8) & 0xffffff)
The initial version of freeradius-client, which kamailio was cross-compiled against, had the vendor id shifted by 16 bits. It was changed to 8 bits after https://github.com/FreeRADIUS/freeradius-client/issues/72 which as stated was a minor improvement since "private enterprise numbers aren't yet at 16 bits" and collisions were not that possible. Later on freeradius-client completely removed `VENDOR()` as part of a different way of handling vendor ids.
Also radcli uses 16 bits for shifting vendor id as seen here https://github.com/radcli/radcli/blob/f0d1a1704595d62182d6a03c980ed07e906374...
so it made more sense to me, to keep 16 bits shifting to both libraries.
I should note, that adding `VENDOR()` is more of a quick workaround at this point to allow kamailio to compile against both libraries with minimum effort. Otherwise a different implementation should be used by kamailio if freeradius-client is used
Thanks for the clarification. Yes, its indeed more a workaround.
Merged #2530 into master.
-
Henning Westerholt -
Paris