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

revert changes which can be packaged #1

Closed
wants to merge 18 commits into from

Conversation

maurerle
Copy link

@maurerle maurerle commented Nov 2, 2024

This reverts the two vpn provider related patches, which are not required when using gluon-mesh-vpn-parker or ffbs-mesh-vpn-parker from SmithChart/community-packages@topic/parker...ffac:community-packages:parker

@SmithChart
Copy link

please rebase

@maurerle
Copy link
Author

I would rather force-push the v2023.2.x-parker branch to drop those two patches.

This PR was meant to test this concept and it seems that it works fine with the latest ffbs-mesh-vpn-parker package

@maurerle maurerle changed the title V2023.2.x parker revert changes which can be packaged Nov 27, 2024
@maurerle
Copy link
Author

I added staging removals.
When building parker with the changes from these two pull-requests, everything should be working fine:
SmithChart/community-packages#2
SmithChart/community-packages#3

This should be the next thing to test

@SmithChart
Copy link

I would rather force-push the v2023.2.x-parker branch to drop those two patches.

This PR was meant to test this concept and it seems that it works fine with the latest ffbs-mesh-vpn-parker package

I would prefer a force-push instead of reverting, too. If you are interested I can give you access to this repo.

SmithChart and others added 15 commits November 27, 2024 21:01
This change removes the prefix4 and prefix6 attributes from the
site.conf. These do not make sense in the context of parker.

Packages that are usually used in parker do not use these anymore. Some
other packages do - you should not enable those :-)

With this change a ipv6 route to prefix_6 will no longer be set on
br-client. Systems that already have this route will keep it.

With this change the (not working) redirect in the http status page has
been removed. We should consider to add this later on.
respondd drops existing json object if any provider returns NULL, so we need to
return an empty object instead.
For parker we need DHCP on the client interface. Ths rule
prevents us from doing so.
In addition: make sure old rules will be deleted on upgrade.
Finding the actual IPv4 address of the node relied on "-br" of ip.
Since Gluon v2022 we must live with busybox ip...
This change works around this change...
A popen of `ebtables` can block, when there is already another instance
running.
This timeout was intended to be 1 second.
So we should wait at least that long.

Signed-off-by: Chris Fiege <[email protected]>
For the redirect login implemented for parker, it is beneficial to keep
a list of seen routers and mark them as expired instead of removing them
from the global routers list. This way we don't enter a new redirect
entry for the same router when it shows up again after a mesh link
failure.

All foreach loops should be adjusted to correctly ignore expired
routers.

Signed-off-by: Rouven Czerwinski <[email protected]>
This change overrides the gluon-core vpn-provider logic and makes sure
that mesh-vpn get's enabled when the user set the corresponding option
in the wizzard.
It also sets the simple-tc traffic limits.
@SmithChart
Copy link

I added staging removals. When building parker with the changes from these two pull-requests, everything should be working fine: SmithChart/community-packages#2 SmithChart/community-packages#3

This should be the next thing to test

SmithChart/community-packages#3 has been merged. Commits have been dropped.
SmithChart/community-packages#2 has discussion going on.

@SmithChart
Copy link

SmithChart/community-packages#2 has been merged.

@SmithChart
Copy link

I have cherry-picked a0a5f16 and f969b5e and will squash them into the corresponding commits later on.
2870d72 already been applied.

@maurerle Please check if I've integrated it all correctly. Feel free to close if it looks good :-)

@SmithChart SmithChart mentioned this pull request Dec 15, 2024
@maurerle maurerle closed this Dec 15, 2024
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