chore: use Go1.26
Build / Build (push) Has been cancelled

This commit is contained in:
nadoo committed 2026-06-26 00:58:58 +08:00
1 parent e7b12e36a9
commit 38b34030bc
11 files changed
+13 -36

No files matched your search

+1 -1
View File
@@ -20,7 +20,7 @@ func parsePaddingScheme(raw string) (paddingScheme, error) {
raw = defaultPaddingScheme
}
ps := paddingScheme{raw: raw, authRange: [2]int{0, 0}}
for _, line := range strings.Split(raw, "\n") {
for line := range strings.SplitSeq(raw, "\n") {
line = strings.TrimSpace(line)
if line == "" {
continue
+1 -1
View File
@@ -26,7 +26,7 @@ func encodeSettings(m map[string]string) []byte {
func parseSettings(data []byte) map[string]string {
out := map[string]string{}
for _, line := range strings.Split(string(data), "\n") {
for line := range strings.SplitSeq(string(data), "\n") {
if line == "" {
continue
}
+1 -4
View File
@@ -49,10 +49,7 @@ func (st *stream) Write(p []byte) (int, error) {
}
written := 0
for len(p) > 0 {
n := len(p)
if n > maxFrameData {
n = maxFrameData
}
n := min(len(p), maxFrameData)
if err := st.s.writeFrame(frame{command: cmdPSH, streamID: st.id, data: p[:n]}); err != nil {
return written, err
}
+2 -4
View File
@@ -57,12 +57,10 @@ func Relay(left, right net.Conn) error {
var wg sync.WaitGroup
var wait = 5 * time.Second
wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
_, err1 = Copy(right, left)
right.SetReadDeadline(time.Now().Add(wait)) // unblock read on right
}()
})
_, err = Copy(left, right)
left.SetReadDeadline(time.Now().Add(wait)) // unblock read on left
+1 -4
View File
@@ -104,10 +104,7 @@ func (c *TLSObfsConn) Read(b []byte) (int, error) {
c.leftBytes = int(binary.BigEndian.Uint16(c.buf[:lenSize]))
}
readLen := len(b)
if readLen > c.leftBytes {
readLen = c.leftBytes
}
readLen := min(len(b), c.leftBytes)
m, err := c.reader.Read(b[:readLen])
if err != nil {
+1 -4
View File
@@ -24,10 +24,7 @@ func (w *writer) Write(p []byte) (n int, err error) {
defer pool.PutBuffer(buf)
for nw := 0; n < len(p) && err == nil; n += nw {
end := n + len(buf)
if end > len(p) {
end = len(p)
}
end := min(n+len(buf), len(p))
w.XORKeyStream(buf, p[n:end])
nw, err = w.Writer.Write(buf[:end-n])
}
+1 -4
View File
@@ -39,10 +39,7 @@ func (w *aeadWriter) Write(b []byte) (n int, err error) {
nonce := w.nonce[:w.NonceSize()]
for left := len(b); left != 0; {
writeLen = left + w.Overhead()
if writeLen > chunkSize {
writeLen = chunkSize
}
writeLen = min(left+w.Overhead(), chunkSize)
dataLen = writeLen - w.Overhead()
w.chunkSizeEncoder.Encode(uint16(writeLen), lenBuf)
+2 -8
View File
@@ -23,10 +23,7 @@ func ChunkedWriter(w io.Writer, chunkSizeEncoder ChunkSizeEncoder) io.Writer {
func (w *chunkedWriter) Write(p []byte) (n int, err error) {
var dataLen int
for left := len(p); left != 0; {
dataLen = left
if dataLen > chunkSize {
dataLen = chunkSize
}
dataLen = min(left, chunkSize)
w.chunkSizeEncoder.Encode(uint16(dataLen), w.buf)
if _, err = (&net.Buffers{w.buf[:], p[n : n+dataLen]}).WriteTo(w.Writer); err != nil {
break
@@ -69,10 +66,7 @@ func (r *chunkedReader) Read(p []byte) (int, error) {
}
}
readLen := len(p)
if readLen > r.left {
readLen = r.left
}
readLen := min(len(p), r.left)
n, err := r.Reader.Read(p[:readLen])
if err != nil {
+1 -4
View File
@@ -151,10 +151,7 @@ func (r *frameReader) Read(b []byte) (int, error) {
}
}
readLen := int64(len(b))
if readLen > r.left {
readLen = r.left
}
readLen := min(int64(len(b)), r.left)
m, err := io.ReadFull(r.Reader, b[:readLen])
if err != nil {