bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-23 09:25:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ipset: optimize codes

Browse Source
This commit is contained in:
nadoo 2022-01-23 00:13:49 +08:00
parent faae2a9e22
commit b21ce3394d
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ipset/ipset_linux.go
View File

@ -15,28 +15,32 @@ type Manager struct {
domainSet sync.Map domainSet sync.Map
} }
func addToSet(s, item string) error {
if strings.IndexByte(item, '.') == -1 {
return ipset.Add(s+"6", item)
}
return ipset.Add(s, item)
}
// NewManager returns a Manager // NewManager returns a Manager
func NewManager(rules []*rule.Config) (*Manager, error) { func NewManager(rules []*rule.Config) (*Manager, error) {
if err := ipset.Init(); err != nil { if err := ipset.Init(); err != nil {
return nil, err return nil, err
} }
// create ipset, avoid redundant.
sets := make(map[string]struct{})
for _, r := range rules {
if r.IPSet != "" {
sets[r.IPSet] = struct{}{}
}
}
for set := range sets {
createSet(set)
}
// init ipset
m := &Manager{} m := &Manager{}
sets := make(map[string]struct{})
for _, r := range rules { for _, r := range rules {
if r.IPSet != "" { if r.IPSet != "" {
if _, ok := sets[r.IPSet]; !ok {
sets[r.IPSet] = struct{}{}
ipset.Create(r.IPSet)
ipset.Flush(r.IPSet)
ipset.Create(r.IPSet+"6", ipset.OptIPv6())
ipset.Flush(r.IPSet + "6")
}
for _, domain := range r.Domain { for _, domain := range r.Domain {
m.domainSet.Store(domain, r.IPSet) m.domainSet.Store(domain, r.IPSet)
} }
@ -65,20 +69,5 @@ func (m *Manager) AddDomainIP(domain, ip string) error {
addToSet(setName.(string), ip) addToSet(setName.(string), ip)
} }
} }
return nil return nil
} }
func createSet(s string) {
ipset.Create(s)
ipset.Flush(s)
ipset.Create(s+"6", ipset.OptIPv6())
ipset.Flush(s + "6")
}
func addToSet(s, item string) error {
if strings.IndexByte(item, '.') == -1 {
return ipset.Add(s+"6", item)
}
return ipset.Add(s, item)
}