ginuerzh
3f73c82d00
- Bump go-shadowsocks2 to v0.1.3 (new API symbols) - Return error instead of nil when Target() is empty in TCP handler - Reset wbuf unconditionally on write error to prevent unbounded growth - Add nil guard on targetAddr before WriteTo to prevent panic - Remove duplicate NewClientConfig call and dead ClientConfig literal - Remove unused noDelay metadata field - Fix buffer-size guard to catch negative values (len(b)==0 → bufSize<=0) - Add address context to parse/session error messages
62 lines
1.2 KiB
Go
62 lines
1.2 KiB
Go
package ss
|
|
|
|
import (
|
|
"bytes"
|
|
"net"
|
|
|
|
xio "github.com/go-gost/x/internal/io"
|
|
"github.com/shadowsocks/go-shadowsocks2/core"
|
|
)
|
|
|
|
func ShadowCipher(method, password string, key string) (core.Cipher, error) {
|
|
if method == "" || password == "" {
|
|
return nil, nil
|
|
}
|
|
return core.PickCipher(method, []byte(key), password)
|
|
}
|
|
|
|
// Due to in/out byte length is inconsistent of the shadowsocks.Conn.Write,
|
|
// we wrap around it to make io.Copy happy.
|
|
type shadowConn struct {
|
|
net.Conn
|
|
wbuf bytes.Buffer
|
|
}
|
|
|
|
func ShadowConn(conn net.Conn, header []byte) net.Conn {
|
|
c := &shadowConn{
|
|
Conn: conn,
|
|
}
|
|
c.wbuf.Write(header)
|
|
return c
|
|
}
|
|
|
|
func (c *shadowConn) Write(b []byte) (n int, err error) {
|
|
n = len(b) // force byte length consistent
|
|
if c.wbuf.Len() > 0 {
|
|
c.wbuf.Write(b) // append the data to the cached header
|
|
written, err := c.Conn.Write(c.wbuf.Bytes())
|
|
if err != nil {
|
|
c.wbuf.Reset()
|
|
return written, err
|
|
}
|
|
c.wbuf.Reset()
|
|
return n, nil
|
|
}
|
|
_, err = c.Conn.Write(b)
|
|
return
|
|
}
|
|
|
|
func (c *shadowConn) CloseRead() error {
|
|
if sc, ok := c.Conn.(xio.CloseRead); ok {
|
|
return sc.CloseRead()
|
|
}
|
|
return xio.ErrUnsupported
|
|
}
|
|
|
|
func (c *shadowConn) CloseWrite() error {
|
|
if sc, ok := c.Conn.(xio.CloseWrite); ok {
|
|
return sc.CloseWrite()
|
|
}
|
|
return xio.ErrUnsupported
|
|
}
|