Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support ELL 0.68 l_netlink_message API. #303

Merged
merged 4 commits into from
Sep 14, 2024

Conversation

ossama-othman
Copy link
Member

@ossama-othman ossama-othman commented Sep 11, 2024

ELL 0.68 introduced a non-backward compatible change to its API by introducing a new l_netlink_message API to simplify use of the l_netlink_send() function. Support both the pre- and post- ELL 0.68 versions of the l_netlink_send() function.

Fixes #299.

ELL 0.68 introduced a non-backward compatible change to its API by
introducing a new l_netlink_message API to simplify use of the
l_netlink_send() function.  Check for the existence of the new API in
the mptcpd configure script.
Support both the pre- and post- ELL 0.68 versions of l_netlink_send()
function.
@ossama-othman
Copy link
Member Author

ossama-othman commented Sep 11, 2024

I'm not happy with the #ifdef blocks introduced by this change, but it should at least get mptcpd working with ELL 0.68.

@coveralls
Copy link

coveralls commented Sep 11, 2024

Pull Request Test Coverage Report for Build 10860934691

Details

  • 4 of 6 (66.67%) changed or added relevant lines in 1 file are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.03%) to 64.799%

Changes Missing Coverage Covered Lines Changed/Added Lines %
lib/network_monitor.c 4 6 66.67%
Files with Coverage Reduction New Missed Lines %
lib/network_monitor.c 1 44.75%
Totals Coverage Status
Change from base Build 10680769314: 0.03%
Covered Lines: 1399
Relevant Lines: 2159

💛 - Coveralls

Copy link
Member

@matttbe matttbe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ossama-othman thank you very much for having share these patches so quickly! I'm fine with the current modifications. I have one small suggestion, but that's up to you.

lib/network_monitor.c Outdated Show resolved Hide resolved
lib/network_monitor.c Outdated Show resolved Hide resolved
lib/network_monitor.c Outdated Show resolved Hide resolved
Refactor #ifdef blocks containing calls to the pre- and post-0.68
ELL l_netlink_send() calls to a separate helper functions.  This
simplifies the code, and obviates the need to have an #ifdef block
each time l_netlink_send() is called.  Many thanks to Matthieu Baerts
for making this suggestion.
@ossama-othman ossama-othman changed the title Support ELL l_netlink_message API. Support new ELL l_netlink_message API. Sep 14, 2024
@ossama-othman ossama-othman changed the title Support new ELL l_netlink_message API. Support ELL 0.68 l_netlink_message() API. Sep 14, 2024
@ossama-othman ossama-othman changed the title Support ELL 0.68 l_netlink_message() API. Support ELL 0.68 l_netlink_message API. Sep 14, 2024
@ossama-othman ossama-othman self-assigned this Sep 14, 2024
@ossama-othman ossama-othman added the bug Something isn't working label Sep 14, 2024
Copy link
Member

@matttbe matttbe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the recent modifications. LGTM!

@matttbe matttbe merged commit ffa276f into multipath-tcp:main Sep 14, 2024
6 checks passed
@Anankke
Copy link

Anankke commented Oct 5, 2024

Will we have a new release for this?

@ossama-othman ossama-othman deleted the l_netlink_send branch October 7, 2024 07:42
@ossama-othman
Copy link
Member Author

I'd be happy to make a new release. @matttbe Is that fine with you?

@matttbe
Copy link
Member

matttbe commented Oct 7, 2024

I'd be happy to make a new release. @matttbe Is that fine with you?

@ossama-othman if you don't mind, yes please! :)

If I remember well, we need to change the lib version (current++ & age++ I think)

@matttbe
Copy link
Member

matttbe commented Oct 7, 2024

@ossama-othman oh, if we update the lib version due to the new API entry, maybe I should finish the code I started a long time ago to support the "listening" events.

@matttbe
Copy link
Member

matttbe commented Oct 7, 2024

@ossama-othman oh, if we update the lib version due to the new API entry, maybe I should finish the code I started a long time ago to support the "listening" events.

Mmh, I thought I had something in a more advanced stage than that... I just shared what I had in #304 :)

@matttbe
Copy link
Member

matttbe commented Oct 17, 2024

Please note that I got this notification on Debian side:

mptcpd 0.12-4 is marked for autoremoval from testing on 2024-11-05

It is affected by these RC bugs:
1084302: mptcpd: FTBFS: network_monitor.c:1019:28: error: passing argument 2 of 'l_netlink_send' makes pointer from integer without a cast [-Wint-conversion]
 https://bugs.debian.org/1084302

If a new version -- ideally including #304 and the two next ones -- cannot be prepared in the meantime, I will patch the 0.12 version on Debian side to avoid the removal.

@matttbe matttbe mentioned this pull request Oct 25, 2024
@matttbe
Copy link
Member

matttbe commented Oct 26, 2024

I'd be happy to make a new release. @matttbe Is that fine with you?

@ossama-othman : are you still OK to make a new release now that the other PRs have been closed? :)
No hurry, it is just to know who is going to be in charge of that :)

Note that it might be good to add a checklist in a file somewhere about what needs to be done in case of new release: changing mptcpd version in configure.ac, check libtool version, creating a (signed?) tag, adding the info in the "Releases" section on GitHub + the NEWS files, updating the gh-pages branch, send an email on the MPTCP ML, check the AUTHORS file (my email address is probably wrong there BTW), and I probably missed something :)

@ossama-othman
Copy link
Member Author

ossama-othman commented Oct 29, 2024

@ossama-othman : are you still OK to make a new release now that the other PRs have been closed? :) No hurry, it is just to know who is going to be in charge of that :)

Sure. I'll create a release PR this weekend, if that's okay with you.

Note that it might be good to add a checklist in a file somewhere about what needs to be done in case of new release: changing mptcpd version in configure.ac, check libtool version, creating a (signed?) tag, adding the info in the "Releases" section on GitHub + the NEWS files, updating the gh-pages branch, send an email on the MPTCP ML, check the AUTHORS file (my email address is probably wrong there BTW), and I probably missed something :)

That's a good idea. I'll write one up, too.

@matttbe
Copy link
Member

matttbe commented Oct 29, 2024

@ossama-othman : are you still OK to make a new release now that the other PRs have been closed? :) No hurry, it is just to know who is going to be in charge of that :)

Sure. I'll create a release PR this weekend, if that's okay with you.

Sounds good to me, thank you!

Note that it might be good to add a checklist in a file somewhere about what needs to be done in case of new release: changing mptcpd version in configure.ac, check libtool version, creating a (signed?) tag, adding the info in the "Releases" section on GitHub + the NEWS files, updating the gh-pages branch, send an email on the MPTCP ML, check the AUTHORS file (my email address is probably wrong there BTW), and I probably missed something :)

That's a good idea. I'll do write one up, too.

Thanks!

@matttbe
Copy link
Member

matttbe commented Nov 14, 2024

Note that it might be good to add a checklist in a file somewhere about what needs to be done in case of new release: changing mptcpd version in configure.ac, check libtool version, creating a (signed?) tag, adding the info in the "Releases" section on GitHub + the NEWS files, updating the gh-pages branch, send an email on the MPTCP ML, check the AUTHORS file (my email address is probably wrong there BTW), and I probably missed something :)

I just added a new page in the wiki: https://github.com/multipath-tcp/mptcpd/wiki/Maintainers

Do not hesitate to improve it ;-)

@ossama-othman
Copy link
Member Author

@matttbe Thanks for doing that. I'll take a look this weekend. Cheers!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support ELL >=0.68
4 participants