<!-- 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 --> - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> - Received param was enclosed in quotes, making some UACs stumble upon it. This fix removes the quotes, adding the received param the same way as it is done for example in the path module. - Reported by Arslan Aseed.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1203
-- Commit Summary --
* nathelper: correct Contact received param
-- File Changes --
M src/modules/nathelper/nathelper.c (6)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1203.patch https://github.com/kamailio/kamailio/pull/1203.diff
I never used the function and I am not sure about its role/where is useful.
However, the current behaviour is correct if the received is added as header parameter -- enclosing it in quotes is ok there. Without enclosing it, there can be `received=uri;transport=xyz`, so transport becomes another parameter of the header, no longer part of received value.
Then: adding `received="uri;transport=xyz"` to URI in Contact is indeed invalid, but also removing the quotes is not ok. The transport becomes parameter to URI, not part of received parameter. In this case, the `=` has to be escaped.
But again, wonder when this is useful and if escaping is fixing it overall or breaks it even more so other parts need also patches.
I have never used it myself. I just wanted to help this one mailing list post, but of course, this commit is broken.
I just looked into the path module how it's done there, and there exists a struct for different transports:
```const static char *proto_strings[] = { [PROTO_TCP] = "%3Btransport%3Dtcp", [PROTO_TLS] = "%3Btransport%3Dtls", [PROTO_SCTP] = "%3Btransport%3Dsctp", [PROTO_WS] = "%3Btransport%3Dws", [PROTO_WSS] = "%3Btransport%3Dws", };```
This gets appended to the received param if needed. Then a Path header looks like this:
```Path: sip:1.2.3.4;lr;received=sip:4.3.2.1:49194%3Btransport%3Dtcp.```
Unfortunately I'm not able to implement that for the nathelper module as my C knowledge is limited to doing such trivial stuff like the commit above.
Even with that format, I encountered some issues with a PBX, I guess it was doing first unescape of the whole Path URI and then parsing it, because it was taking wrong transport. That's the reason the master branch has now the option in path module to add received in the form of `alias`, like `ip~port~protoid`.
Adding it to URI in escaped format might not be that difficult, the question would be if the app interpreting it is going to do it right.
Okay, so should we just add a comment in the documentation warning people of known bugs? Or what would the clean solution be? Maybe just eliminate that function in master and let it die?
Adding an warning note in the docs should be done, indeed. The issue seems only when adding the parameter to Contact URI, not to header.
I have run into this issue too. Thanks for the patch.
After testing, I see that the contact header is malformed-- missing the `>` at the end, e.g.:
add_rcv_param("1");
*Contact: <sip:1000@192.168.1.116:23439;transport=tcp;avaya-sc-enabled;received=sip:24.228.40.101:23439;transport=TCP*
The reason why I am having issues here is because on kamailio 4.0 I see these when an invite comes in:
ERROR: <core> [parser/parse_to.c:733]: parse_to(): ERROR: parse_to : unexpected char ["] in status 6:
I cannot upgrade yet, but perhaps there is a commit that fixes this issue that I can backport?
Closed #1203.
I pushed a patch to make it compliant with SIP specs by not having the value enclosed in quotes when adding it to Contact URI, but that introduced a restriction to be used only for UDP traffic, otherwise there will be two contact parameters. I added notes in the docs for it.
-
Daniel-Constantin Mierla -
Matt Williamson
-
Sebastian Damm