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

move options to separated struct

Browse Source
This commit is contained in:
Vladimir Avtsenov 2024-08-30 04:09:28 +03:00
parent 8a90cc437f
commit c15afecdb9
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
group.go
View File

@ -2,8 +2,13 @@ package main
import "kvas2-go/models" import "kvas2-go/models"
type GroupOptions struct {
Enabled bool
FWMark uint32
Table uint16
}
type Group struct { type Group struct {
*models.Group *models.Group
FWMark uint32 options GroupOptions
Table uint16
} }

21
kvas2.go
View File

@ -101,12 +101,16 @@ func (a *App) Listen(ctx context.Context) []error {
} }
func (a *App) usingGroup(idx int) error { func (a *App) usingGroup(idx int) error {
fwmark, err := ipHelper.GetUnusedFwMark() if a.Groups[idx].options.Enabled {
return nil
}
fwmark, err := ipHelper.GetUnusedFwMark(1)
if err != nil { if err != nil {
return fmt.Errorf("error while getting fwmark: %w", err) return fmt.Errorf("error while getting fwmark: %w", err)
} }
table, err := ipHelper.GetUnusedTable() table, err := ipHelper.GetUnusedTable(1)
if err != nil { if err != nil {
return fmt.Errorf("error while getting table: %w", err) return fmt.Errorf("error while getting table: %w", err)
} }
@ -119,14 +123,21 @@ func (a *App) usingGroup(idx int) error {
return errors.New(string(out)) return errors.New(string(out))
} }
a.Groups[idx].FWMark = fwmark a.Groups[idx].options.Enabled = true
a.Groups[idx].Table = table a.Groups[idx].options.FWMark = fwmark
a.Groups[idx].options.Table = table
return nil return nil
} }
func (a *App) releaseGroup(idx int) error { func (a *App) releaseGroup(idx int) error {
out, err := ipHelper.ExecIp("rule", "del", "fwmark", strconv.Itoa(int(a.Groups[idx].FWMark)), "table", strconv.Itoa(int(a.Groups[idx].Table))) if !a.Groups[idx].options.Enabled {
return nil
}
fwmark := strconv.Itoa(int(a.Groups[idx].options.FWMark))
table := strconv.Itoa(int(a.Groups[idx].options.Table))
out, err := ipHelper.ExecIp("rule", "del", "fwmark", fwmark, "table", table)
if err != nil { if err != nil {
return err return err
} }

8
pkg/ip-helper/ip-helper.go
View File

@ -61,13 +61,13 @@ func GetUsedFwMarks() ([]uint32, error) {
return marks, nil return marks, nil
} }
func GetUnusedFwMark() (uint32, error) { func GetUnusedFwMark(startFrom uint32) (uint32, error) {
usedFwMarks, err := GetUsedFwMarks() usedFwMarks, err := GetUsedFwMarks()
if err != nil { if err != nil {
return 0, fmt.Errorf("error while getting used fwmarks: %w", err) return 0, fmt.Errorf("error while getting used fwmarks: %w", err)
} }
fwmark := uint32(1) fwmark := startFrom
for slices.Contains(usedFwMarks, fwmark) { for slices.Contains(usedFwMarks, fwmark) {
fwmark++ fwmark++
if fwmark == 0xFFFFFFFF { if fwmark == 0xFFFFFFFF {
@ -182,13 +182,13 @@ func GetUsedTables() ([]uint16, error) {
return tables, nil return tables, nil
} }
func GetUnusedTable() (uint16, error) { func GetUnusedTable(startFrom uint16) (uint16, error) {
usedTables, err := GetUsedTables() usedTables, err := GetUsedTables()
if err != nil { if err != nil {
return 0, fmt.Errorf("error while getting used tables: %w", err) return 0, fmt.Errorf("error while getting used tables: %w", err)
} }
tableID := uint16(1) tableID := startFrom
for slices.Contains(usedTables, tableID) { for slices.Contains(usedTables, tableID) {
tableID++ tableID++
if tableID > 0x3FF { if tableID > 0x3FF {