mux内网穿透切换smux到yamux
Signed-off-by: arraykeys@gmail.com <arraykeys@gmail.com>
This commit is contained in:
@ -1,6 +1,8 @@
|
|||||||
proxy更新日志
|
proxy更新日志
|
||||||
v4.9
|
v4.9
|
||||||
1.修复了HTTP Basic代理返回不合适的头部,导致浏览器不会弹框,个别代理插件无法认证的问题.
|
1.修复了HTTP Basic代理返回不合适的头部,导致浏览器不会弹框,个别代理插件无法认证的问题.
|
||||||
|
2.mux内网穿透切换smux到yamux.
|
||||||
|
|
||||||
|
|
||||||
v4.8
|
v4.8
|
||||||
1.优化了SPS连接HTTP上级的指令,避免了某些代理不响应的问题.
|
1.优化了SPS连接HTTP上级的指令,避免了某些代理不响应的问题.
|
||||||
|
|||||||
@ -14,7 +14,8 @@ import (
|
|||||||
|
|
||||||
"github.com/snail007/goproxy/utils"
|
"github.com/snail007/goproxy/utils"
|
||||||
|
|
||||||
"github.com/xtaci/smux"
|
//"github.com/xtaci/smux"
|
||||||
|
smux "github.com/hashicorp/yamux"
|
||||||
)
|
)
|
||||||
|
|
||||||
type MuxBridge struct {
|
type MuxBridge struct {
|
||||||
@ -250,9 +251,9 @@ func (s *MuxBridge) callback(inConn net.Conn, serverID, key string) {
|
|||||||
index := keys[i]
|
index := keys[i]
|
||||||
s.log.Printf("select client : %s-%s", key, index)
|
s.log.Printf("select client : %s-%s", key, index)
|
||||||
session, _ := group.Get(index)
|
session, _ := group.Get(index)
|
||||||
session.(*smux.Session).SetDeadline(time.Now().Add(time.Millisecond * time.Duration(*s.cfg.Timeout)))
|
//session.(*smux.Session).SetDeadline(time.Now().Add(time.Millisecond * time.Duration(*s.cfg.Timeout)))
|
||||||
stream, err := session.(*smux.Session).OpenStream()
|
stream, err := session.(*smux.Session).OpenStream()
|
||||||
session.(*smux.Session).SetDeadline(time.Time{})
|
//session.(*smux.Session).SetDeadline(time.Time{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.log.Printf("%s client session open stream %s fail, err: %s, retrying...", key, serverID, err)
|
s.log.Printf("%s client session open stream %s fail, err: %s, retrying...", key, serverID, err)
|
||||||
time.Sleep(time.Second * 3)
|
time.Sleep(time.Second * 3)
|
||||||
|
|||||||
@ -11,7 +11,8 @@ import (
|
|||||||
"github.com/snail007/goproxy/utils"
|
"github.com/snail007/goproxy/utils"
|
||||||
|
|
||||||
"github.com/golang/snappy"
|
"github.com/golang/snappy"
|
||||||
"github.com/xtaci/smux"
|
//"github.com/xtaci/smux"
|
||||||
|
smux "github.com/hashicorp/yamux"
|
||||||
)
|
)
|
||||||
|
|
||||||
type MuxClient struct {
|
type MuxClient struct {
|
||||||
|
|||||||
@ -15,7 +15,8 @@ import (
|
|||||||
"github.com/snail007/goproxy/utils"
|
"github.com/snail007/goproxy/utils"
|
||||||
|
|
||||||
"github.com/golang/snappy"
|
"github.com/golang/snappy"
|
||||||
"github.com/xtaci/smux"
|
//"github.com/xtaci/smux"
|
||||||
|
smux "github.com/hashicorp/yamux"
|
||||||
)
|
)
|
||||||
|
|
||||||
type MuxServer struct {
|
type MuxServer struct {
|
||||||
|
|||||||
Reference in New Issue
Block a user