apps/openlan
1
0
Fork 0
mirror of https://github.com/luscis/openlan.git synced 2025-10-22 00:19:49 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: fix qos warn && qos rules redundancy when ip changed (#59)

Browse Source
This commit is contained in:
Teddy_Zhu
2024-04-16 19:17:15 +08:00
committed by GitHub
parent c7a27a46bf
commit 85bf6595ec
2 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/network/iptables.go
View File

@@ -129,16 +129,15 @@ func (ru IPRule) Args() []string {
if ru.Output != "" {
args = append(args, "-o", ru.Output)
}
if ru.Comment != "" {
args = append(args, "-m", "comment", "--comment", ru.Comment)
}
if ru.Limit != "" {
args = append(args, "-m", "limit", "--limit", ru.Limit)
}
if ru.LimitBurst != "" {
args = append(args, "--limit-burst", ru.LimitBurst)
}
if ru.Comment != "" {
args = append(args, "-m", "comment", "--comment", ru.Comment)
}
if ru.Jump != "" {
jump := strings.ToUpper(ru.Jump)

40
pkg/switch/qos.go
View File

@@ -62,7 +62,7 @@ func (qr *QosUser) BuildChainIn(chain *cn.FireWallChain) {
}
func (qr *QosUser) BuildChainInJump(chain *cn.FireWallChain) {
if qr.Ip != "" {
if qr.Ip != "" && qr.InSpeed > 0 {
if err := chain.AddRuleX(cn.IPRule{
Comment: "Qos Jump",
Jump: qr.RuleName("in"),
@@ -74,6 +74,8 @@ func (qr *QosUser) BuildChainInJump(chain *cn.FireWallChain) {
}
func (qr *QosUser) ClearChainInJump(chain *cn.FireWallChain) {
if qr.Ip != "" && qr.InSpeed > 0 {
qr.out.Debug("ClearChainInJump: %s", qr.Ip)
if err := chain.DelRuleX(cn.IPRule{
Comment: "Qos Jump",
Jump: qr.RuleName("in"),
@@ -81,6 +83,7 @@ func (qr *QosUser) ClearChainInJump(chain *cn.FireWallChain) {
}); err != nil {
qr.out.Warn("Qos.Del In Rule: %s", err)
}
}
}
func (qr *QosUser) Start(chainIn *cn.FireWallChain) {
@@ -94,8 +97,12 @@ func (qr *QosUser) ReBuild(chainIn *cn.FireWallChain) {
func (qr *QosUser) ClearChainIn(chain *cn.FireWallChain) {
if qr.qosChainIn != nil {
qr.out.Debug("qos chain ClearChainIn start")
if qr.Ip != "" {
qr.ClearChainInJump(chain)
}
qr.qosChainIn.Cancel()
qr.qosChainIn = nil
}
}
@@ -105,23 +112,26 @@ func (qr *QosUser) Clear(chainIn *cn.FireWallChain) {
}
func (qr *QosUser) Update(chainIn *cn.FireWallChain, inSpeed float64, device string, ip string) {
changed := false
qr.Device = device
if qr.Ip != ip {
changed = true
qr.Ip = ip
}
if changed {
qr.ClearChainInJump(chainIn)
qr.BuildChainInJump(chainIn)
}
ipChanged := qr.Ip != ip
speedChanged := qr.InSpeed != inSpeed
if qr.InSpeed != inSpeed {
qr.InSpeed = inSpeed
if speedChanged {
// speed will rebuild jump & limit
qr.ClearChainIn(chainIn)
qr.InSpeed = inSpeed
qr.Ip = ip
qr.BuildChainIn(chainIn)
return
}
if ipChanged {
qr.ClearChainInJump(chainIn)
qr.Ip = ip
qr.BuildChainInJump(chainIn)
} else {
//ignored
}
}
@@ -250,6 +260,8 @@ func (q *QosCtrl) AddOrUpdateQosUser(name string, inSpeed float64) {
}
func (q *QosCtrl) ClientUpdate() {
q.lock.Lock()
defer q.lock.Unlock()
clients := make([]schema.VPNClient, 0, 1024)
for n := range cache.Network.List() {
if n == nil {
@@ -273,12 +285,10 @@ func (q *QosCtrl) ClientUpdate() {
if existClient != nil {
rule.Update(q.chainIn, rule.InSpeed, existClient.Device, existClient.Address)
} else {
if rule.Ip != "" {
rule.ClearChainInJump(q.chainIn)
rule.Ip = ""
}
}
}
}