Skip to content

Commit c8010df

Browse files
committed
🪄 all: go fmt ./... && go fix ./...
1 parent 19a17e9 commit c8010df

6 files changed

Lines changed: 33 additions & 44 deletions

File tree

cache/cache.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ func (c *BoundedCache[K, V]) insert(key K, value V) {
158158

159159
node := &boundedNode[K, V]{
160160
prev: c.tail,
161-
Entry: Entry[K, V]{Key: key, Value: value},
161+
Key: key,
162+
Value: value,
162163
}
163164

164165
c.nodeByKey[key] = node

dns/dns.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,8 @@ func (r *Resolver) sendQueries(ctx context.Context, nameString string, result *r
250250
qBuf := make([]byte, 2+512+2+512)
251251

252252
q4 := dnsmessage.Message{
253-
Header: dnsmessage.Header{
254-
ID: 4,
255-
RecursionDesired: true,
256-
},
253+
ID: 4,
254+
RecursionDesired: true,
257255
Questions: []dnsmessage.Question{
258256
{
259257
Name: name,
@@ -275,10 +273,8 @@ func (r *Resolver) sendQueries(ctx context.Context, nameString string, result *r
275273
q4PktEnd := 2 + len(q4Pkt)
276274

277275
q6 := dnsmessage.Message{
278-
Header: dnsmessage.Header{
279-
ID: 6,
280-
RecursionDesired: true,
281-
},
276+
ID: 6,
277+
RecursionDesired: true,
282278
Questions: []dnsmessage.Question{
283279
{
284280
Name: name,

netio/pipe.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -149,24 +149,24 @@ func NewPipe() (pl, pr *PipeConn) {
149149
oe2 := newOnceError()
150150

151151
return &PipeConn{
152-
rdRx: cb1, rdTx: cn1,
153-
wrTx: cb2, wrRx: cn2,
154-
localDone: done1, remoteDone: done2,
155-
closeLocalDone: closeDone1, closeRemoteDone: closeDone2,
156-
readError: oe1,
157-
writeError: oe2,
158-
readDeadline: makePipeDeadline(),
159-
writeDeadline: makePipeDeadline(),
160-
}, &PipeConn{
161-
rdRx: cb2, rdTx: cn2,
162-
wrTx: cb1, wrRx: cn1,
163-
localDone: done2, remoteDone: done1,
164-
closeLocalDone: closeDone2, closeRemoteDone: closeDone1,
165-
readError: oe2,
166-
writeError: oe1,
167-
readDeadline: makePipeDeadline(),
168-
writeDeadline: makePipeDeadline(),
169-
}
152+
rdRx: cb1, rdTx: cn1,
153+
wrTx: cb2, wrRx: cn2,
154+
localDone: done1, remoteDone: done2,
155+
closeLocalDone: closeDone1, closeRemoteDone: closeDone2,
156+
readError: oe1,
157+
writeError: oe2,
158+
readDeadline: makePipeDeadline(),
159+
writeDeadline: makePipeDeadline(),
160+
}, &PipeConn{
161+
rdRx: cb2, rdTx: cn2,
162+
wrTx: cb1, wrRx: cn1,
163+
localDone: done2, remoteDone: done1,
164+
closeLocalDone: closeDone2, closeRemoteDone: closeDone1,
165+
readError: oe2,
166+
writeError: oe1,
167+
readDeadline: makePipeDeadline(),
168+
writeDeadline: makePipeDeadline(),
169+
}
170170
}
171171

172172
// LocalAddr implements [Conn.LocalAddr].

probe/udp.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,8 @@ func (p UDPProbe) Probe(ctx context.Context, client zerocopy.UDPClient) error {
7575

7676
const rrTypeHTTPS = 65
7777
msg := dnsmessage.Message{
78-
Header: dnsmessage.Header{
79-
ID: uint16(rand.Uint64()),
80-
RecursionDesired: true,
81-
},
78+
ID: uint16(rand.Uint64()),
79+
RecursionDesired: true,
8280
Questions: []dnsmessage.Question{
8381
{
8482
Name: name,

ss2022/crypto.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,7 @@ func clientPSKHashes(iPSKs [][]byte, psk []byte) [][IdentityHeaderLength]byte {
153153
// NewClientCipherConfig returns a new ClientCipherConfig.
154154
func NewClientCipherConfig(psk []byte, iPSKs [][]byte, enableUDP bool) (c *ClientCipherConfig, err error) {
155155
c = &ClientCipherConfig{
156-
UserCipherConfig: UserCipherConfig{
157-
PSK: psk,
158-
},
156+
PSK: psk,
159157
iPSKs: iPSKs,
160158
eihPSKHashes: clientPSKHashes(iPSKs, psk),
161159
}

ss2022/tcp.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,9 @@ func (c *StreamClient) DialStream(ctx context.Context, targetAddr conn.Addr, pay
176176
}
177177

178178
clientConn = &ShadowStreamClientConn{
179-
ShadowStreamConn: ShadowStreamConn{
180-
Conn: innerConn,
181-
writeBuf: writeBuf,
182-
writeCipher: shadowStreamCipher,
183-
},
179+
Conn: innerConn,
180+
writeBuf: writeBuf,
181+
writeCipher: shadowStreamCipher,
184182
readOnceOrFull: c.readOnceOrFull,
185183
unsafeResponseStreamPrefix: c.unsafeResponseStreamPrefix,
186184
cipherConfig: c.cipherConfig,
@@ -413,11 +411,9 @@ func (s *StreamServer) HandleStream(rawRW netio.Conn, logger *zap.Logger) (req n
413411
}
414412

415413
req.PendingConn = netio.NopPendingConn(&ShadowStreamServerConn{
416-
ShadowStreamConn: ShadowStreamConn{
417-
Conn: rawRW,
418-
readCipher: shadowStreamCipher,
419-
writeBuf: writeBuf,
420-
},
414+
Conn: rawRW,
415+
readCipher: shadowStreamCipher,
416+
writeBuf: writeBuf,
421417
unsafeResponseStreamPrefix: s.unsafeResponseStreamPrefix,
422418
cipherConfig: userCipherConfig,
423419
requestSalt: extendedSalt,

0 commit comments

Comments
 (0)