- A parameter "control_cmd_tos" has been created in order to set the type of service for the control channel.
<!-- 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 --> - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description A parameter "control_cmd_tos" has been created in order to set the type of service for the control channel.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1442
-- Commit Summary --
* rtpengine: setting tos value for the control commands
-- File Changes --
M src/modules/rtpengine/doc/rtpengine_admin.xml (21) M src/modules/rtpengine/rtpengine.c (15)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1442.patch https://github.com/kamailio/kamailio/pull/1442.diff
rfuchs commented on this pull request.
@@ -1675,6 +1677,19 @@ static int build_rtpp_socks() {
LM_WARN("Failed enable set MTU discovery socket option\n"); #endif
+ if((0 <= control_cmd_tos) && (control_cmd_tos < 256)) { + if (pnode->rn_umode == 6) { + setsockopt(rtpp_socks[pnode->idx], IPPROTO_IPV6, + IPV6_TCLASS, &control_cmd_tos, + sizeof(control_cmd_tos)); + + } else { + setsockopt(rtpp_socks[pnode->idx], IPPROTO_IP, + IP_TOS, &control_cmd_tos, + sizeof(control_cmd_tos));
If memory serves right, the argument to IP_TOS should be a single byte `unsigned char`.
hdikme commented on this pull request.
@@ -1675,6 +1677,19 @@ static int build_rtpp_socks() {
LM_WARN("Failed enable set MTU discovery socket option\n"); #endif
+ if((0 <= control_cmd_tos) && (control_cmd_tos < 256)) { + if (pnode->rn_umode == 6) { + setsockopt(rtpp_socks[pnode->idx], IPPROTO_IPV6, + IPV6_TCLASS, &control_cmd_tos, + sizeof(control_cmd_tos)); + + } else { + setsockopt(rtpp_socks[pnode->idx], IPPROTO_IP, + IP_TOS, &control_cmd_tos, + sizeof(control_cmd_tos));
I have updated the code based on your review, if anything needs to be changed let me know please. Thanks for the review.
rfuchs commented on this pull request.
@@ -1675,6 +1677,20 @@ static int build_rtpp_socks() {
LM_WARN("Failed enable set MTU discovery socket option\n"); #endif
+ if((0 <= control_cmd_tos) && (control_cmd_tos < 256)) { + unsigned char tos = control_cmd_tos; + if (pnode->rn_umode == 6) { + setsockopt(rtpp_socks[pnode->idx], IPPROTO_IPV6, + IPV6_TCLASS, &tos, + sizeof(tos));
Sorry, I guess I should have been more clear. The argument to the IPv6 version IPV6_TCLASS is in fact an int. It's just the IPv4 IP_TOS that takes an unsigned char.
hdikme commented on this pull request.
@@ -1675,6 +1677,20 @@ static int build_rtpp_socks() {
LM_WARN("Failed enable set MTU discovery socket option\n"); #endif
+ if((0 <= control_cmd_tos) && (control_cmd_tos < 256)) { + unsigned char tos = control_cmd_tos; + if (pnode->rn_umode == 6) { + setsockopt(rtpp_socks[pnode->idx], IPPROTO_IPV6, + IPV6_TCLASS, &tos, + sizeof(tos));
I have seen in the following link (https://notes.shichao.io/unp/ch7/) that the data type for IP_TOS is "int". Therefore i also changed for IPv4, otherwise your comment was clear. Anyway, i have changed it based on your review again, thank you for your time.
Merged #1442.
-
hdikme -
Richard Fuchs