From dd355b5d98395c92b56e98e9f88a949c969cbe3e Mon Sep 17 00:00:00 2001 From: "arraykeys@gmail.com" Date: Tue, 10 Jul 2018 16:26:26 +0800 Subject: [PATCH] fix socks client check port range --- CHANGELOG | 3 +++ README_ZH.md | 2 +- docs/old-release.md | 1 + install_auto.sh | 2 +- main.go | 2 +- release.sh | 2 +- utils/socks/client.go | 2 +- 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 53d67bd..2c5d6d9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ proxy更新日志 +v5.3 +1.优化了socks_client握手端口判断,避免了sstap测试UDP失败的问题.. + v5.2 1.修复了HTTP(S)\SPS反向代理无法正常工作的问题. 2.优化了智能判断,减少不必要的DNS解析. diff --git a/README_ZH.md b/README_ZH.md index ab923b6..fd5a770 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -48,7 +48,7 @@ Proxy是golang实现的高性能http,https,websocket,tcp,udp,socks5代理服务 - ... -本页是v5.2手册,其他版本手册请点击[这里](docs/old-release.md)查看. +本页是v5.3手册,其他版本手册请点击[这里](docs/old-release.md)查看. ### 怎么找到组织? diff --git a/docs/old-release.md b/docs/old-release.md index 7204b03..d7c3c40 100644 --- a/docs/old-release.md +++ b/docs/old-release.md @@ -1,5 +1,6 @@ # Old Versions of Proxy +- [v5.2手册](https://github.com/snail007/goproxy/tree/v5.2) - [v5.1手册](https://github.com/snail007/goproxy/tree/v5.1) - [v5.0手册](https://github.com/snail007/goproxy/tree/v5.0) - [v4.9手册](https://github.com/snail007/goproxy/tree/v4.9) diff --git a/install_auto.sh b/install_auto.sh index 63b7672..515a2a7 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -5,7 +5,7 @@ if [ -e /tmp/proxy ]; then fi mkdir /tmp/proxy cd /tmp/proxy -wget https://github.com/snail007/goproxy/releases/download/v5.2/proxy-linux-amd64.tar.gz +wget https://github.com/snail007/goproxy/releases/download/v5.3/proxy-linux-amd64.tar.gz # #install proxy tar zxvf proxy-linux-amd64.tar.gz diff --git a/main.go b/main.go index 9d56bb9..900bab4 100644 --- a/main.go +++ b/main.go @@ -9,7 +9,7 @@ import ( "github.com/snail007/goproxy/services" ) -const APP_VERSION = "5.2" +const APP_VERSION = "5.3" func main() { err := initConfig() diff --git a/release.sh b/release.sh index 19c7481..98508d6 100755 --- a/release.sh +++ b/release.sh @@ -1,5 +1,5 @@ #!/bin/bash -VER="5.2" +VER="5.3" RELEASE="release-${VER}" rm -rf .cert mkdir .cert diff --git a/utils/socks/client.go b/utils/socks/client.go index 7b06c1d..2460b3b 100644 --- a/utils/socks/client.go +++ b/utils/socks/client.go @@ -72,7 +72,7 @@ func (s *ClientConn) Handshake() error { if err != nil { return errors.New("proxy: failed to parse port number: " + portStr) } - if port < 1 || port > 0xffff { + if s.network == "tcp" && (port < 1 || port > 0xffff) { return errors.New("proxy: port number out of range: " + portStr) }