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

batman-adv: update to current openwrt-routing / batman-adv v2019.2 #1733

Merged
merged 2 commits into from
Jun 7, 2019

Conversation

T-X
Copy link
Contributor

@T-X T-X commented May 29, 2019

This updates the batman-adv OpenWrt package to the current version provided in the master branch of the openwrt-routing packages repository (minus config changes).

The second patch then enables the batman-adv multicast optimizations again.

@T-X T-X added 0. type: enhancement The changeset is an enhancement 3. topic: batman-adv labels May 29, 2019
@T-X
Copy link
Contributor Author

T-X commented May 29, 2019

This partially applies #1357:

  • multicast-to-multi-unicast was added in and released with batman-adv v2019.2
  • reenables multicast optimizations

What is not added from #1357 yet:

  • batman-adv noflood patch
  • firewall changes/relaxations

Which in practice means that this should reduce ICMPv6 (and ARP, a few changes in that for batman-adv, too) overhead. But does not allow using multicast for arbitrary addresses yet.

@rotanid
Copy link
Member

rotanid commented May 30, 2019

thanks!
have you run-tested this? if yes and i don't see a veto in the next days, i will merge it - it's master branch after all.

@T-X
Copy link
Contributor Author

T-X commented May 30, 2019

I run-tested it with x86 Gluon via KVM. batman-adv started fine in those three VMs, they were talking to each other and settings were applied.

@neocturne
Copy link
Member

I started a similar update a while ago, with a few more changes. I've just pushed that to the branch wip/update-batadv.

My changes are currently blocked by the implementation of additional netlink interfaces in batadv-legacy, so the same batctl commands are usable for both compat versions.

@rotanid
Copy link
Member

rotanid commented May 31, 2019

@NeoRaider your comment doesn't say anything though about whether you prefer to finalize your own patches or are ok with the patches prepared here by TX? please comment on this ;-)

@T-X
Copy link
Contributor Author

T-X commented Jun 4, 2019

@NeoRaider: Awesome! Yes, updating the full openwrt-routing to master is indeed another, good option.

Ideally I would like to have batman-adv v2019.2 in master sooner than later, due to the approaching BattleMesh. So just in case, if someone were to spot any tricky issues in their setup we would be able to investigate and fix it quickly in Paris.

So if openwrt-routing were updated to master in the next few days that would be great. Otherwise, would there be any cons of applying this PR now and then later, without hurry updating to openwrt-routing master?

@neocturne
Copy link
Member

As I don't see batadv-legacy getting the missing netlink calls in the next few days, I propose to go with the small update for now, and update to the routing master later.

@rotanid
Copy link
Member

rotanid commented Jun 5, 2019

@T-X do you need to include the fix from 9e00ecd / #1446 here before we merge this PR ?

@rotanid rotanid added this to the 2019.1 milestone Jun 6, 2019
@rotanid rotanid added the 1. severity: blocker This issue/pr is required for the next release label Jun 6, 2019
T-X added 2 commits June 7, 2019 13:44
This updates the batman-adv OpenWrt package to the current version
provided in the master branch of the openwrt-routing packages
repository:

* e26096a batman-adv: Fix duplicated OGMs on NETDEV_UP
* 1ff00ee batman-adv: upgrade package to latest release 2019.2

Small difference to the original:

* Compat code for batadv_genl_dump_check_consistent()
* Compat code for cfg80211_sinfo_release_content()
* 0001-batman-adv-add-compat-hacks.patch kept
* batctl dependency kept removed
* config related files unchanged

The new config format was not backported yet to keep this patch small
and less invasive.

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Several fixes and enhancements related to multicast were added upstream
in batman-adv. So let's give the batman-adv multicast optimizations
another go.

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
@T-X
Copy link
Contributor Author

T-X commented Jun 7, 2019

Changelog v2:

@rotanid rotanid merged commit 9b1eb40 into freifunk-gluon:master Jun 7, 2019
@rotanid
Copy link
Member

rotanid commented Jul 9, 2019

this change was reverted:
b41ee49
c1a7733
reason according to commit message:
Fixes #1756

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0. type: enhancement The changeset is an enhancement 1. severity: blocker This issue/pr is required for the next release 3. topic: batman-adv
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants