OSDN Git Service

v2raya: fix patch path
authorTianling Shen <cnsztl@immortalwrt.org>
Mon, 25 Apr 2022 04:39:26 +0000 (12:39 +0800)
committerTianling Shen <cnsztl@immortalwrt.org>
Mon, 25 Apr 2022 04:39:26 +0000 (12:39 +0800)
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
v2raya/patches/0001-fix-add-fallback-DNS-for-DNS-inbound-for-non-A-AAAA-.patch
v2raya/patches/0002-fix-bad-routing-caused-by-commit-add-fallback-DNS-fo.patch
v2raya/patches/0003-fix-resolv.LookupHost-problem-and-non-A-AAAA-CNAME-p.patch
v2raya/patches/0004-fix-routing-some-outboundTag-were-not-be-transformed.patch

index d7880cb..9cdf986 100644 (file)
@@ -8,10 +8,10 @@ Subject: [PATCH 1/4] fix: add fallback DNS for DNS inbound for
  service/core/v2ray/v2rayTmpl.go | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/service/core/v2ray/v2rayTmpl.go b/service/core/v2ray/v2rayTmpl.go
+diff --git a/core/v2ray/v2rayTmpl.go b/core/v2ray/v2rayTmpl.go
 index 1c46b3a..41ba452 100644
---- a/service/core/v2ray/v2rayTmpl.go
-+++ b/service/core/v2ray/v2rayTmpl.go
+--- a/core/v2ray/v2rayTmpl.go
++++ b/core/v2ray/v2rayTmpl.go
 @@ -1063,8 +1063,9 @@ func (t *Template) setInbound() error {
                                Listen:   "0.0.0.0",
                                Settings: &coreObj.InboundSettings{
index 476cbd3..6967f13 100644 (file)
@@ -8,10 +8,10 @@ Subject: [PATCH 2/4] fix: bad routing caused by commit 'add fallback DNS for
  service/core/v2ray/v2rayTmpl.go | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/service/core/v2ray/v2rayTmpl.go b/service/core/v2ray/v2rayTmpl.go
+diff --git a/core/v2ray/v2rayTmpl.go b/core/v2ray/v2rayTmpl.go
 index 41ba452..92ecfbb 100644
---- a/service/core/v2ray/v2rayTmpl.go
-+++ b/service/core/v2ray/v2rayTmpl.go
+--- a/core/v2ray/v2rayTmpl.go
++++ b/core/v2ray/v2rayTmpl.go
 @@ -1064,8 +1064,8 @@ func (t *Template) setInbound() error {
                                Settings: &coreObj.InboundSettings{
                                        Network: "udp",
index 6f8f3be..a1c52d7 100644 (file)
@@ -9,10 +9,10 @@ Subject: [PATCH 3/4] fix: resolv.LookupHost problem and non-A/AAAA/CNAME
  service/core/v2ray/v2rayTmpl.go   | 5 +++--
  2 files changed, 4 insertions(+), 3 deletions(-)
 
-diff --git a/service/common/resolv/resolver.go b/service/common/resolv/resolver.go
+diff --git a/common/resolv/resolver.go b/common/resolv/resolver.go
 index 5cfaefc..5191a5e 100644
---- a/service/common/resolv/resolver.go
-+++ b/service/common/resolv/resolver.go
+--- a/common/resolv/resolver.go
++++ b/common/resolv/resolver.go
 @@ -26,7 +26,7 @@ func init() {
        rand.Seed(time.Now().UnixNano())
        dialer := net.Dialer{Timeout: 1000 * time.Millisecond}
@@ -22,10 +22,10 @@ index 5cfaefc..5191a5e 100644
                StrictErrors: false,
                Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
                        server := dnsServers[rand.Intn(len(dnsServers))]
-diff --git a/service/core/v2ray/v2rayTmpl.go b/service/core/v2ray/v2rayTmpl.go
+diff --git a/core/v2ray/v2rayTmpl.go b/core/v2ray/v2rayTmpl.go
 index 92ecfbb..1bc6881 100644
---- a/service/core/v2ray/v2rayTmpl.go
-+++ b/service/core/v2ray/v2rayTmpl.go
+--- a/core/v2ray/v2rayTmpl.go
++++ b/core/v2ray/v2rayTmpl.go
 @@ -976,6 +976,8 @@ func (t *Template) appendDNSOutbound() {
        t.Outbounds = append(t.Outbounds, coreObj.OutboundObject{
                Tag:      "dns-out",
index c621e78..af5bfcc 100644 (file)
@@ -8,10 +8,10 @@ Subject: [PATCH 4/4] fix(routing): some outboundTag were not be transformed to
  service/core/v2ray/v2rayTmpl.go | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
 
-diff --git a/service/core/v2ray/v2rayTmpl.go b/service/core/v2ray/v2rayTmpl.go
+diff --git a/core/v2ray/v2rayTmpl.go b/core/v2ray/v2rayTmpl.go
 index 1bc6881..e6f4bb0 100644
---- a/service/core/v2ray/v2rayTmpl.go
-+++ b/service/core/v2ray/v2rayTmpl.go
+--- a/core/v2ray/v2rayTmpl.go
++++ b/core/v2ray/v2rayTmpl.go
 @@ -1539,19 +1539,12 @@ func NewTemplate(serverInfos []serverInfo, setting *configure.Setting) (t *Templ
                        return nil, err
                }