<!-- 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
`loose_route()` in `rr` checks request src ip/port against ip/port in flow tokens to detect direction and decide whether to apply flow tokens routing: ``` static inline int process_outbound(struct sip_msg *_m, str flow_token) { ... } else if(!ip_addr_cmp(&rcv->src_ip, &_m->rcv.src_ip) || rcv->src_port != _m->rcv.src_port) { LM_DBG(""incoming" request found. Using flow-token for " "routing\n"); ... ```
there are cases when remote UA changes ip/port for in-dialog messages and this approach does not work. incoming message has route set with flow tokens and src ip/port different from ones in the flow tokens. as a result, `loose_route()` routes message back to the client using flow tokens instead of using the normal part of the Route headers as expected.
new `force_lr_no_outbound_flag` allows to control flow tokens usage in the `loose_route()` when we know direction based on the some high level config logic (for example: by the result of `ds_is_from_list()` call)
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4280
-- Commit Summary --
* rr: add force_lr_no_outbound_flag param
-- File Changes --
M src/modules/rr/doc/rr_admin.xml (17) M src/modules/rr/loose.c (6) M src/modules/rr/rr_mod.c (9)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4280.patch https://github.com/kamailio/kamailio/pull/4280.diff
miconda left a comment (kamailio/kamailio#4280)
I haven't looked at the code or tried to understand properly the use case, but I would suggest that the new parameter has a more generic name, like `mode` (or `lr_mode` if it is more specific to loose-routing), with the value being set based on flags (bits), so later it can be reused if a new matching (or processing) mode needs to be added.
In general is not recommended to have long names for parameters, what they supposed to do should be in the docs, not necessarily reflected by their names.
furmur left a comment (kamailio/kamailio#4280)
@miconda, as an option, i can also rewrite it as an additional mode id for `loose_route_mode(vmode)`. what do you think?
furmur left a comment (kamailio/kamailio#4280)
changed to use new _vmode_ value in `loose_route_mode(vmode)` instead of the `force_lr_no_outbound_flag` param
miconda left a comment (kamailio/kamailio#4280)
I think it is better so, more flexible via function param.
Merged #4280 into master.