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

Upstream vpn package again #38

Merged
merged 23 commits into from
Sep 18, 2023
Merged

Conversation

awlx
Copy link
Member

@awlx awlx commented Sep 8, 2023

Merge our changes into upstream again.

GoliathLabs and others added 22 commits August 16, 2021 12:37
ffka-gluon-web-usb-wan-hotplug: i18n/de.po: fix typo (#13)

ffmuc-gluon-mesh-vpn-wireguard-vxlan: add package (#6)

Co-authored-by: Annika Wickert <[email protected]>
Co-authored-by: krombel <[email protected]>
Co-authored-by: Martin Weinelt <[email protected]>
Co-authored-by: lqb <[email protected]>
Co-authored-by: lqb <[email protected]>
Co-authored-by: Julian Labus <[email protected]>
Co-authored-by: Tristan Helmich <[email protected]>
Co-authored-by: goligo <[email protected]>

Update Makefile
Renamed ffmuc-gluon-mesh-vpn-wireguard-vxlan to ffmuc-mesh-vpn-wireguard-vxlan
For each reconnection checkuplink was adding an additional entry to the INPUT chain in ip6tables. In case a node does not have WAN connection, but accidentally enabled mesh over VPN, this adding 1440 rules per day or about 40k rules within a month.
In OpenWrt 22.03 the output of nslookup as a colon after "Address", so it was not matched correctly by our regular expression.
Gluon v2022.1 has been refactored in a way, that a mesh-vpn interface is no longer in the network configuration and no longer added to BATMAN automatically, so we now add it explicitly in our script.
Revert "Add mesh-vpn to BATMAN, as Gluon does not do it anymore"
Fix mesh-vpn issues for Gluon v2022.1
This fixes the broken grep to find the batctl gw
@awlx awlx changed the title Upstream vpn pacakge Upstream vpn package again Sep 8, 2023
Copy link
Member

@maurerle maurerle left a comment

Choose a reason for hiding this comment

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

Looks good, thank you!
Should we squash this while merging?
All these merge commits are not needed.
Otherwise one of you could rebase the changes with proper commit messages..?

@awlx awlx merged commit ca08c54 into freifunk-gluon:master Sep 18, 2023
1 check passed
@awlx awlx deleted the fix-stuff branch September 18, 2023 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants