Fix override gateway parsing and bump release to r3

This commit is contained in:
2026-07-08 09:46:55 +03:00
parent ceb79a3043
commit 0f34db73d5
5 changed files with 7 additions and 3 deletions
+1 -1
View File
@@ -1 +1 @@
1.13.14-rr-edition-2.5.0-r2 1.13.14-rr-edition-2.5.0-r3
+6 -2
View File
@@ -29,13 +29,17 @@ func NewRuleAction(ctx context.Context, logger logger.ContextLogger, action opti
case "": case "":
return nil, nil return nil, nil
case C.RuleActionTypeRoute: case C.RuleActionTypeRoute:
overrideGateway := M.ParseAddr(action.RouteOptions.OverrideGateway) var overrideGateway *netip.Addr
if action.RouteOptions.OverrideGateway != "" {
parsed := M.ParseAddr(action.RouteOptions.OverrideGateway)
overrideGateway = &parsed
}
return &RuleActionRoute{ return &RuleActionRoute{
Outbound: action.RouteOptions.Outbound, Outbound: action.RouteOptions.Outbound,
RuleActionRouteOptions: RuleActionRouteOptions{ RuleActionRouteOptions: RuleActionRouteOptions{
OverrideAddress: M.ParseSocksaddrHostPort(action.RouteOptions.OverrideAddress, 0), OverrideAddress: M.ParseSocksaddrHostPort(action.RouteOptions.OverrideAddress, 0),
OverridePort: action.RouteOptions.OverridePort, OverridePort: action.RouteOptions.OverridePort,
OverrideGateway: &overrideGateway, OverrideGateway: overrideGateway,
NetworkStrategy: (*C.NetworkStrategy)(action.RouteOptions.NetworkStrategy), NetworkStrategy: (*C.NetworkStrategy)(action.RouteOptions.NetworkStrategy),
FallbackDelay: time.Duration(action.RouteOptions.FallbackDelay), FallbackDelay: time.Duration(action.RouteOptions.FallbackDelay),
UDPDisableDomainUnmapping: action.RouteOptions.UDPDisableDomainUnmapping, UDPDisableDomainUnmapping: action.RouteOptions.UDPDisableDomainUnmapping,