Ponywka/MagiTrickle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix naming

Browse Source
This commit is contained in:
Vladimir Avtsenov 2024-10-21 22:36:02 +03:00
parent b446b5969f
commit 1a2ce765f9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kvas2.go
View File

@ -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)

4
main.go
View File

@ -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,
})