general: several optimizations

This commit is contained in:
nadoo committed 2020-08-25 22:14:08 +08:00
1 parent f65a983da8
commit 167e6e5d29
14 files changed
+85 -104

No files matched your search

+1 -5
View File
@@ -102,11 +102,7 @@ func (s *HTTP) servHTTPS(r *request, c net.Conn) {
log.F("[http] %s <-> %s [c] via %s", c.RemoteAddr(), r.uri, dialer.Addr())
_, _, err = conn.Relay(c, rc)
if err != nil {
if err, ok := err.(net.Error); ok && err.Timeout() {
return // ignore i/o timeout
}
if err = conn.Relay(c, rc); err != nil {
log.F("[http] relay error: %v", err)
s.proxy.Record(dialer, false)
}
+1 -5
View File
@@ -113,11 +113,7 @@ func (s *RedirProxy) Serve(c net.Conn) {
log.F("[redir] %s <-> %s via %s", c.RemoteAddr(), tgt, dialer.Addr())
_, _, err = conn.Relay(c, rc)
if err != nil {
if err, ok := err.(net.Error); ok && err.Timeout() {
return // ignore i/o timeout
}
if err = conn.Relay(c, rc); err != nil {
log.F("[redir] relay error: %v", err)
s.proxy.Record(dialer, false)
}
+1 -5
View File
@@ -141,11 +141,7 @@ func (s *Socks5) Serve(c net.Conn) {
log.F("[socks5] %s <-> %s via %s", c.RemoteAddr(), tgt, dialer.Addr())
_, _, err = conn.Relay(c, rc)
if err != nil {
if err, ok := err.(net.Error); ok && err.Timeout() {
return // ignore i/o timeout
}
if err = conn.Relay(c, rc); err != nil {
log.F("[socks5] relay error: %v", err)
s.proxy.Record(dialer, false)
}
+1 -5
View File
@@ -160,11 +160,7 @@ func (s *SS) Serve(c net.Conn) {
log.F("[ss] %s <-> %s via %s", c.RemoteAddr(), tgt, dialer.Addr())
_, _, err = conn.Relay(c, rc)
if err != nil {
if err, ok := err.(net.Error); ok && err.Timeout() {
return // ignore i/o timeout
}
if err = conn.Relay(c, rc); err != nil {
log.F("[ss] relay error: %v", err)
s.proxy.Record(dialer, false)
}
+2 -6
View File
@@ -90,12 +90,8 @@ func (s *TCPTun) Serve(c net.Conn) {
log.F("[tcptun] %s <-> %s via %s", c.RemoteAddr(), s.raddr, dialer.Addr())
_, _, err = conn.Relay(c, rc)
if err != nil {
if err, ok := err.(net.Error); ok && err.Timeout() {
return // ignore i/o timeout
}
log.F("relay error: %v", err)
if err = conn.Relay(c, rc); err != nil {
log.F("[tcptun] relay error: %v", err)
s.proxy.Record(dialer, false)
}
}
+2 -2
View File
@@ -87,11 +87,11 @@ func (s *UDPTun) ListenAndServe() {
nm.Store(raddr.String(), pc)
go func() {
go func(c, pc net.PacketConn, raddr net.Addr) {
conn.RelayUDP(c, raddr, pc, 2*time.Minute)
pc.Close()
nm.Delete(raddr.String())
}()
}(c, pc, raddr)
} else {
pc = v.(net.PacketConn)
+4 -6
View File
@@ -25,8 +25,7 @@ func (w *chunkedWriter) Write(b []byte) (n int, err error) {
buf := pool.GetBuffer(lenSize + chunkSize)
defer pool.PutBuffer(buf)
left := len(b)
for left != 0 {
for left := len(b); left != 0; {
writeLen := left
if writeLen > chunkSize {
writeLen = chunkSize
@@ -49,6 +48,7 @@ func (w *chunkedWriter) Write(b []byte) (n int, err error) {
type chunkedReader struct {
io.Reader
buf [lenSize]byte
left int
}
@@ -60,13 +60,11 @@ func ChunkedReader(r io.Reader) io.Reader {
func (r *chunkedReader) Read(b []byte) (int, error) {
if r.left == 0 {
// get length
buf := pool.GetBuffer(lenSize)
_, err := io.ReadFull(r.Reader, buf[:lenSize])
_, err := io.ReadFull(r.Reader, r.buf[:lenSize])
if err != nil {
return 0, err
}
r.left = int(binary.BigEndian.Uint16(buf[:lenSize]))
pool.PutBuffer(buf)
r.left = int(binary.BigEndian.Uint16(r.buf[:lenSize]))
// if left == 0, then this is the end
if r.left == 0 {
-2
View File
@@ -93,7 +93,6 @@ func (c *Conn) Write(b []byte) (n int, err error) {
if c.writer == nil {
c.writer = FrameWriter(c.Conn)
}
return c.writer.Write(b)
}
@@ -101,7 +100,6 @@ func (c *Conn) Read(b []byte) (n int, err error) {
if c.reader == nil {
c.reader = FrameReader(c.Conn)
}
return c.reader.Read(b)
}
+11 -14
View File
@@ -126,20 +126,17 @@ func (w *frameWriter) ReadFrom(r io.Reader) (n int64, err error) {
type frameReader struct {
io.Reader
buf []byte
leftBytes int64
buf [8]byte
left int64
}
// FrameReader returns a chunked reader.
func FrameReader(r io.Reader) io.Reader {
return &frameReader{
Reader: r,
buf: make([]byte, maxFrameHeaderSize), // NOTE: buf only used to save header bytes now
}
return &frameReader{Reader: r}
}
func (r *frameReader) Read(b []byte) (int, error) {
if r.leftBytes == 0 {
if r.left == 0 {
// get msg header
_, err := io.ReadFull(r.Reader, r.buf[:2])
if err != nil {
@@ -149,26 +146,26 @@ func (r *frameReader) Read(b []byte) (int, error) {
// final := r.buf[0]&finalBit != 0
// frameType := int(r.buf[0] & 0xf)
// mask := r.buf[1]&maskBit != 0
r.leftBytes = int64(r.buf[1] & 0x7f)
switch r.leftBytes {
r.left = int64(r.buf[1] & 0x7f)
switch r.left {
case 126:
_, err := io.ReadFull(r.Reader, r.buf[:2])
if err != nil {
return 0, err
}
r.leftBytes = int64(binary.BigEndian.Uint16(r.buf[0:]))
r.left = int64(binary.BigEndian.Uint16(r.buf[:2]))
case 127:
_, err := io.ReadFull(r.Reader, r.buf[:8])
if err != nil {
return 0, err
}
r.leftBytes = int64(binary.BigEndian.Uint64(r.buf[0:]))
r.left = int64(binary.BigEndian.Uint64(r.buf[:8]))
}
}
readLen := int64(len(b))
if readLen > r.leftBytes {
readLen = r.leftBytes
if readLen > r.left {
readLen = r.left
}
m, err := r.Reader.Read(b[:readLen])
@@ -176,6 +173,6 @@ func (r *frameReader) Read(b []byte) (int, error) {
return 0, err
}
r.leftBytes -= int64(m)
r.left -= int64(m)
return m, err
}