[kamailio/kamailio] fixed handle_ruri_alias_mode(1) cannot proper handle multi alias (PR #3863)

List overview All Threads
Download

newer

older

git:master:e9481214: dmq_usrloc:...

git:master:3d187336: nathelper:...

Lv Xiaobu

29 May 2024 29 May '24

4:16 a.m.

when receive BYE sip:xxx@xxxx;alias=ip1;alias=ip2 SIP/2.0, handle_ruri_alias_mode(1) doesn't work as documented You can view, comment on, or merge this pull request online at:

https://github.com/kamailio/kamailio/pull/3863

-- Commit Summary --

* fixed handle_ruri_alias_mode(1) cannot proper handle multi alias

-- File Changes --

M src/modules/nathelper/nathelper.c (2)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/3863.patch https://github.com/kamailio/kamailio/pull/3863.diff

-- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3863 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3863@github.com>

Attachments:

attachment.html (text/html — 2.6 KB)

Show replies by date

Daniel-Constantin Mierla

30 May 30 May

8:28 a.m.

Thanks for proposing the fix, it will be reviewed. Note that you have to format the commit message as per contributing guidelines:

- https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md#com...

-- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3863#issuecomment-2138774362 You are receiving this because you are subscribed to this thread. Message ID: kamailio/kamailio/pull/3863/c2138774362@github.com

Xenofon Karamanos

31 May 31 May

1:25 p.m.

Updated the commit's message to match the guidelines and will be merged soon if no more comments.

-- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3863#issuecomment-2141827856 You are receiving this because you are subscribed to this thread. Message ID: kamailio/kamailio/pull/3863/c2141827856@github.com

Xenofon Karamanos

3 Jun 3 Jun

4:28 p.m.

@miconda @henningw Indeed the patch seems to resolve the problem. The issue seems to be happening due to the line here. https://github.com/kamailio/kamailio/blob/51dcab019a42e5b1f3b81247ca71ffcaf4...

We use the `rest=start;` to search for the parameters of `alias`, but in the while above `rest` and `rest_len` are changed for `mode=1`. Specifically, the problem is in `rest_len` in 1184 which does not represent the length of `start` anymore , but still used.

Removing the two lines as suggested, fixes the problem since the search is still done correctly.

Also, I believe the `+4` is not needed anymore. https://github.com/kamailio/kamailio/blob/51dcab019a42e5b1f3b81247ca71ffcaf4...

-- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3863#issuecomment-2145347550 You are receiving this because you are subscribed to this thread. Message ID: kamailio/kamailio/pull/3863/c2145347550@github.com

Daniel-Constantin Mierla

4 Jun 4 Jun

10:57 a.m.

@xkaraman: I am fine to merge it if you reviewed it and fixes it.

-- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3863#issuecomment-2146980949 You are receiving this because you are subscribed to this thread. Message ID: kamailio/kamailio/pull/3863/c2146980949@github.com

Xenofon Karamanos

11:39 a.m.

@xkaraman pushed 2 commits.

642dd10c3968468a4a1201e5a39f138f5bcf510f nathelper: fixed handle_ruri_alias_mode(1) cannot proper handle multi alias 32c73c34c8eaaa703693de414a72058db8423f23 nathelper: remove magic constant

-- View it on GitHub: https://github.com/kamailio/kamailio/pull/3863/files/1a8b474b00e53e12326eb53... You are receiving this because you are subscribed to this thread. Message ID: kamailio/kamailio/pull/3863/push/18720697247@github.com

Xenofon Karamanos

11:42 a.m.

@miconda Yeap, i did some experiments with the patch and it works as intended now.

Rebased to master, removed the `+4` magic constant and will merge when checks pass.

-- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3863#issuecomment-2147087445 You are receiving this because you are subscribed to this thread. Message ID: kamailio/kamailio/pull/3863/c2147087445@github.com

Xenofon Karamanos

12:38 p.m.

Merged #3863 into master.

-- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3863#event-13034200171 You are receiving this because you are subscribed to this thread. Message ID: kamailio/kamailio/pull/3863/issue_event/13034200171@github.com

300

Age (days ago)

306

Last active (days ago)

sr-dev@lists.kamailio.org

7 comments

3 participants

tags (0)

participants (3)

Daniel-Constantin Mierla
Lv Xiaobu
Xenofon Karamanos