mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
general: try to reduce tcp fragment
This commit is contained in:
1 parent
aefb9cd7ae
commit
e9f6f15290
8 files changed
+40
-65
No files matched your search
+3
-8
@@ -3,7 +3,6 @@ package proxy
|
||||
import (
|
||||
"errors"
|
||||
"net"
|
||||
"net/url"
|
||||
"strings"
|
||||
)
|
||||
|
||||
@@ -50,15 +49,11 @@ func DialerFromURL(s string, dialer Dialer) (Dialer, error) {
|
||||
return nil, errors.New("DialerFromURL: dialer cannot be nil")
|
||||
}
|
||||
|
||||
u, err := url.Parse(s)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
c, ok := dialerCreators[strings.ToLower(u.Scheme)]
|
||||
scheme := s[:strings.Index(s, ":")]
|
||||
c, ok := dialerCreators[strings.ToLower(scheme)]
|
||||
if ok {
|
||||
return c(s, dialer)
|
||||
}
|
||||
|
||||
return nil, errors.New("unknown scheme '" + u.Scheme + "'")
|
||||
return nil, errors.New("unknown scheme '" + scheme + "'")
|
||||
}
|
||||
+3
-8
@@ -3,7 +3,6 @@ package proxy
|
||||
import (
|
||||
"errors"
|
||||
"net"
|
||||
"net/url"
|
||||
"strings"
|
||||
)
|
||||
|
||||
@@ -39,15 +38,11 @@ func ServerFromURL(s string, p Proxy) (Server, error) {
|
||||
s = "mixed://" + s
|
||||
}
|
||||
|
||||
u, err := url.Parse(s)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
c, ok := serverCreators[strings.ToLower(u.Scheme)]
|
||||
scheme := s[:strings.Index(s, ":")]
|
||||
c, ok := serverCreators[strings.ToLower(scheme)]
|
||||
if ok {
|
||||
return c(s, p)
|
||||
}
|
||||
|
||||
return nil, errors.New("unknown scheme '" + u.Scheme + "'")
|
||||
return nil, errors.New("unknown scheme '" + scheme + "'")
|
||||
}
|
||||
+2
-10
@@ -222,20 +222,12 @@ func NewServerConn(c net.Conn) *ServerConn {
|
||||
|
||||
func (c *ServerConn) Write(b []byte) (int, error) {
|
||||
if !c.sent {
|
||||
buf := pool.GetWriteBuffer()
|
||||
defer pool.PutWriteBuffer(buf)
|
||||
|
||||
buf.WriteByte(Version) // ver
|
||||
buf.WriteByte(0) // addonLen
|
||||
|
||||
buf.Write(b)
|
||||
c.sent = true
|
||||
|
||||
n, err := c.Conn.Write(buf.Bytes())
|
||||
n, err := (&net.Buffers{[]byte{Version, 0}, b}).WriteTo(c.Conn)
|
||||
if n > 2 {
|
||||
return n - 2, err
|
||||
return int(n) - 2, err
|
||||
}
|
||||
|
||||
return 0, err
|
||||
}
|
||||
|
||||
|
||||
+15
-17
@@ -26,6 +26,7 @@ import (
|
||||
"encoding/binary"
|
||||
"io"
|
||||
"math/rand"
|
||||
"net"
|
||||
|
||||
"github.com/nadoo/glider/pool"
|
||||
)
|
||||
@@ -79,31 +80,28 @@ func (w *frameWriter) Write(b []byte) (int, error) {
|
||||
binary.BigEndian.PutUint64(hdr[2:2+nLenField], uint64(nPayload))
|
||||
}
|
||||
|
||||
// header and length
|
||||
_, err := w.Writer.Write(hdr[:2+nLenField])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
header := hdr[:2+nLenField]
|
||||
if w.server {
|
||||
return w.Writer.Write(b)
|
||||
n, err := (&net.Buffers{header, b}).WriteTo(w.Writer)
|
||||
if int(n) <= len(header) {
|
||||
return 0, err
|
||||
}
|
||||
return int(n) - len(header), err
|
||||
}
|
||||
|
||||
buf := pool.GetBuffer(nPayload)
|
||||
defer pool.PutBuffer(buf)
|
||||
|
||||
// mask
|
||||
_, err = w.Writer.Write(w.maskKey[:])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
payload := pool.GetBuffer(nPayload)
|
||||
defer pool.PutBuffer(payload)
|
||||
|
||||
// payload with mask
|
||||
for i := 0; i < nPayload; i++ {
|
||||
buf[i] = b[i] ^ w.maskKey[i%4]
|
||||
payload[i] = b[i] ^ w.maskKey[i%4]
|
||||
}
|
||||
|
||||
return w.Writer.Write(buf)
|
||||
n, err := (&net.Buffers{header, w.maskKey[:], payload}).WriteTo(w.Writer)
|
||||
if int(n) > len(header)+4 {
|
||||
return int(n) - len(header) - 4, err
|
||||
}
|
||||
return 0, err
|
||||
}
|
||||
|
||||
type frameReader struct {
|
||||
|
||||
Reference in new issue
Block a user