Browse Source

Merge branch 'master' of github.com:v2fly/v2ray-core

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Shelikhoo 5 years ago
parent
commit
9e62f4a934
4 changed files with 5 additions and 5 deletions
  1. 1 1
      app/proxyman/inbound/worker.go
  2. 1 1
      azure-pipelines.template.yml
  3. 2 2
      azure-pipelines.yml
  4. 1 1
      core.go

+ 1 - 1
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 {

+ 1 - 1
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)'

+ 2 - 2
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

+ 1 - 1
core.go

@@ -19,7 +19,7 @@ import (
 )
 
 var (
-	version  = "4.24.0"
+	version  = "4.24.2"
 	build    = "Custom"
 	codename = "V2Fly, a community-driven edition of V2Ray."
 	intro    = "A unified platform for anti-censorship."