kor-elf-shield/go-nftables-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Refactor chain commands to use nftCommand utilities for improved code reuse

Browse Source
This commit is contained in:
Leonid Nikitin
2026-04-26 16:05:16 +05:00
parent 8fdecbcd8d
commit 7dc8436ad8
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/chain/chain.go
+6 -5
View File
@@ -5,6 +5,7 @@ import (
"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract" "git.kor-elf.net/kor-elf-shield/go-nftables-client/contract"
"git.kor-elf.net/kor-elf-shield/go-nftables-client/contract/nft" "git.kor-elf.net/kor-elf-shield/go-nftables-client/contract/nft"
"git.kor-elf.net/kor-elf-shield/go-nftables-client/family" "git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
nftCommand "git.kor-elf.net/kor-elf-shield/go-nftables-client/internal/pkg/nft"
) )
type chain struct { type chain struct {
@@ -18,26 +19,26 @@ func New(command contract.Command) nft.Chain {
} }
func (c *chain) Add(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) error { func (c *chain) Add(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) error {
args := []string{"add", "chain", family.String(), tableName, chainName, baseChain.String()} args := nftCommand.ChainAdd(family, tableName, chainName, baseChain)
return c.command.Run(args...) return c.command.Run(args...)
} }
func (c *chain) Create(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) error { func (c *chain) Create(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) error {
args := []string{"create", "chain", family.String(), tableName, chainName, baseChain.String()} args := nftCommand.ChainCreate(family, tableName, chainName, baseChain)
return c.command.Run(args...) return c.command.Run(args...)
} }
func (c *chain) Delete(family family.Type, tableName string, chainName string) error { func (c *chain) Delete(family family.Type, tableName string, chainName string) error {
args := []string{"delete", "chain", family.String(), tableName, chainName} args := nftCommand.ChainDelete(family, tableName, chainName)
return c.command.Run(args...) return c.command.Run(args...)
} }
func (c *chain) Clear(family family.Type, tableName string, chainName string) error { func (c *chain) Clear(family family.Type, tableName string, chainName string) error {
args := []string{"flush", "chain", family.String(), tableName, chainName} args := nftCommand.ChainClear(family, tableName, chainName)
return c.command.Run(args...) return c.command.Run(args...)
} }
func (c *chain) Rename(family family.Type, tableName string, oldChainName string, newChainName string) error { func (c *chain) Rename(family family.Type, tableName string, oldChainName string, newChainName string) error {
args := []string{"rename", "chain", family.String(), tableName, oldChainName, newChainName} args := nftCommand.ChainRename(family, tableName, oldChainName, newChainName)
return c.command.Run(args...) return c.command.Run(args...)
} }
internal/pkg/nft/chain.go
+26
View File
@@ -0,0 +1,26 @@
package nft
import (
chain2 "git.kor-elf.net/kor-elf-shield/go-nftables-client/chain"
"git.kor-elf.net/kor-elf-shield/go-nftables-client/family"
)
func ChainAdd(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) []string {
return []string{"add", "chain", family.String(), tableName, chainName, baseChain.String()}
}
func ChainCreate(family family.Type, tableName string, chainName string, baseChain chain2.ChainOptions) []string {
return []string{"create", "chain", family.String(), tableName, chainName, baseChain.String()}
}
func ChainDelete(family family.Type, tableName string, chainName string) []string {
return []string{"delete", "chain", family.String(), tableName, chainName}
}
func ChainClear(family family.Type, tableName string, chainName string) []string {
return []string{"flush", "chain", family.String(), tableName, chainName}
}
func ChainRename(family family.Type, tableName string, oldChainName string, newChainName string) []string {
return []string{"rename", "chain", family.String(), tableName, oldChainName, newChainName}
}