SagerNet/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-04-06 05:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improve multiplex log

Browse source
This commit is contained in:
世界 2022-08-04 09:11:39 +08:00
parent 32201cacda
commit 1c3c154d6d
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
5 changed files with 41 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
common/mux/protocol.go
View file

@ -23,18 +23,18 @@ var Destination = M.Socksaddr{
}
const (
ProtocolYAMux Protocol = 0
ProtocolSMux Protocol = 1
ProtocolSMux Protocol = iota
ProtocolYAMux
)
type Protocol byte
func ParseProtocol(name string) (Protocol, error) {
switch name {
case "", "yamux":
return ProtocolYAMux, nil
case "smux":
case "", "smux":
return ProtocolSMux, nil
case "yamux":
return ProtocolYAMux, nil
default:
return ProtocolYAMux, E.New("unknown multiplex protocol: ", name)
}
@ -42,14 +42,14 @@ func ParseProtocol(name string) (Protocol, error) {
func (p Protocol) newServer(conn net.Conn) (abstractSession, error) {
switch p {
case ProtocolYAMux:
return yamux.Server(conn, yaMuxConfig())
case ProtocolSMux:
session, err := smux.Server(conn, nil)
if err != nil {
return nil, err
}
return &smuxSession{session}, nil
case ProtocolYAMux:
return yamux.Server(conn, yaMuxConfig())
default:
panic("unknown protocol")
}
@ -57,14 +57,14 @@ func (p Protocol) newServer(conn net.Conn) (abstractSession, error) {
func (p Protocol) newClient(conn net.Conn) (abstractSession, error) {
switch p {
case ProtocolYAMux:
return yamux.Client(conn, yaMuxConfig())
case ProtocolSMux:
session, err := smux.Client(conn, nil)
if err != nil {
return nil, err
}
return &smuxSession{session}, nil
case ProtocolYAMux:
return yamux.Client(conn, yaMuxConfig())
default:
panic("unknown protocol")
}
@ -80,10 +80,10 @@ func yaMuxConfig() *yamux.Config {
func (p Protocol) String() string {
switch p {
case ProtocolYAMux:
return "yamux"
case ProtocolSMux:
return "smux"
case ProtocolYAMux:
return "yamux"
default:
return "unknown"
}