Skip to content

Commit 808fdcf

Browse files
wwqgtxxwwqgtxx
committed
chore: code cleanup
1 parent 9962a0d commit 808fdcf

File tree

9 files changed

+46
-45
lines changed

9 files changed

+46
-45
lines changed

‎adapter/outbound/anytls.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
tlsC "github.com/metacubex/mihomo/component/tls"
1717
C "github.com/metacubex/mihomo/constant"
1818
"github.com/metacubex/mihomo/transport/anytls"
19-
"github.com/sagernet/sing/common"
19+
2020
M "github.com/sagernet/sing/common/metadata"
2121
"github.com/sagernet/sing/common/uot"
2222
)
@@ -130,7 +130,7 @@ func NewAnyTLS(option AnyTLSOption) (*AnyTLS, error) {
130130
dialer: singDialer,
131131
}
132132
runtime.SetFinalizer(outbound, func(o *AnyTLS) {
133-
common.Close(o.client)
133+
_ = o.client.Close()
134134
})
135135

136136
return outbound, nil

‎listener/anytls/server.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ import (
1010
"strings"
1111

1212
"github.com/metacubex/mihomo/adapter/inbound"
13+
"github.com/metacubex/mihomo/common/atomic"
1314
"github.com/metacubex/mihomo/common/buf"
1415
N "github.com/metacubex/mihomo/common/net"
1516
C "github.com/metacubex/mihomo/constant"
1617
LC "github.com/metacubex/mihomo/listener/config"
1718
"github.com/metacubex/mihomo/listener/sing"
1819
"github.com/metacubex/mihomo/transport/anytls/padding"
1920
"github.com/metacubex/mihomo/transport/anytls/session"
20-
"github.com/sagernet/sing/common/atomic"
21+
2122
"github.com/sagernet/sing/common/auth"
2223
"github.com/sagernet/sing/common/bufio"
2324
M "github.com/sagernet/sing/common/metadata"

‎transport/anytls/client.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88
"net"
99
"time"
1010

11-
tlsC "github.com/metacubex/mihomo/component/tls"
11+
"github.com/metacubex/mihomo/common/atomic"
12+
"github.com/metacubex/mihomo/common/buf"
1213
C "github.com/metacubex/mihomo/constant"
1314
"github.com/metacubex/mihomo/transport/anytls/padding"
1415
"github.com/metacubex/mihomo/transport/anytls/session"
1516
"github.com/metacubex/mihomo/transport/vmess"
16-
"github.com/sagernet/sing/common/atomic"
17-
"github.com/sagernet/sing/common/buf"
17+
1818
M "github.com/sagernet/sing/common/metadata"
1919
N "github.com/sagernet/sing/common/network"
2020
)
@@ -91,7 +91,7 @@ func (c *Client) CreateOutboundTLSConnection(ctx context.Context) (net.Conn, err
9191
ctx, cancel := context.WithTimeout(ctx, C.DefaultTLSTimeout)
9292
defer cancel()
9393

94-
err := utlsConn.(*tlsC.UConn).HandshakeContext(ctx)
94+
err := utlsConn.HandshakeContext(ctx)
9595
return utlsConn, err
9696
}
9797
}

‎transport/anytls/padding/padding.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ import (
88
"strconv"
99
"strings"
1010

11+
"github.com/metacubex/mihomo/common/atomic"
1112
"github.com/metacubex/mihomo/transport/anytls/util"
12-
13-
"github.com/sagernet/sing/common"
14-
"github.com/sagernet/sing/common/atomic"
1513
)
1614

1715
const CheckMark = -1
@@ -73,7 +71,9 @@ func (p *PaddingFactory) GenerateRecordPayloadSizes(pkt uint32) (pktSizes []int)
7371
if err != nil {
7472
continue
7573
}
76-
_min, _max = common.Min(_min, _max), common.Max(_min, _max)
74+
if _min > _max {
75+
_min, _max = _max, _min
76+
}
7777
if _min <= 0 || _max <= 0 {
7878
continue
7979
}

‎transport/anytls/session/client.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ import (
77
"math"
88
"net"
99
"sync"
10-
"sync/atomic"
1110
"time"
1211

12+
"github.com/metacubex/mihomo/common/atomic"
1313
"github.com/metacubex/mihomo/transport/anytls/padding"
1414
"github.com/metacubex/mihomo/transport/anytls/skiplist"
1515
"github.com/metacubex/mihomo/transport/anytls/util"
16-
"github.com/sagernet/sing/common"
17-
singAtomic "github.com/sagernet/sing/common/atomic"
1816
)
1917

