search

herlesupreeth / kamailio

Kamailio - The Open Source SIP Server for large VoIP and real-time communication platforms -
https://www.kamailio.org
Other
16 stars 18 forks source link

Migration of your patches based on version 5.3 to version 5.7.2 of kamailio #6

Closed axelsommerfeldt closed 8 months ago

axelsommerfeldt commented 11 months ago

See also: https://github.com/herlesupreeth/kamailio/issues/1

I have cherry-picked your patches (taken from your 5.3 branch) and have resolved the conflicts by carefully migrating the patches.

BUT: While I'm confident that applying and adapting your patches to version 5.6 worked out fine, I'm not so confident regarding this 5.7 branch since the ipsec port mapping has significantly changed from 5.6 to 5.7.

The affected patches which could only be applied partly (or even wrongly?) are:

  1. IPSec fixes (27.08.2020 22:28:44 +0200)
  2. Handle deletion of redundant IPSec tunnels which arise in SQN mismatch scenario (31.08.2020 08:44:03 +0200)
  3. Reuse IPSec ports but remove SA and Policies (10.04.2021 20:14:41 +0200)
  4. Try for TCP if UDP fails (22.06.2021 10:51:35 +0200)
herlesupreeth commented 8 months ago

Hey, the maintainer of kamailio managed to take all the fixes and port it to upstream master branch. So I will be closing this PR. Thanks for your effort and sorry I couldn't review this PR.

axelsommerfeldt commented 6 months ago

Hi Herle, that's good news!

I finally have found some time to review the changes in upstream and have found two discrepancies between your commits here in your fork and upstream:

https://github.com/kamailio/kamailio/issues/3772

Could you take a look at it?

herlesupreeth commented 6 months ago

Thank you @axelsommerfeldt . I have commented here https://github.com/kamailio/kamailio/issues/3772