diff --git a/CHANGELOG b/CHANGELOG index 38e7efa..3d81cbd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ proxy更新日志 +v4.7 +1.优化了bridge的日志,增加了client和server的掉线日志. + v4.6 1.sps,http(s),socks5,内网穿透都做了大量的超时优化处理,更加稳定. 2.sps增加了强大的树形级联认证支持,可以轻松构建你的认证代理网络. diff --git a/README_ZH.md b/README_ZH.md index 81fb1b0..54de418 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -35,7 +35,8 @@ Proxy是golang实现的高性能http,https,websocket,tcp,udp,socks5代理服务 - ... -本页是v4.6手册,其他版本手册请点击下面链接查看. +本页是v4.7手册,其他版本手册请点击下面链接查看. +- [v4.6手册](https://github.com/snail007/goproxy/tree/v4.6) - [v4.5手册](https://github.com/snail007/goproxy/tree/v4.5) - [v4.4手册](https://github.com/snail007/goproxy/tree/v4.4) - [v4.3手册](https://github.com/snail007/goproxy/tree/v4.3) @@ -149,7 +150,7 @@ curl -L https://raw.githubusercontent.com/snail007/goproxy/master/install_auto.s 下载地址:https://github.com/snail007/goproxy/releases ```shell cd /root/proxy/ -wget https://github.com/snail007/goproxy/releases/download/v4.6/proxy-linux-amd64.tar.gz +wget https://github.com/snail007/goproxy/releases/download/v4.7/proxy-linux-amd64.tar.gz ``` #### **2.下载自动安装脚本** ```shell diff --git a/install_auto.sh b/install_auto.sh index 69df125..fac84d2 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/v4.6/proxy-linux-amd64.tar.gz +wget https://github.com/snail007/goproxy/releases/download/v4.7/proxy-linux-amd64.tar.gz # #install proxy tar zxvf proxy-linux-amd64.tar.gz diff --git a/main.go b/main.go index 139d970..bd047ee 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,7 @@ import ( "syscall" ) -const APP_VERSION = "4.6" +const APP_VERSION = "4.7" func main() { err := initConfig() diff --git a/release.sh b/release.sh index 965d039..7426d55 100755 --- a/release.sh +++ b/release.sh @@ -1,5 +1,5 @@ #!/bin/bash -VER="4.6" +VER="4.7" RELEASE="release-${VER}" rm -rf .cert mkdir .cert diff --git a/services/mux_bridge.go b/services/mux_bridge.go index ec57b1f..c2d51fd 100644 --- a/services/mux_bridge.go +++ b/services/mux_bridge.go @@ -104,6 +104,7 @@ func (s *MuxBridge) handler(inConn net.Conn) { if err != nil { session.Close() utils.CloseConn(&inConn) + log.Printf("server connection %s %s released", serverID, key) return } go s.callback(stream, serverID, key) @@ -144,6 +145,7 @@ func (s *MuxBridge) handler(inConn net.Conn) { defer s.l.Unlock() if sess, ok := group.Get(index); ok && sess.(*smux.Session).IsClosed() { group.Remove(index) + log.Printf("client connection %s released", key) } if group.IsEmpty() { s.clientControlConns.Remove(groupKey) diff --git a/services/sps.go b/services/sps.go index 590e6d9..5d99564 100644 --- a/services/sps.go +++ b/services/sps.go @@ -230,6 +230,7 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (err error) { if u != "" { pb.Write([]byte(fmt.Sprintf("Proxy-Authorization:Basic %s\r\n", base64.StdEncoding.EncodeToString([]byte(u))))) } + pb.Write([]byte("\r\n")) outConn.SetDeadline(time.Now().Add(time.Millisecond * time.Duration(*s.cfg.Timeout))) _, err = outConn.Write(pb.Bytes()) outConn.SetDeadline(time.Time{})