Skip to content

Commit

Permalink
mux内网穿透切换smux到yamux
Browse files Browse the repository at this point in the history
Signed-off-by: arraykeys@gmail.com <arraykeys@gmail.com>
  • Loading branch information
snail007 committed May 31, 2018
1 parent 9b1ef52 commit e185d73
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
proxy更新日志
v4.9
1.修复了HTTP Basic代理返回不合适的头部,导致浏览器不会弹框,个别代理插件无法认证的问题.
2.mux内网穿透切换smux到yamux.


v4.8
1.优化了SPS连接HTTP上级的指令,避免了某些代理不响应的问题.
Expand Down
7 changes: 4 additions & 3 deletions services/mux_bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import (

"github.com/snail007/goproxy/utils"

"github.com/xtaci/smux"
//"github.com/xtaci/smux"
smux "github.com/hashicorp/yamux"
)

type MuxBridge struct {
Expand Down Expand Up @@ -250,9 +251,9 @@ func (s *MuxBridge) callback(inConn net.Conn, serverID, key string) {
index := keys[i]
s.log.Printf("select client : %s-%s", key, 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()
session.(*smux.Session).SetDeadline(time.Time{})
//session.(*smux.Session).SetDeadline(time.Time{})
if err != nil {
s.log.Printf("%s client session open stream %s fail, err: %s, retrying...", key, serverID, err)
time.Sleep(time.Second * 3)
Expand Down
3 changes: 2 additions & 1 deletion services/mux_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import (
"github.com/snail007/goproxy/utils"

"github.com/golang/snappy"
"github.com/xtaci/smux"
//"github.com/xtaci/smux"
smux "github.com/hashicorp/yamux"
)

type MuxClient struct {
Expand Down
3 changes: 2 additions & 1 deletion services/mux_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import (
"github.com/snail007/goproxy/utils"

"github.com/golang/snappy"
"github.com/xtaci/smux"
//"github.com/xtaci/smux"
smux "github.com/hashicorp/yamux"
)

type MuxServer struct {
Expand Down

0 comments on commit e185d73

Please sign in to comment.