From 1a2ce765f93f45f925e4714a82f665515a3f701e Mon Sep 17 00:00:00 2001 From: Vladimir Avtsenov Date: Mon, 21 Oct 2024 22:36:02 +0300 Subject: [PATCH] fix naming --- kvas2.go | 10 +++++----- main.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kvas2.go b/kvas2.go index aff8866..9b6f242 100644 --- a/kvas2.go +++ b/kvas2.go @@ -24,8 +24,8 @@ var ( type Config struct { MinimalTTL time.Duration - ChainPostfix string - IpSetPostfix string + ChainPrefix string + IpSetPrefix string TargetDNSServerAddress string ListenPort uint16 UseSoftwareRouting bool @@ -90,7 +90,7 @@ func (a *App) listen(ctx context.Context) (err error) { } }() - a.dnsOverrider4 = a.NetfilterHelper4.PortRemap(fmt.Sprintf("%sDNSOR", a.Config.ChainPostfix), 53, a.Config.ListenPort) + a.dnsOverrider4 = a.NetfilterHelper4.PortRemap(fmt.Sprintf("%sDNSOR", a.Config.ChainPrefix), 53, a.Config.ListenPort) err = a.dnsOverrider4.Enable() if err != nil { return fmt.Errorf("failed to override DNS: %v", err) @@ -228,7 +228,7 @@ func (a *App) AddGroup(group *models.Group) error { return ErrGroupIDConflict } - ipsetName := fmt.Sprintf("%s%d", a.Config.IpSetPostfix, group.ID) + ipsetName := fmt.Sprintf("%s%d", a.Config.IpSetPrefix, group.ID) ipset, err := a.NetfilterHelper4.IPSet(ipsetName) if err != nil { return fmt.Errorf("failed to initialize ipset: %w", err) @@ -238,7 +238,7 @@ func (a *App) AddGroup(group *models.Group) error { Group: group, iptables: a.NetfilterHelper4.IPTables, ipset: ipset, - ifaceToIPSet: a.NetfilterHelper4.IfaceToIPSet(fmt.Sprintf("%sR_%d", a.Config.ChainPostfix, group.ID), group.Interface, ipsetName, false), + ifaceToIPSet: a.NetfilterHelper4.IfaceToIPSet(fmt.Sprintf("%sR_%d", a.Config.ChainPrefix, group.ID), group.Interface, ipsetName, false), } a.Groups[group.ID] = grp return a.SyncGroup(grp) diff --git a/main.go b/main.go index 22e3c73..1a83e5d 100644 --- a/main.go +++ b/main.go @@ -16,8 +16,8 @@ func main() { app, err := New(Config{ MinimalTTL: time.Hour, - ChainPostfix: "KVAS2_", - IpSetPostfix: "kvas2_", + ChainPrefix: "KVAS2_", + IpSetPrefix: "kvas2_", TargetDNSServerAddress: "127.0.0.1:53", ListenPort: 7548, })