2018
type Client struct {
@@ -27,12 +25,12 @@ type Client struct {
2725
idleSession *skiplist.SkipList[uint64, *Session]
2826
idleSessionLock sync.Mutex
2927

30-
padding *singAtomic.TypedValue[*padding.PaddingFactory]
28+
padding *atomic.TypedValue[*padding.PaddingFactory]
3129

3230
idleSessionTimeout time.Duration
3331
}
3432

35-
func NewClient(ctx context.Context, dialOut func(ctx context.Context) (net.Conn, error), _padding *singAtomic.TypedValue[*padding.PaddingFactory], idleSessionCheckInterval, idleSessionTimeout time.Duration) *Client {
33+
func NewClient(ctx context.Context, dialOut func(ctx context.Context) (net.Conn, error), _padding *atomic.TypedValue[*padding.PaddingFactory], idleSessionCheckInterval, idleSessionTimeout time.Duration) *Client {
3634
c := &Client{
3735
dialOut: dialOut,
3836
padding: _padding,
@@ -68,7 +66,7 @@ func (c *Client) CreateStream(ctx context.Context) (net.Conn, error) {
6866
}
6967
stream, err = session.OpenStream()
7068
if err != nil {
71-
common.Close(session, stream)
69+
_ = session.Close()
7270
continue
7371
}
7472
break

‎transport/anytls/session/session.go

+22-22
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import (
77
"net"
88
"runtime/debug"
99
"sync"
10-
"sync/atomic"
1110
"time"
1211

12+
"github.com/metacubex/mihomo/common/atomic"
13+
"github.com/metacubex/mihomo/common/buf"
14+
"github.com/metacubex/mihomo/common/pool"
1315
"github.com/metacubex/mihomo/constant"
1416
"github.com/metacubex/mihomo/log"
1517
"github.com/metacubex/mihomo/transport/anytls/padding"
1618
"github.com/metacubex/mihomo/transport/anytls/util"
17-
singAtomic "github.com/sagernet/sing/common/atomic"
18-
"github.com/sagernet/sing/common/buf"
1919
)
2020

2121
type Session struct {
@@ -33,7 +33,7 @@ type Session struct {
3333
// pool
3434
seq uint64
3535
idleSince time.Time
36-
padding *singAtomic.TypedValue[*padding.PaddingFactory]
36+
padding *atomic.TypedValue[*padding.PaddingFactory]
3737

3838
// client
3939
isClient bool
@@ -45,7 +45,7 @@ type Session struct {
4545
onNewStream func(stream *Stream)
4646
}
4747

48-
func NewClientSession(conn net.Conn, _padding *singAtomic.TypedValue[*padding.PaddingFactory]) *Session {
48+
func NewClientSession(conn net.Conn, _padding *atomic.TypedValue[*padding.PaddingFactory]) *Session {
4949
s := &Session{
5050
conn: conn,
5151
isClient: true,
@@ -56,7 +56,7 @@ func NewClientSession(conn net.Conn, _padding *singAtomic.TypedValue[*padding.Pa
5656
return s
5757
}
5858

59-
func NewServerSession(conn net.Conn, onNewStream func(stream *Stream), _padding *singAtomic.TypedValue[*padding.PaddingFactory]) *Session {
59+
func NewServerSession(conn net.Conn, onNewStream func(stream *Stream), _padding *atomic.TypedValue[*padding.PaddingFactory]) *Session {
6060
s := &Session{
6161
conn: conn,
6262
onNewStream: onNewStream,
@@ -169,17 +169,17 @@ func (s *Session) recvLoop() error {
169169
switch hdr.Cmd() {
170170
case cmdPSH:
171171
if hdr.Length() > 0 {
172-
buffer := buf.Get(int(hdr.Length()))
172+
buffer := pool.Get(int(hdr.Length()))
173173
if _, err := io.ReadFull(s.conn, buffer); err == nil {
174174
s.streamLock.RLock()
175175
stream, ok := s.streams[sid]
176176
s.streamLock.RUnlock()
177177
if ok {
178178
stream.pipeW.Write(buffer)
179179
}
180-
buf.Put(buffer)
180+
pool.Put(buffer)
181181
} else {
182-
buf.Put(buffer)
182+
pool.Put(buffer)
183183
return err
184184
}
185185
}
@@ -211,18 +211,18 @@ func (s *Session) recvLoop() error {
211211
//logrus.Debugln("stream fin", sid, s.streams)
212212
case cmdWaste:
213213
if hdr.Length() > 0 {
214-
buffer := buf.Get(int(hdr.Length()))
214+
buffer := pool.Get(int(hdr.Length()))
215215
if _, err := io.ReadFull(s.conn, buffer); err != nil {
216-
buf.Put(buffer)
216+
pool.Put(buffer)
217217
return err
218218
}
219-
buf.Put(buffer)
219+
pool.Put(buffer)
220220
}
221221
case cmdSettings:
222222
if hdr.Length() > 0 {
223-
buffer := buf.Get(int(hdr.Length()))
223+
buffer := pool.Get(int(hdr.Length()))
224224
if _, err := io.ReadFull(s.conn, buffer); err != nil {
225-
buf.Put(buffer)
225+
pool.Put(buffer)
226226
return err
227227
}
228228
if !s.isClient {
@@ -235,31 +235,31 @@ func (s *Session) recvLoop() error {
235235
f.data = paddingF.RawScheme
236236
_, err = s.writeFrame(f)
237237
if err != nil {
238-
buf.Put(buffer)
238+
pool.Put(buffer)
239239
return err
240240
}
241241
}
242242
}
243-
buf.Put(buffer)
243+
pool.Put(buffer)
244244
}
245245
case cmdAlert:
246246
if hdr.Length() > 0 {
247-
buffer := buf.Get(int(hdr.Length()))
247+
buffer := pool.Get(int(hdr.Length()))
248248
if _, err := io.ReadFull(s.conn, buffer); err != nil {
249-
buf.Put(buffer)
249+
pool.Put(buffer)
250250
return err
251251
}
252252
if s.isClient {
253253
log.Errorln("[Alert from server] %s", string(buffer))
254254
}
255-
buf.Put(buffer)
255+
pool.Put(buffer)
256256
return nil
257257
}
258258
case cmdUpdatePaddingScheme:
259259
if hdr.Length() > 0 {
260-
buffer := buf.Get(int(hdr.Length()))
260+
buffer := pool.Get(int(hdr.Length()))
261261
if _, err := io.ReadFull(s.conn, buffer); err != nil {
262-
buf.Put(buffer)
262+
pool.Put(buffer)
263263
return err
264264
}
265265
if s.isClient {
@@ -269,7 +269,7 @@ func (s *Session) recvLoop() error {
269269
log.Warnln("[Update padding failed] %x\n", md5.Sum(buffer))
270270
}
271271
}
272-
buf.Put(buffer)
272+
pool.Put(buffer)
273273
}
274274
default:
275275
// I don't know what command it is (can't have data)

‎transport/anytls/skiplist/skiplist.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
"math/bits"
1515
"math/rand"
1616
"time"
17-
18-
"github.com/sagernet/sing/common"
1917
)
2018

2119
const (
@@ -102,7 +100,11 @@ func (sl *SkipList[K, V]) Insert(key K, value V) {
102100
level := sl.randomLevel()
103101
node = newSkipListNode(level, key, value)
104102

105-
for i := 0; i < common.Min(level, sl.level); i++ {
103+
minLevel := level
104+
if sl.level < level {
105+
minLevel = sl.level
106+
}
107+
for i := 0; i < minLevel; i++ {
106108
node.next[i] = prevs[i].next[i]
107109
prevs[i].next[i] = node
108110
}

‎transport/trojan/trojan.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (t *Trojan) StreamConn(ctx context.Context, conn net.Conn) (net.Conn, error
9393
ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTLSTimeout)
9494
defer cancel()
9595

96-
err := utlsConn.(*tlsC.UConn).HandshakeContext(ctx)
96+
err := utlsConn.HandshakeContext(ctx)
9797
return utlsConn, err
9898
}
9999
} else {

‎transport/vmess/tls.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func StreamTLSConn(ctx context.Context, conn net.Conn, cfg *TLSConfig) (net.Conn
3636
if cfg.Reality == nil {
3737
utlsConn, valid := GetUTLSConn(conn, cfg.ClientFingerprint, tlsConfig)
3838
if valid {
39-
err := utlsConn.(*tlsC.UConn).HandshakeContext(ctx)
39+
err = utlsConn.HandshakeContext(ctx)
4040
return utlsConn, err
4141
}
4242
} else {
@@ -53,7 +53,7 @@ func StreamTLSConn(ctx context.Context, conn net.Conn, cfg *TLSConfig) (net.Conn
5353
return tlsConn, err
5454
}
5555

56-
func GetUTLSConn(conn net.Conn, ClientFingerprint string, tlsConfig *tls.Config) (net.Conn, bool) {
56+
func GetUTLSConn(conn net.Conn, ClientFingerprint string, tlsConfig *tls.Config) (*tlsC.UConn, bool) {
5757

5858
if fingerprint, exists := tlsC.GetFingerprint(ClientFingerprint); exists {
5959
utlsConn := tlsC.UClient(conn, tlsConfig, fingerprint)

0 commit comments

Comments
 (0)