purgatory/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-04-04 06:13:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

prepend rules when no cleanup

Browse source
This commit is contained in:
hossinasaadi 2025-03-26 20:45:53 +04:00
parent 5b5ccc1b6a
commit 670f2ec94f
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/router/command/command.go
View file

@ -55,7 +55,7 @@ func (s *routingServer) OverrideBalancerTarget(ctx context.Context, request *Ove
func (s *routingServer) AddRule(ctx context.Context, request *AddRuleRequest) (*AddRuleResponse, error) {
if bo, ok := s.router.(routing.Router); ok {
return &AddRuleResponse{}, bo.AddRule(request.Config, request.ShouldAppend)
return &AddRuleResponse{}, bo.AddRule(request.Config, request.ShouldAppend, false)
}
return nil, errors.New("unsupported router implementation")

4
app/router/restriction.go
View file

@ -39,7 +39,7 @@ func (r *Router) RestrictionRule(restriction *route.Restriction, ip net.IP) erro
rule.RoutingRule.SourceGeoip = append(rule.RoutingRule.SourceGeoip, sourceIP)
r.RemoveRule(restriction.Tag)
return r.ReloadRules(&Config{Rule: []*RoutingRule{rule.RoutingRule}}, true)
return r.ReloadRules(&Config{Rule: []*RoutingRule{rule.RoutingRule}}, true, restriction.CleanInterval == 0)
}
}
}
@ -52,7 +52,7 @@ func (r *Router) RestrictionRule(restriction *route.Restriction, ip net.IP) erro
}
errors.LogWarning(r.ctx, "restrict IP -> ", ip.String(), " for route violation.")
return r.ReloadRules(&Config{Rule: []*RoutingRule{newRule}}, true)
return r.ReloadRules(&Config{Rule: []*RoutingRule{newRule}}, true, restriction.CleanInterval == 0)
}
func shouldCleanup(restriction *route.Restriction) bool {

10
app/router/router.go
View file

@ -101,12 +101,12 @@ func (r *Router) AddRule(config *serial.TypedMessage, shouldAppend bool) error {
return err
}
if c, ok := inst.(*Config); ok {
return r.ReloadRules(c, shouldAppend)
return r.ReloadRules(c, shouldAppend, false)
}
return errors.New("AddRule: config type error")
}
func (r *Router) ReloadRules(config *Config, shouldAppend bool) error {
func (r *Router) ReloadRules(config *Config, shouldAppend bool, prependRules bool) error {
r.mu.Lock()
defer r.mu.Unlock()
@ -147,7 +147,11 @@ func (r *Router) ReloadRules(config *Config, shouldAppend bool) error {
}
rr.Balancer = brule
}
r.rules = append(r.rules, rr)
if prependRules {
r.rules = append([]*Rule{rr}, r.rules...)
} else {
r.rules = append(r.rules, rr)
}
}
return nil

4
features/routing/router.go
View file

@ -16,7 +16,7 @@ type Router interface {
// PickRoute returns a route decision based on the given routing context.
PickRoute(ctx Context) (Route, error)
AddRule(config *serial.TypedMessage, shouldAppend bool) error
AddRule(config *serial.TypedMessage, shouldAppend bool, prependRules bool) error
RemoveRule(tag string) error
RestrictionRule(restriction *route.Restriction, ip net.IP) error
}
@ -62,7 +62,7 @@ func (DefaultRouter) PickRoute(ctx Context) (Route, error) {
}
// AddRule implements Router.
func (DefaultRouter) AddRule(config *serial.TypedMessage, shouldAppend bool) error {
func (DefaultRouter) AddRule(config *serial.TypedMessage, shouldAppend bool, prependRules bool) error {
return common.ErrNoClue
}