Skip to content

fix: skip nftables cleanup when auto redirect was never started #93

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.

Sign up for GitHub

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

Open
sparkfade wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: skip nftables cleanup when auto redirect was never started #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions redirect_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ type autoRedirect struct {
iptablesPath string
ip6tablesPath string
useNFTables bool
nftablesAccess sync.Mutex
nftablesActive bool
androidVPNService bool
nfqueueHandler *nfqueueHandler
iptablesAccess sync.Mutex
Expand Down Expand Up @@ -133,6 +135,10 @@ func (r *autoRedirect) Start() error {
r.ownedNetworkMonitor = true
}
err = runInNetworkNamespace(r.tunOptions.NetNs, func() error {
// From here on this instance owns the table and must clean it up on close.
r.nftablesAccess.Lock()
r.nftablesActive = true
r.nftablesAccess.Unlock()
r.cleanupNFTables()
setupErr := r.setupNFTables()
if setupErr != nil {
Expand Down Expand Up @@ -380,11 +386,17 @@ func (r *autoRedirect) updateIPTablesNetwork() error {

func (r *autoRedirect) Close() error {
if r.useNFTables {
_ = runInNetworkNamespace(r.tunOptions.NetNs, func() error {
r.cleanupNFTables()
r.cleanupRedirectRoutes()
return nil
})
r.nftablesAccess.Lock()
nftablesActive := r.nftablesActive
r.nftablesActive = false
r.nftablesAccess.Unlock()
if nftablesActive {
_ = runInNetworkNamespace(r.tunOptions.NetNs, func() error {
r.cleanupNFTables()
r.cleanupRedirectRoutes()
return nil
})
}
if r.ownedNetworkMonitor {
_ = r.networkMonitor.Close()
r.ownedNetworkMonitor = false
Expand Down