chore: optimize code
Build / Build (push) Has been cancelled

This commit is contained in:
nadoo committed 2026-11-16 21:08:27 +08:00
1 parent 9eadb8d9f4
commit a7d0421c93
15 files changed
+422 -171

No files matched your search

+3 -2
View File
@@ -234,10 +234,11 @@ func (c *Client) exchangeTCP(rc net.Conn, reqBytes []byte) ([]byte, error) {
return nil, err return nil, err
} }
var respLen uint16 var lenRaw [2]byte
if err := binary.Read(rc, binary.BigEndian, &respLen); err != nil { if _, err := io.ReadFull(rc, lenRaw[:]); err != nil {
return nil, err return nil, err
} }
respLen := binary.BigEndian.Uint16(lenRaw[:])
respBytes := pool.GetBuffer(int(respLen)) respBytes := pool.GetBuffer(int(respLen))
_, err := io.ReadFull(rc, respBytes) _, err := io.ReadFull(rc, respBytes)
+21 -26
View File
@@ -218,7 +218,15 @@ func (h *Header) SetAncount(ancount int) {
// MarshalTo marshals header struct to []byte and write to w. // MarshalTo marshals header struct to []byte and write to w.
func (h *Header) MarshalTo(w io.Writer) (int, error) { func (h *Header) MarshalTo(w io.Writer) (int, error) {
return HeaderLen, binary.Write(w, binary.BigEndian, h) var b [HeaderLen]byte
binary.BigEndian.PutUint16(b[0:2], h.ID)
binary.BigEndian.PutUint16(b[2:4], h.Bits)
binary.BigEndian.PutUint16(b[4:6], h.QDCOUNT)
binary.BigEndian.PutUint16(b[6:8], h.ANCOUNT)
binary.BigEndian.PutUint16(b[8:10], h.NSCOUNT)
binary.BigEndian.PutUint16(b[10:12], h.ARCOUNT)
_, err := w.Write(b[:])
return HeaderLen, err
} }
// UnmarshalHeader unmarshals []bytes to Header. // UnmarshalHeader unmarshals []bytes to Header.
@@ -280,15 +288,13 @@ func (q *Question) MarshalTo(w io.Writer) (n int, err error) {
return return
} }
if err = binary.Write(w, binary.BigEndian, q.QTYPE); err != nil { var b [4]byte
binary.BigEndian.PutUint16(b[0:2], q.QTYPE)
binary.BigEndian.PutUint16(b[2:4], q.QCLASS)
if _, err = w.Write(b[:]); err != nil {
return return
} }
n += 2 n += 4
if err = binary.Write(w, binary.BigEndian, q.QCLASS); err != nil {
return
}
n += 2
return return
} }
@@ -368,26 +374,15 @@ func (rr *RR) MarshalTo(w io.Writer) (n int, err error) {
return return
} }
if err = binary.Write(w, binary.BigEndian, rr.TYPE); err != nil { var b [10]byte
binary.BigEndian.PutUint16(b[0:2], rr.TYPE)
binary.BigEndian.PutUint16(b[2:4], rr.CLASS)
binary.BigEndian.PutUint32(b[4:8], rr.TTL)
binary.BigEndian.PutUint16(b[8:10], rr.RDLENGTH)
if _, err = w.Write(b[:]); err != nil {
return return
} }
n += 2 n += 10
if err = binary.Write(w, binary.BigEndian, rr.CLASS); err != nil {
return
}
n += 2
if err = binary.Write(w, binary.BigEndian, rr.TTL); err != nil {
return
}
n += 4
err = binary.Write(w, binary.BigEndian, rr.RDLENGTH)
if err != nil {
return
}
n += 2
if _, err = w.Write(rr.RDATA); err != nil { if _, err = w.Write(rr.RDATA); err != nil {
return return
+3 -2
View File
@@ -119,11 +119,12 @@ func (s *Server) ServeTCP(c net.Conn) {
c.SetDeadline(time.Now().Add(time.Duration(timeout) * time.Second)) c.SetDeadline(time.Now().Add(time.Duration(timeout) * time.Second))
var reqLen uint16 var lengthBuf [2]byte
if err := binary.Read(c, binary.BigEndian, &reqLen); err != nil { if _, err := io.ReadFull(c, lengthBuf[:]); err != nil {
log.F("[dns-tcp] failed to get request length: %v", err) log.F("[dns-tcp] failed to get request length: %v", err)
return return
} }
reqLen := binary.BigEndian.Uint16(lengthBuf[:])
reqBytes := pool.GetBuffer(int(reqLen)) reqBytes := pool.GetBuffer(int(reqLen))
defer pool.PutBuffer(reqBytes) defer pool.PutBuffer(reqBytes)
+9 -7
View File
@@ -4,21 +4,23 @@ go 1.27
require ( require (
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da
github.com/insomniacslk/dhcp v0.0.0-20260901064844-234b97448fae github.com/insomniacslk/dhcp v0.0.0-20261014062924-c6bb46ad3f3a
github.com/nadoo/conflag v0.3.1 github.com/nadoo/conflag v0.3.1
github.com/nadoo/netset v0.1.0 github.com/nadoo/netset v0.1.0
github.com/xtaci/kcp-go/v5 v5.6.72 github.com/xtaci/kcp-go/v5 v5.7.6
golang.org/x/crypto v0.57.0 golang.org/x/crypto v0.59.0
golang.org/x/sys v0.49.0 golang.org/x/sys v0.50.0
) )
require ( require (
github.com/klauspost/cpuid/v2 v2.4.0 // indirect github.com/juju/ratelimit v1.0.2 // indirect
github.com/klauspost/cpuid/v2 v2.4.2 // indirect
github.com/klauspost/reedsolomon v1.14.2 // indirect github.com/klauspost/reedsolomon v1.14.2 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/pierrec/lz4/v4 v4.1.33 // indirect github.com/pierrec/lz4/v4 v4.1.33 // indirect
github.com/pion/transport/v5 v5.1.5 // indirect
github.com/pkg/errors v0.9.1 // indirect github.com/pkg/errors v0.9.1 // indirect
github.com/tjfoc/gmsm v1.4.1 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
golang.org/x/net v0.60.0 // indirect golang.org/x/net v0.62.0 // indirect
golang.org/x/time v0.16.0 // indirect
) )
+34 -26
View File
@@ -5,8 +5,7 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSi
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
@@ -25,14 +24,20 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/insomniacslk/dhcp v0.0.0-20260901064844-234b97448fae h1:nXGg65fXsylSUTNNWwvHuQsXev7mhIzQTnZREPTbWzs= github.com/insomniacslk/dhcp v0.0.0-20261014062924-c6bb46ad3f3a h1:07pMKu9gWaSFnDe817VcMl14qJfWCz1vm3uB+7YmyPE=
github.com/insomniacslk/dhcp v0.0.0-20260901064844-234b97448fae/go.mod h1:tGfUTcnFYGYvVNCaZZhwlJySU/fQQxh9TmpsFzWXnnY= github.com/insomniacslk/dhcp v0.0.0-20261014062924-c6bb46ad3f3a/go.mod h1:tGfUTcnFYGYvVNCaZZhwlJySU/fQQxh9TmpsFzWXnnY=
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA= github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= github.com/juju/ratelimit v1.0.2 h1:sRxmtRiajbvrcLQT7S+JbqU0ntsb9W2yhSdNN8tWfaI=
github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/juju/ratelimit v1.0.2/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk=
github.com/klauspost/cpuid/v2 v2.4.2 h1:xRw7IZEsAgVCp6trS/DgWbTAqpixhmywgVgBjYGg1bQ=
github.com/klauspost/cpuid/v2 v2.4.2/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU=
github.com/klauspost/reedsolomon v1.14.2 h1:SafJYwpBBQBI6amHUygcjxZjXeN2HpiENHQDwuPWCCQ= github.com/klauspost/reedsolomon v1.14.2 h1:SafJYwpBBQBI6amHUygcjxZjXeN2HpiENHQDwuPWCCQ=
github.com/klauspost/reedsolomon v1.14.2/go.mod h1:yjqqjgMTQkBUHSG97/rm4zipffCNbCiZcB3kTqr++sQ= github.com/klauspost/reedsolomon v1.14.2/go.mod h1:yjqqjgMTQkBUHSG97/rm4zipffCNbCiZcB3kTqr++sQ=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/mdlayher/packet v1.1.2 h1:3Up1NG6LZrsgDVn6X4L9Ge/iyRyxFEFD9o6Pr3Q1nQY= github.com/mdlayher/packet v1.1.2 h1:3Up1NG6LZrsgDVn6X4L9Ge/iyRyxFEFD9o6Pr3Q1nQY=
github.com/mdlayher/packet v1.1.2/go.mod h1:GEu1+n9sG5VtiRE4SydOmX5GTwyyYlteZiFU+x0kew4= github.com/mdlayher/packet v1.1.2/go.mod h1:GEu1+n9sG5VtiRE4SydOmX5GTwyyYlteZiFU+x0kew4=
github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
@@ -43,26 +48,31 @@ github.com/nadoo/netset v0.1.0 h1:FNdGCVtoSjBX0Ctzve3BWwTOSXRxK/oSPBzS3/SemY4=
github.com/nadoo/netset v0.1.0/go.mod h1:w2GPCnz+TxqH+HJIrhOEC4oZAeQ5Crefw4lToBIxEww= github.com/nadoo/netset v0.1.0/go.mod h1:w2GPCnz+TxqH+HJIrhOEC4oZAeQ5Crefw4lToBIxEww=
github.com/pierrec/lz4/v4 v4.1.33 h1:GjG1TJ1V4IzKP8L96muuuDNpTwd7D+l2ccXrjAbe014= github.com/pierrec/lz4/v4 v4.1.33 h1:GjG1TJ1V4IzKP8L96muuuDNpTwd7D+l2ccXrjAbe014=
github.com/pierrec/lz4/v4 v4.1.33/go.mod h1:7SE9MC2STkNtL4PIwGhjmyVwvILaGI9/COYQNBhKM/c= github.com/pierrec/lz4/v4 v4.1.33/go.mod h1:7SE9MC2STkNtL4PIwGhjmyVwvILaGI9/COYQNBhKM/c=
github.com/pion/transport/v5 v5.1.5 h1:73fa352Y9dq85kCd9rzyBV7wd/qhAiBIuTtwzWO3WS0=
github.com/pion/transport/v5 v5.1.5/go.mod h1:Qxw6fCEjFWQkRDZOhS4Vf+neJBcihauvA3uyEa1J1F0=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho=
github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE=
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 h1:pyC9PaHYZFgEKFdlp3G8RaCKgVpHZnecvArXvPXcFkM= github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 h1:pyC9PaHYZFgEKFdlp3G8RaCKgVpHZnecvArXvPXcFkM=
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701/go.mod h1:P3a5rG4X7tI17Nn3aOIAYr5HbIMukwXG0urG0WuL8OA= github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701/go.mod h1:P3a5rG4X7tI17Nn3aOIAYr5HbIMukwXG0urG0WuL8OA=
github.com/xtaci/kcp-go/v5 v5.6.72 h1:FLaQPalgpufJYQRk0OK+gErEhXGLUPjv6FSRPrFR8Lk= github.com/xtaci/kcp-go/v5 v5.7.6 h1:TckVvJxZhMHH1M0lLwXHa2/pLOhH7MxAibFzA4V58eg=
github.com/xtaci/kcp-go/v5 v5.6.72/go.mod h1:9O3D8WR+cyyUjGiTILYfg17vn72otWuXK2AFfqIe6CM= github.com/xtaci/kcp-go/v5 v5.7.6/go.mod h1:yXWQLZG5hW3+uwchBDrOg3WP7kzAAO5ShHsvDmYyWTc=
github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae h1:J0GxkO96kL4WF+AIT3M4mfUVinOCPgf2uUWYFUzN0sM= github.com/xtaci/lossyconn v1.1.0 h1:rXMYEzd9rA9GxaVKO7XMoOZfzZUPYQyt4HwBHiAhMME=
github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE= github.com/xtaci/lossyconn v1.1.0/go.mod h1:HpMP7DB2CyokmAh4lp0EQnnWhmycP/TvwBGzvuie+H0=
go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= golang.org/x/crypto v0.59.0 h1:xS2jhqYbzNrpvkWP2YTDf4TJwBy3ykR03i8vFDxEc7c=
golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= golang.org/x/crypto v0.59.0/go.mod h1:veDyUwATGs3c+vN3VfTbzViMGXeTBk3WyhBOkn+F/4U=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -73,8 +83,8 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU= golang.org/x/net v0.62.0 h1:18ELalfM5+XNRwzM2nYqXsZQ9ByS1uhj2O/U7+5jqRY=
golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= golang.org/x/net v0.62.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -85,14 +95,12 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= golang.org/x/sys v0.50.0 h1:dkKZEFTEKaLr1sjhs0WiKqoi8Jj5nHbS3Njmx1UoMJs=
golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/sys v0.50.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE= golang.org/x/term v0.48.0 h1:G6UU1eiSB8nl3DzeUGt7Mg+2SctI8tPS6Z5/mBt6cOk=
golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc= golang.org/x/term v0.48.0/go.mod h1:BRDLHCZr2SUjIeBHHpRyQeC9xzSAVbzY2rvKgafnHf4=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE=
golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -113,7 +121,7 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+27 -12
View File
@@ -4,6 +4,7 @@ import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"net" "net"
"time"
"github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/pkg/log"
"github.com/nadoo/glider/pkg/socks" "github.com/nadoo/glider/pkg/socks"
@@ -60,7 +61,7 @@ func (s *AnyTLS) Dial(network, addr string) (net.Conn, error) {
_ = ss.Close() _ = ss.Close()
return nil, err return nil, err
} }
return &clientConn{Conn: st, session: ss}, nil return &clientConn{stream: st}, nil
} }
func (s *AnyTLS) DialUDP(network, addr string) (net.PacketConn, error) { func (s *AnyTLS) DialUDP(network, addr string) (net.PacketConn, error) {
@@ -99,7 +100,7 @@ func (s *AnyTLS) DialUDP(network, addr string) (net.PacketConn, error) {
_ = ss.Close() _ = ss.Close()
return nil, err return nil, err
} }
return &clientPacketConn{PacketConn: newUOTPacketConn(st, target), session: ss}, nil return &clientPacketConn{PacketConn: newUOTPacketConn(st, target), stream: st}, nil
} }
func (s *AnyTLS) newClientSession() (*session, error) { func (s *AnyTLS) newClientSession() (*session, error) {
@@ -123,7 +124,7 @@ func (s *AnyTLS) newClientSession() (*session, error) {
} }
ss := newSession(c) ss := newSession(c)
if err := ss.writeFrame(frame{command: cmdSettings, data: clientSettings(s.padding)}); err != nil { if err := ss.writeFrame(frame{command: cmdSettings, data: clientSettings(s.padding)}); err != nil {
_ = c.Close() _ = ss.Close()
return nil, err return nil, err
} }
ss.start() ss.start()
@@ -131,23 +132,37 @@ func (s *AnyTLS) newClientSession() (*session, error) {
} }
type clientConn struct { type clientConn struct {
net.Conn *stream
session *session
} }
func (c *clientConn) Close() error { func (c *clientConn) Close() error {
err := c.Conn.Close() return closeClientSession(c.stream)
_ = c.session.Close()
return err
} }
type clientPacketConn struct { type clientPacketConn struct {
net.PacketConn net.PacketConn
session *session stream *stream
} }
func (c *clientPacketConn) Close() error { func (c *clientPacketConn) Close() error {
err := c.PacketConn.Close() return closeClientSession(c.stream)
_ = c.session.Close() }
return err
const clientFINTimeout = time.Second
// The client owns the whole session. Give FIN a chance to reach the transport
// before tearing it down, while keeping standalone stream.Close nonblocking.
func closeClientSession(st *stream) error {
_ = st.Close()
defer st.s.Close()
if st.fin != nil {
timer := time.NewTimer(clientFINTimeout)
defer timer.Stop()
select {
case <-st.fin.result:
case <-st.s.done:
case <-timer.C:
}
}
return nil
} }
+7 -4
View File
@@ -83,15 +83,18 @@ func readFrame(r io.Reader) (frame, error) {
return frame{command: head[0], streamID: binary.BigEndian.Uint32(head[1:5]), data: data}, nil return frame{command: head[0], streamID: binary.BigEndian.Uint32(head[1:5]), data: data}, nil
} }
func writeFrame(w io.Writer, f frame) error { func writeFrame(w io.Writer, f frame) (int, error) {
if len(f.data) > maxFrameData { if len(f.data) > maxFrameData {
return errors.New("frame data too large") return 0, errors.New("frame data too large")
} }
buf := make([]byte, 7+len(f.data)) buf := make([]byte, 7+len(f.data))
buf[0] = f.command buf[0] = f.command
binary.BigEndian.PutUint32(buf[1:5], f.streamID) binary.BigEndian.PutUint32(buf[1:5], f.streamID)
binary.BigEndian.PutUint16(buf[5:7], uint16(len(f.data))) binary.BigEndian.PutUint16(buf[5:7], uint16(len(f.data)))
copy(buf[7:], f.data) copy(buf[7:], f.data)
_, err := w.Write(buf) n, err := w.Write(buf)
return err if n < len(buf) && err == nil {
err = io.ErrShortWrite
}
return max(0, n-7), err
} }
+162 -14
View File
@@ -1,10 +1,13 @@
package anytls package anytls
import ( import (
"bytes"
"container/list"
"errors" "errors"
"fmt" "fmt"
"io" "io"
"net" "net"
"os"
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
@@ -13,16 +16,19 @@ import (
type session struct { type session struct {
conn net.Conn conn net.Conn
writeMu sync.Mutex writeMu sync.Mutex
mu sync.Mutex writes list.List
streams map[uint32]*stream writeWake chan struct{}
synack map[uint32]chan synackResult mu sync.Mutex
nextID atomic.Uint32 streams map[uint32]*stream
synack map[uint32]chan synackResult
nextID atomic.Uint32
incoming chan *stream incoming chan *stream
done chan struct{} done chan struct{}
closeOnce sync.Once closeOnce sync.Once
err atomic.Value err atomic.Value
errOnce sync.Once
settingsSeen bool settingsSeen bool
} }
@@ -31,15 +37,33 @@ type synackResult struct {
data []byte data []byte
} }
type frameWrite struct {
frame frame
stream *stream
deadline <-chan struct{}
result chan frameWriteResult
// Guarded by session.writeMu.
elem *list.Element
started bool
}
type frameWriteResult struct {
n int // payload bytes, excluding the frame header
err error
}
func newSession(conn net.Conn) *session { func newSession(conn net.Conn) *session {
s := &session{ s := &session{
conn: conn, conn: conn,
streams: map[uint32]*stream{}, streams: map[uint32]*stream{},
synack: map[uint32]chan synackResult{}, synack: map[uint32]chan synackResult{},
incoming: make(chan *stream, 32), incoming: make(chan *stream, 32),
done: make(chan struct{}), done: make(chan struct{}),
writeWake: make(chan struct{}, 1),
} }
s.nextID.Store(1) s.nextID.Store(1)
go s.writeLoop()
return s return s
} }
@@ -103,9 +127,126 @@ func (s *session) waitSYNACK(id uint32, timeout time.Duration) error {
} }
func (s *session) writeFrame(f frame) error { func (s *session) writeFrame(f frame) error {
req, err := s.queueFrame(f, nil, nil)
if err != nil {
return err
}
select {
case result := <-req.result:
return result.err
case <-s.done:
return s.Err()
}
}
func (s *session) writeStreamFrame(st *stream, f frame) (int, error) {
if channelClosed(st.done) {
return 0, errStreamClosed
}
deadline := st.writeDeadline.wait()
if channelClosed(deadline) {
return 0, os.ErrDeadlineExceeded
}
req, err := s.queueFrame(f, st, deadline)
if err != nil {
return 0, err
}
select {
case result := <-req.result:
return result.n, result.err
case <-st.done:
err = errStreamClosed
case <-s.done:
err = s.Err()
case <-deadline:
err = os.ErrDeadlineExceeded
}
started := s.cancelWrite(req)
// Prefer the transport result when both completion and cancellation are ready.
select {
case result := <-req.result:
return result.n, result.err
default:
}
if started {
// The writer owns the whole frame once it starts. Its payload can
// still reach the peer after this call returns, so count it in n.
return len(f.data), err
}
return 0, err
}
func (s *session) queueFrame(f frame, st *stream, deadline <-chan struct{}) (*frameWrite, error) {
// A stream may time out while the transport is writing. Own the payload so
// the caller can reuse its buffer without racing with the session writer.
f.data = bytes.Clone(f.data)
req := &frameWrite{frame: f, stream: st, deadline: deadline, result: make(chan frameWriteResult, 1)}
s.writeMu.Lock() s.writeMu.Lock()
defer s.writeMu.Unlock() defer s.writeMu.Unlock()
return writeFrame(s.conn, f) if channelClosed(s.done) {
return nil, s.Err()
}
req.elem = s.writes.PushBack(req)
select {
case s.writeWake <- struct{}{}:
default:
}
return req, nil
}
// cancelWrite removes a pending request and reports whether it had already started.
func (s *session) cancelWrite(req *frameWrite) bool {
s.writeMu.Lock()
defer s.writeMu.Unlock()
if req.elem != nil {
s.writes.Remove(req.elem)
req.elem = nil
}
return req.started
}
func (s *session) writeLoop() {
for {
select {
case <-s.done:
return
case <-s.writeWake:
}
for {
s.writeMu.Lock()
elem := s.writes.Front()
if elem == nil || channelClosed(s.done) {
s.writeMu.Unlock()
break
}
req := s.writes.Remove(elem).(*frameWrite)
req.elem = nil
if st := req.stream; st != nil {
if channelClosed(st.done) {
s.writeMu.Unlock()
req.result <- frameWriteResult{err: errStreamClosed}
continue
}
if channelClosed(req.deadline) {
s.writeMu.Unlock()
req.result <- frameWriteResult{err: os.ErrDeadlineExceeded}
continue
}
}
req.started = true
s.writeMu.Unlock()
// An in-flight frame must finish intact even if its stream times out.
// Only closing the session may interrupt the shared transport write.
n, err := writeFrame(s.conn, req.frame)
req.result <- frameWriteResult{n: n, err: err}
close(req.result)
if err != nil {
s.setErr(err)
s.Close()
return
}
}
}
} }
func (s *session) readLoop() { func (s *session) readLoop() {
@@ -202,8 +343,8 @@ func (s *session) removeStream(id uint32) {
} }
func (s *session) setErr(err error) { func (s *session) setErr(err error) {
if err != nil && s.err.Load() == nil { if err != nil {
s.err.Store(err) s.errOnce.Do(func() { s.err.Store(err) })
} }
} }
@@ -218,8 +359,16 @@ func (s *session) Close() error {
s.closeOnce.Do(func() { s.closeOnce.Do(func() {
close(s.done) close(s.done)
_ = s.conn.Close() _ = s.conn.Close()
s.writeMu.Lock()
for elem := s.writes.Front(); elem != nil; elem = elem.Next() {
elem.Value.(*frameWrite).elem = nil
}
s.writes.Init()
s.writeMu.Unlock()
s.mu.Lock() s.mu.Lock()
for _, st := range s.streams { for _, st := range s.streams {
st.readDeadline.stop()
st.writeDeadline.stop()
st.closeRead() st.closeRead()
} }
s.streams = map[uint32]*stream{} s.streams = map[uint32]*stream{}
@@ -227,7 +376,6 @@ func (s *session) Close() error {
delete(s.synack, id) delete(s.synack, id)
close(ch) close(ch)
} }
close(s.incoming)
s.mu.Unlock() s.mu.Unlock()
}) })
return nil return nil
+99 -36
View File
@@ -4,6 +4,7 @@ import (
"errors" "errors"
"io" "io"
"net" "net"
"os"
"sync" "sync"
"time" "time"
) )
@@ -14,80 +15,142 @@ type stream struct {
id uint32 id uint32
s *session s *session
in chan []byte in chan []byte
readBuf []byte readBuf []byte
closeIn sync.Once readDone chan struct{}
closeOut sync.Once done chan struct{}
closeIn sync.Once
closeOnce sync.Once
fin *frameWrite // published by closeOnce
readMu sync.Mutex
writeMu sync.Mutex
mu sync.Mutex readDeadline streamDeadline
closed bool writeDeadline streamDeadline
} }
func newStream(id uint32, s *session) *stream { func newStream(id uint32, s *session) *stream {
return &stream{id: id, s: s, in: make(chan []byte, 32)} return &stream{
id: id, s: s, in: make(chan []byte, 32),
readDone: make(chan struct{}), done: make(chan struct{}),
}
} }
func (st *stream) Read(p []byte) (int, error) { func (st *stream) Read(p []byte) (int, error) {
for len(st.readBuf) == 0 { st.readMu.Lock()
b, ok := <-st.in defer st.readMu.Unlock()
if !ok { for {
return 0, io.EOF if channelClosed(st.done) {
return 0, net.ErrClosed
}
deadline := st.readDeadline.wait()
if channelClosed(deadline) {
return 0, os.ErrDeadlineExceeded
}
if len(p) == 0 {
return 0, nil
}
if len(st.readBuf) > 0 {
n := copy(p, st.readBuf)
st.readBuf = st.readBuf[n:]
return n, nil
}
// A peer FIN ends input after previously received data has been read.
select {
case st.readBuf = <-st.in:
continue
default:
}
select {
case st.readBuf = <-st.in:
case <-st.readDone:
select {
case st.readBuf = <-st.in:
default:
return 0, io.EOF
}
case <-st.done:
return 0, net.ErrClosed
case <-st.s.done:
return 0, st.s.Err()
case <-deadline:
return 0, os.ErrDeadlineExceeded
} }
st.readBuf = b
} }
n := copy(p, st.readBuf)
st.readBuf = st.readBuf[n:]
return n, nil
} }
func (st *stream) Write(p []byte) (int, error) { func (st *stream) Write(p []byte) (int, error) {
st.mu.Lock() st.writeMu.Lock()
closed := st.closed defer st.writeMu.Unlock()
st.mu.Unlock() if channelClosed(st.done) {
if closed {
return 0, errStreamClosed return 0, errStreamClosed
} }
if channelClosed(st.writeDeadline.wait()) {
return 0, os.ErrDeadlineExceeded
}
written := 0 written := 0
for len(p) > 0 { for len(p) > 0 {
n := min(len(p), maxFrameData) n := min(len(p), maxFrameData)
if err := st.s.writeFrame(frame{command: cmdPSH, streamID: st.id, data: p[:n]}); err != nil { accepted, err := st.s.writeStreamFrame(st, frame{command: cmdPSH, streamID: st.id, data: p[:n]})
written += accepted
if err != nil {
return written, err return written, err
} }
written += n
p = p[n:] p = p[n:]
} }
return written, nil return written, nil
} }
func (st *stream) Close() error { func (st *stream) Close() error {
st.mu.Lock() st.closeOnce.Do(func() {
already := st.closed close(st.done)
st.closed = true st.readDeadline.stop()
st.mu.Unlock() st.writeDeadline.stop()
if !already {
st.closeOut.Do(func() {
_ = st.s.writeFrame(frame{command: cmdFIN, streamID: st.id})
})
st.s.removeStream(st.id) st.s.removeStream(st.id)
} // FIN is queued behind any frame already being written. Closing a stream
// must not wait for a stalled transport or interrupt another stream.
st.fin, _ = st.s.queueFrame(frame{command: cmdFIN, streamID: st.id}, nil, nil)
})
return nil return nil
} }
func (st *stream) closeRead() { func (st *stream) closeRead() {
st.closeIn.Do(func() { close(st.in) }) st.closeIn.Do(func() { close(st.readDone) })
} }
func (st *stream) push(data []byte) { func (st *stream) push(data []byte) {
if channelClosed(st.done) || channelClosed(st.readDone) || channelClosed(st.s.done) {
return
}
cp := make([]byte, len(data)) cp := make([]byte, len(data))
copy(cp, data) copy(cp, data)
select { select {
case st.in <- cp: case st.in <- cp:
case <-st.done:
case <-st.readDone:
case <-st.s.done: case <-st.s.done:
} }
} }
func (st *stream) LocalAddr() net.Addr { return st.s.conn.LocalAddr() } func (st *stream) LocalAddr() net.Addr { return st.s.conn.LocalAddr() }
func (st *stream) RemoteAddr() net.Addr { return st.s.conn.RemoteAddr() } func (st *stream) RemoteAddr() net.Addr { return st.s.conn.RemoteAddr() }
func (st *stream) SetDeadline(t time.Time) error { return st.s.conn.SetDeadline(t) } func (st *stream) SetDeadline(t time.Time) error {
func (st *stream) SetReadDeadline(t time.Time) error { return st.s.conn.SetReadDeadline(t) } if err := st.SetReadDeadline(t); err != nil {
func (st *stream) SetWriteDeadline(t time.Time) error { return st.s.conn.SetWriteDeadline(t) } return err
}
return st.SetWriteDeadline(t)
}
func (st *stream) SetReadDeadline(t time.Time) error {
if channelClosed(st.done) || channelClosed(st.s.done) {
return net.ErrClosed
}
st.readDeadline.set(t)
return nil
}
func (st *stream) SetWriteDeadline(t time.Time) error {
if channelClosed(st.done) || channelClosed(st.s.done) {
return net.ErrClosed
}
st.writeDeadline.set(t)
return nil
}
+38 -24
View File
@@ -25,6 +25,20 @@ const (
chunkSize = 1 << 13 // 8192 chunkSize = 1 << 13 // 8192
) )
// putBE16 writes v to buf as a big-endian uint16.
func putBE16(buf *bytes.Buffer, v uint16) {
var b [2]byte
binary.BigEndian.PutUint16(b[:], v)
buf.Write(b[:])
}
// putBE32 writes v to buf as a big-endian uint32.
func putBE32(buf *bytes.Buffer, v uint32) {
var b [4]byte
binary.BigEndian.PutUint32(b[:], v)
buf.Write(b[:])
}
// TLSObfs struct // TLSObfs struct
type TLSObfs struct { type TLSObfs struct {
obfsHost string obfsHost string
@@ -67,7 +81,7 @@ func (c *TLSObfsConn) Write(b []byte) (int, error) {
end := min(i+chunkSize, n) end := min(i+chunkSize, n)
buf.Write([]byte{0x17, 0x03, 0x03}) buf.Write([]byte{0x17, 0x03, 0x03})
binary.Write(buf, binary.BigEndian, uint16(len(b[i:end]))) putBE16(buf, uint16(len(b[i:end])))
buf.Write(b[i:end]) buf.Write(b[i:end])
_, err := c.Conn.Write(buf.Bytes()) _, err := c.Conn.Write(buf.Bytes())
@@ -143,7 +157,7 @@ func (c *TLSObfsConn) handshake(b []byte) (int, error) {
buf.Write([]byte{0x03, 0x01}) buf.Write([]byte{0x03, 0x01})
// length // length
binary.Write(buf, binary.BigEndian, uint16(handshakeLen)) putBE16(buf, uint16(handshakeLen))
// Handshake Begin // Handshake Begin
// Handshake Type: Client Hello (1) // Handshake Type: Client Hello (1)
@@ -157,7 +171,7 @@ func (c *TLSObfsConn) handshake(b []byte) (int, error) {
// Extension Begin // Extension Begin
// ext content length // ext content length
binary.Write(buf, binary.BigEndian, uint16(extLen)) putBE16(buf, uint16(extLen))
// ext content // ext content
buf.Write(bufExt.Bytes()) buf.Write(bufExt.Bytes())
@@ -182,7 +196,7 @@ func clientHello(buf *bytes.Buffer) {
// clients do not send current time, and server do not check it, // clients do not send current time, and server do not check it,
// golang tls client and chrome browser send random bytes instead. // golang tls client and chrome browser send random bytes instead.
// //
binary.Write(buf, binary.BigEndian, uint32(time.Now().Unix())) putBE32(buf, uint32(time.Now().Unix()))
random := make([]byte, 28) random := make([]byte, 28)
// The above 2 lines of codes was added to make it compatible with some server implementation, // The above 2 lines of codes was added to make it compatible with some server implementation,
// if we don't need the compatibility, just use the following code instead. // if we don't need the compatibility, just use the following code instead.
@@ -200,7 +214,7 @@ func clientHello(buf *bytes.Buffer) {
// https://github.com/shadowsocks/simple-obfs/blob/7659eeccf473aa41eb294e92c32f8f60a8747325/src/obfs_tls.c#L57 // https://github.com/shadowsocks/simple-obfs/blob/7659eeccf473aa41eb294e92c32f8f60a8747325/src/obfs_tls.c#L57
// Cipher Suites Length: 56 // Cipher Suites Length: 56
binary.Write(buf, binary.BigEndian, uint16(56)) putBE16(buf, uint16(56))
// Cipher Suites (28 suites) // Cipher Suites (28 suites)
buf.Write([]byte{ buf.Write([]byte{
0xc0, 0x2c, 0xc0, 0x30, 0x00, 0x9f, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x2b, 0xc0, 0x2f, 0xc0, 0x2c, 0xc0, 0x30, 0x00, 0x9f, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x2b, 0xc0, 0x2f,
@@ -219,44 +233,44 @@ func extension(b []byte, server string, buf *bytes.Buffer) {
// Extension: SessionTicket TLS // Extension: SessionTicket TLS
buf.Write([]byte{0x00, 0x23}) // type buf.Write([]byte{0x00, 0x23}) // type
// NOTE: send some data in sessionticket, the server will treat it as data too // NOTE: send some data in sessionticket, the server will treat it as data too
binary.Write(buf, binary.BigEndian, uint16(len(b))) // length putBE16(buf, uint16(len(b))) // length
buf.Write(b) buf.Write(b)
// Extension: server_name // Extension: server_name
buf.Write([]byte{0x00, 0x00}) // type buf.Write([]byte{0x00, 0x00}) // type
binary.Write(buf, binary.BigEndian, uint16(len(server)+5)) // length putBE16(buf, uint16(len(server)+5)) // length
binary.Write(buf, binary.BigEndian, uint16(len(server)+3)) // Server Name list length putBE16(buf, uint16(len(server)+3)) // Server Name list length
buf.WriteByte(0x00) // Server Name Type: host_name (0) buf.WriteByte(0x00) // Server Name Type: host_name (0)
binary.Write(buf, binary.BigEndian, uint16(len(server))) // Server Name length putBE16(buf, uint16(len(server))) // Server Name length
buf.WriteString(server) buf.WriteString(server)
// https://github.com/shadowsocks/simple-obfs/blob/7659eeccf473aa41eb294e92c32f8f60a8747325/src/obfs_tls.c#L88 // https://github.com/shadowsocks/simple-obfs/blob/7659eeccf473aa41eb294e92c32f8f60a8747325/src/obfs_tls.c#L88
// Extension: ec_point_formats (len=4) // Extension: ec_point_formats (len=4)
buf.Write([]byte{0x00, 0x0b}) // type buf.Write([]byte{0x00, 0x0b}) // type
binary.Write(buf, binary.BigEndian, uint16(4)) // length putBE16(buf, uint16(4)) // length
buf.WriteByte(0x03) // format length buf.WriteByte(0x03) // format length
buf.Write([]byte{0x01, 0x00, 0x02}) buf.Write([]byte{0x01, 0x00, 0x02})
// Extension: supported_groups (len=10) // Extension: supported_groups (len=10)
buf.Write([]byte{0x00, 0x0a}) // type buf.Write([]byte{0x00, 0x0a}) // type
binary.Write(buf, binary.BigEndian, uint16(10)) // length putBE16(buf, uint16(10)) // length
binary.Write(buf, binary.BigEndian, uint16(8)) // Supported Groups List Length: 8 putBE16(buf, uint16(8)) // Supported Groups List Length: 8
buf.Write([]byte{0x00, 0x1d, 0x00, 0x17, 0x00, 0x19, 0x00, 0x18}) buf.Write([]byte{0x00, 0x1d, 0x00, 0x17, 0x00, 0x19, 0x00, 0x18})
// Extension: signature_algorithms (len=32) // Extension: signature_algorithms (len=32)
buf.Write([]byte{0x00, 0x0d}) // type buf.Write([]byte{0x00, 0x0d}) // type
binary.Write(buf, binary.BigEndian, uint16(32)) // length putBE16(buf, uint16(32)) // length
binary.Write(buf, binary.BigEndian, uint16(30)) // Signature Hash Algorithms Length: 30 putBE16(buf, uint16(30)) // Signature Hash Algorithms Length: 30
buf.Write([]byte{ buf.Write([]byte{
0x06, 0x01, 0x06, 0x02, 0x06, 0x03, 0x05, 0x01, 0x05, 0x02, 0x05, 0x03, 0x04, 0x01, 0x04, 0x02, 0x06, 0x01, 0x06, 0x02, 0x06, 0x03, 0x05, 0x01, 0x05, 0x02, 0x05, 0x03, 0x04, 0x01, 0x04, 0x02,
0x04, 0x03, 0x03, 0x01, 0x03, 0x02, 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x03, 0x04, 0x03, 0x03, 0x01, 0x03, 0x02, 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x03,
}) })
// Extension: encrypt_then_mac (len=0) // Extension: encrypt_then_mac (len=0)
buf.Write([]byte{0x00, 0x16}) // type buf.Write([]byte{0x00, 0x16}) // type
binary.Write(buf, binary.BigEndian, uint16(0)) // length putBE16(buf, uint16(0)) // length
// Extension: extended_master_secret (len=0) // Extension: extended_master_secret (len=0)
buf.Write([]byte{0x00, 0x17}) // type buf.Write([]byte{0x00, 0x17}) // type
binary.Write(buf, binary.BigEndian, uint16(0)) // length putBE16(buf, uint16(0)) // length
} }
+3 -1
View File
@@ -79,7 +79,9 @@ func (pc *PktConn) WriteTo(b []byte, addr net.Addr) (int, error) {
defer pool.PutBytesBuffer(buf) defer pool.PutBytesBuffer(buf)
tgtLen, _ := buf.Write(target) tgtLen, _ := buf.Write(target)
binary.Write(buf, binary.BigEndian, uint16(len(b))) var hdr [2]byte
binary.BigEndian.PutUint16(hdr[:], uint16(len(b)))
buf.Write(hdr[:])
buf.WriteString("\r\n") buf.WriteString("\r\n")
buf.Write(b) buf.Write(b)
+3 -4
View File
@@ -81,10 +81,9 @@ func NewClientConn(c net.Conn, uuid [16]byte, network, target string) (*ClientCo
buf.WriteByte(byte(cmd)) // cmd buf.WriteByte(byte(cmd)) // cmd
// target // target
err = binary.Write(buf, binary.BigEndian, uint16(port)) // port var portBuf [2]byte
if err != nil { binary.BigEndian.PutUint16(portBuf[:], uint16(port))
return nil, err buf.Write(portBuf[:])
}
buf.WriteByte(byte(atyp)) // atyp buf.WriteByte(byte(atyp)) // atyp
buf.Write(addr) //addr buf.Write(addr) //addr
+3 -1
View File
@@ -46,7 +46,9 @@ func (pc *PktConn) WriteTo(b []byte, addr net.Addr) (int, error) {
buf := pool.GetBytesBuffer() buf := pool.GetBytesBuffer()
defer pool.PutBytesBuffer(buf) defer pool.PutBytesBuffer(buf)
binary.Write(buf, binary.BigEndian, uint16(len(b))) var hdr [2]byte
binary.BigEndian.PutUint16(hdr[:], uint16(len(b)))
buf.Write(hdr[:])
buf.Write(b) buf.Write(b)
n, err := pc.Write(buf.Bytes()) n, err := pc.Write(buf.Bytes())
+5 -9
View File
@@ -119,17 +119,13 @@ func (h *hMacCreator) Create() hash.Hash {
} }
func createAuthID(cmdKey []byte, time int64) [16]byte { func createAuthID(cmdKey []byte, time int64) [16]byte {
buf := &bytes.Buffer{} var buf [16]byte
binary.Write(buf, binary.BigEndian, time) binary.BigEndian.PutUint64(buf[0:8], uint64(time))
rand.Read(buf[8:12])
random := make([]byte, 4) binary.BigEndian.PutUint32(buf[12:16], crc32.ChecksumIEEE(buf[:12]))
rand.Read(random)
buf.Write(random)
zero := crc32.ChecksumIEEE(buf.Bytes())
binary.Write(buf, binary.BigEndian, zero)
aesBlock, _ := aes.NewCipher(kdf(cmdKey[:], kdfSaltConstAuthIDEncryptionKey)[:16]) aesBlock, _ := aes.NewCipher(kdf(cmdKey[:], kdfSaltConstAuthIDEncryptionKey)[:16])
var result [16]byte var result [16]byte
aesBlock.Encrypt(result[:], buf.Bytes()) aesBlock.Encrypt(result[:], buf[:])
return result return result
} }
+5 -3
View File
@@ -201,9 +201,11 @@ func (c *Conn) Request(cmd CmdType) error {
buf.WriteByte(byte(cmd)) // cmd buf.WriteByte(byte(cmd)) // cmd
// target // target
binary.Write(buf, binary.BigEndian, uint16(c.port)) // port var port [2]byte
buf.WriteByte(byte(c.atyp)) // atyp binary.BigEndian.PutUint16(port[:], uint16(c.port))
buf.Write(c.addr) // addr buf.Write(port[:])
buf.WriteByte(byte(c.atyp)) // atyp
buf.Write(c.addr) // addr
// padding // padding
if paddingLen > 0 { if paddingLen > 0 {