SagerNet/sing-mux
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-mux.git synced 2025-04-03 03:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix return nil addr in conn

Browse source
This commit is contained in:
世界 2023-08-30 17:52:09 +08:00
parent dc1639b520
commit 2a10ebd53b
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
h2mux_conn.go
View file

@ -8,6 +8,7 @@ import (
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/baderror"
M "github.com/sagernet/sing/common/metadata"
)
type httpConn struct {
@ -58,11 +59,11 @@ func (c *httpConn) Close() error {
}
func (c *httpConn) LocalAddr() net.Addr {
return nil
return M.Socksaddr{}
}
func (c *httpConn) RemoteAddr() net.Addr {
return nil
return M.Socksaddr{}
}
func (c *httpConn) SetDeadline(t time.Time) error {

9
session.go
View file

@ -3,6 +3,7 @@ package mux
import (
"io"
"net"
"reflect"
E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/smux"
@ -34,6 +35,7 @@ func newClientSession(conn net.Conn, protocol byte) (abstractSession, error) {
}
return &smuxSession{client}, nil
case ProtocolYAMux:
checkYAMuxConn(conn)
client, err := yamux.Client(conn, yaMuxConfig())
if err != nil {
return nil, err
@ -55,6 +57,7 @@ func newServerSession(conn net.Conn, protocol byte) (abstractSession, error) {
}
return &smuxSession{client}, nil
case ProtocolYAMux:
checkYAMuxConn(conn)
client, err := yamux.Server(conn, yaMuxConfig())
if err != nil {
return nil, err
@ -65,6 +68,12 @@ func newServerSession(conn net.Conn, protocol byte) (abstractSession, error) {
}
}
func checkYAMuxConn(conn net.Conn) {
if conn.LocalAddr() == nil || conn.RemoteAddr() == nil {
panic("found net.Conn with nil addr: " + reflect.TypeOf(conn).String())
}
}
var _ abstractSession = (*smuxSession)(nil)
type smuxSession struct {