From 3507f39677ca764e03bd8e2f960b0aeb808d194c Mon Sep 17 00:00:00 2001 From: rprx <63339210+rprx@users.noreply.github.com> Date: Wed, 3 Jun 2020 14:51:09 +0000 Subject: [PATCH 1/5] Update azure-pipelines.yml --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 94f214d1..6e2949c9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,7 +42,7 @@ jobs: - checkout: self - task: GoTool@0 inputs: - version: '1.14.1' + version: '1.14.4' - script: | bash ./testing/coverage/coverall workingDirectory: '$(Build.SourcesDirectory)' @@ -66,7 +66,7 @@ jobs: - checkout: self - task: GoTool@0 inputs: - version: '1.14.1' + version: '1.14.4' - script: | mkdir triggersrc ls -I "triggersrc" | xargs cp -rf -t triggersrc From 2ef709997b183250fe7ff80ebbacf0601b3ca9f9 Mon Sep 17 00:00:00 2001 From: rprx <63339210+rprx@users.noreply.github.com> Date: Wed, 3 Jun 2020 14:52:30 +0000 Subject: [PATCH 2/5] Update azure-pipelines.template.yml --- azure-pipelines.template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.template.yml b/azure-pipelines.template.yml index da062e07..a982efbe 100644 --- a/azure-pipelines.template.yml +++ b/azure-pipelines.template.yml @@ -9,7 +9,7 @@ jobs: - checkout: self - task: GoTool@0 inputs: - version: '1.13' + version: '1.14' - script: | go test -p 1 -v -timeout 30m ./... workingDirectory: '$(Build.SourcesDirectory)' From dc906cf68a529df965ecfa5dc8650284d270f460 Mon Sep 17 00:00:00 2001 From: zhuobixin <49975911+zhuobixin@users.noreply.github.com> Date: Fri, 5 Jun 2020 11:17:02 +0800 Subject: [PATCH 3/5] LocalAddr() should return local address --- app/proxyman/inbound/worker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/proxyman/inbound/worker.go b/app/proxyman/inbound/worker.go index 2a2793eb..d2a9bc02 100644 --- a/app/proxyman/inbound/worker.go +++ b/app/proxyman/inbound/worker.go @@ -198,7 +198,7 @@ func (c *udpConn) RemoteAddr() net.Addr { } func (c *udpConn) LocalAddr() net.Addr { - return c.remote + return c.local } func (*udpConn) SetDeadline(time.Time) error { From e920d39b11cf671461b513b3ec9edcdbf58581aa Mon Sep 17 00:00:00 2001 From: Xiaokang Wang Date: Wed, 10 Jun 2020 18:13:43 +0800 Subject: [PATCH 4/5] Update core.go Update Version --- core.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.go b/core.go index 62d87caa..e5f282f5 100755 --- a/core.go +++ b/core.go @@ -19,7 +19,7 @@ import ( ) var ( - version = "4.24.0" + version = "4.24.1" build = "Custom" codename = "V2Fly, a community-driven edition of V2Ray." intro = "A unified platform for anti-censorship." From 4eeb913c9a11a9e4f5ce6474c90ccc27eda1d5e4 Mon Sep 17 00:00:00 2001 From: Xiaokang Wang Date: Wed, 10 Jun 2020 18:17:18 +0800 Subject: [PATCH 5/5] Update core.go --- core.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.go b/core.go index e5f282f5..61330688 100755 --- a/core.go +++ b/core.go @@ -19,7 +19,7 @@ import ( ) var ( - version = "4.24.1" + version = "4.24.2" build = "Custom" codename = "V2Fly, a community-driven edition of V2Ray." intro = "A unified platform for anti-censorship."