base sagernet and migrate to circleci
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/route/conn.go
|
||||
+++ b/route/conn.go
|
||||
@@ -96,7 +96,7 @@
|
||||
@@ -98,7 +98,7 @@
|
||||
remoteConn net.Conn
|
||||
err error
|
||||
)
|
||||
|
||||
@@ -1,14 +1,6 @@
|
||||
--- a/route/route.go
|
||||
+++ b/route/route.go
|
||||
@@ -372,6 +372,7 @@
|
||||
}
|
||||
}
|
||||
} else {
|
||||
+ // OMV: some codes about process routing are deleted here for unknown reason, it may break something.
|
||||
for _, address := range metadata.DestinationAddresses {
|
||||
if address.Is6() {
|
||||
newDestination = address
|
||||
@@ -796,6 +797,7 @@
|
||||
@@ -894,6 +894,7 @@
|
||||
return err
|
||||
}
|
||||
metadata.DestinationAddresses = addresses
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
--- a/route/rule/rule_action.go
|
||||
+++ b/route/rule/rule_action.go
|
||||
@@ -112,6 +112,7 @@
|
||||
DisableCache: action.ResolveOptions.DisableCache,
|
||||
RewriteTTL: action.ResolveOptions.RewriteTTL,
|
||||
ClientSubnet: action.ResolveOptions.ClientSubnet.Build(netip.Prefix{}),
|
||||
+ MatchOnly: action.ResolveOptions.MatchOnly,
|
||||
@@ -116,6 +116,7 @@
|
||||
DisableOptimisticCache: action.ResolveOptions.DisableOptimisticCache,
|
||||
RewriteTTL: action.ResolveOptions.RewriteTTL,
|
||||
ClientSubnet: action.ResolveOptions.ClientSubnet.Build(netip.Prefix{}),
|
||||
+ MatchOnly: action.ResolveOptions.MatchOnly, // OMV
|
||||
}, nil
|
||||
default:
|
||||
panic(F.ToString("unknown rule action: ", action.Action))
|
||||
@@ -476,6 +477,7 @@
|
||||
DisableCache bool
|
||||
RewriteTTL *uint32
|
||||
ClientSubnet netip.Prefix
|
||||
+ MatchOnly bool
|
||||
@@ -552,6 +553,7 @@
|
||||
DisableOptimisticCache bool
|
||||
RewriteTTL *uint32
|
||||
ClientSubnet netip.Prefix
|
||||
+ MatchOnly bool // OMV
|
||||
}
|
||||
|
||||
func (r *RuleActionResolve) Type() string {
|
||||
|
||||
Reference in New Issue
Block a user