-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathxray-wasm.patch
623 lines (572 loc) · 17.1 KB
/
xray-wasm.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
diff --git a/app/commander/commander.go b/app/commander/commander.go
index 9ea71e6..4cf8904 100644
--- a/app/commander/commander.go
+++ b/app/commander/commander.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package commander
import (
diff --git a/app/dispatcher/default.go b/app/dispatcher/default.go
index 42fca67..29b39c5 100644
--- a/app/dispatcher/default.go
+++ b/app/dispatcher/default.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package dispatcher
import (
diff --git a/app/dispatcher/fakednssniffer.go b/app/dispatcher/fakednssniffer.go
index bed9087..78b4406 100644
--- a/app/dispatcher/fakednssniffer.go
+++ b/app/dispatcher/fakednssniffer.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package dispatcher
import (
diff --git a/app/dispatcher/sniffer.go b/app/dispatcher/sniffer.go
index c138447..fa65d99 100644
--- a/app/dispatcher/sniffer.go
+++ b/app/dispatcher/sniffer.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package dispatcher
import (
diff --git a/app/log/command/command.go b/app/log/command/command.go
index 2df8ce6..7c6113f 100644
--- a/app/log/command/command.go
+++ b/app/log/command/command.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package command
import (
diff --git a/app/metrics/metrics.go b/app/metrics/metrics.go
index 757d673..72628c1 100644
--- a/app/metrics/metrics.go
+++ b/app/metrics/metrics.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package metrics
import (
diff --git a/app/observatory/command/command.go b/app/observatory/command/command.go
index aab85e8..6d7435d 100644
--- a/app/observatory/command/command.go
+++ b/app/observatory/command/command.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package command
import (
diff --git a/app/observatory/observer.go b/app/observatory/observer.go
index f29856d..83642e1 100644
--- a/app/observatory/observer.go
+++ b/app/observatory/observer.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package observatory
import (
diff --git a/app/proxyman/command/command.go b/app/proxyman/command/command.go
index 3c7824d..aea86c1 100644
--- a/app/proxyman/command/command.go
+++ b/app/proxyman/command/command.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package command
import (
diff --git a/app/proxyman/inbound/always.go b/app/proxyman/inbound/always.go
index ff585c8..cb2ceba 100644
--- a/app/proxyman/inbound/always.go
+++ b/app/proxyman/inbound/always.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package inbound
import (
diff --git a/app/proxyman/inbound/dynamic.go b/app/proxyman/inbound/dynamic.go
index 0a98b88..3a3e477 100644
--- a/app/proxyman/inbound/dynamic.go
+++ b/app/proxyman/inbound/dynamic.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package inbound
import (
diff --git a/app/proxyman/inbound/inbound.go b/app/proxyman/inbound/inbound.go
index cc6aa9d..70f95b8 100644
--- a/app/proxyman/inbound/inbound.go
+++ b/app/proxyman/inbound/inbound.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package inbound
import (
diff --git a/app/proxyman/inbound/worker.go b/app/proxyman/inbound/worker.go
index 14df725..b0e4027 100644
--- a/app/proxyman/inbound/worker.go
+++ b/app/proxyman/inbound/worker.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package inbound
import (
diff --git a/app/proxyman/outbound/handler.go b/app/proxyman/outbound/handler.go
index df7d52a..3ecd2c9 100644
--- a/app/proxyman/outbound/handler.go
+++ b/app/proxyman/outbound/handler.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package outbound
import (
diff --git a/app/proxyman/outbound/outbound.go b/app/proxyman/outbound/outbound.go
index 8660e6a..bf5cfa1 100644
--- a/app/proxyman/outbound/outbound.go
+++ b/app/proxyman/outbound/outbound.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package outbound
import (
diff --git a/app/proxyman/outbound/uot.go b/app/proxyman/outbound/uot.go
index 659f65a..92af387 100644
--- a/app/proxyman/outbound/uot.go
+++ b/app/proxyman/outbound/uot.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package outbound
import (
diff --git a/app/stats/command/command.go b/app/stats/command/command.go
index e4926ba..7108e9d 100644
--- a/app/stats/command/command.go
+++ b/app/stats/command/command.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package command
import (
diff --git a/common/buf/readv_reader_wasm.go b/common/buf/readv_reader_wasm.go
index 30b52e7..0354511 100644
--- a/common/buf/readv_reader_wasm.go
+++ b/common/buf/readv_reader_wasm.go
@@ -6,10 +6,12 @@ package buf
import (
"io"
"syscall"
+
+ "github.com/xtls/xray-core/features/stats"
)
const useReadv = false
-func NewReadVReader(reader io.Reader, rawConn syscall.RawConn) Reader {
+func NewReadVReader(reader io.Reader, rawConn syscall.RawConn, counter stats.Counter) Reader {
panic("not implemented")
}
diff --git a/common/common.go b/common/common.go
index c00371b..caf70fd 100644
--- a/common/common.go
+++ b/common/common.go
@@ -151,3 +151,6 @@ func GetModuleName(pathToProjectRoot string) (string, error) {
}
return moduleName, fmt.Errorf("no `go.mod` file in every parent directory of `%s`", pathToProjectRoot)
}
+
+// len(syscall.RawSockaddrUnix{}.Path)
+const RawSockAddrUnixLen = 108
diff --git a/infra/conf/shadowsocks.go b/infra/conf/shadowsocks.go
index f12040a..c408bcf 100644
--- a/infra/conf/shadowsocks.go
+++ b/infra/conf/shadowsocks.go
@@ -3,7 +3,6 @@ package conf
import (
"strings"
- "github.com/sagernet/sing-shadowsocks/shadowaead_2022"
C "github.com/sagernet/sing/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/protocol"
@@ -13,6 +12,12 @@ import (
"google.golang.org/protobuf/proto"
)
+var aeadList = []string{
+ "2022-blake3-aes-128-gcm",
+ "2022-blake3-aes-256-gcm",
+ "2022-blake3-chacha20-poly1305",
+}
+
func cipherFromString(c string) shadowsocks.CipherType {
switch strings.ToLower(c) {
case "aes-128-gcm", "aead_aes_128_gcm":
@@ -50,7 +55,7 @@ type ShadowsocksServerConfig struct {
}
func (v *ShadowsocksServerConfig) Build() (proto.Message, error) {
- if C.Contains(shadowaead_2022.List, v.Cipher) {
+ if C.Contains(aeadList, v.Cipher) {
return buildShadowsocks2022(v)
}
@@ -182,7 +187,7 @@ func (v *ShadowsocksClientConfig) Build() (proto.Message, error) {
if len(v.Servers) == 1 {
server := v.Servers[0]
- if C.Contains(shadowaead_2022.List, server.Cipher) {
+ if C.Contains(aeadList, server.Cipher) {
if server.Address == nil {
return nil, errors.New("Shadowsocks server address is not set.")
}
@@ -207,7 +212,7 @@ func (v *ShadowsocksClientConfig) Build() (proto.Message, error) {
config := new(shadowsocks.ClientConfig)
serverSpecs := make([]*protocol.ServerEndpoint, len(v.Servers))
for idx, server := range v.Servers {
- if C.Contains(shadowaead_2022.List, server.Cipher) {
+ if C.Contains(aeadList, server.Cipher) {
return nil, errors.New("Shadowsocks 2022 accept no multi servers")
}
if server.Address == nil {
diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go
index ca8f3fe..080e0da 100644
--- a/infra/conf/transport_internet.go
+++ b/infra/conf/transport_internet.go
@@ -9,8 +9,8 @@ import (
"runtime"
"strconv"
"strings"
- "syscall"
+ "github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/platform/filesystem"
@@ -562,7 +562,7 @@ func (c *REALITYConfig) Build() (proto.Message, error) {
case '@', '/':
c.Type = "unix"
if s[0] == '@' && len(s) > 1 && s[1] == '@' && (runtime.GOOS == "linux" || runtime.GOOS == "android") {
- fullAddr := make([]byte, len(syscall.RawSockaddrUnix{}.Path)) // may need padding to work with haproxy
+ fullAddr := make([]byte, common.RawSockAddrUnixLen) // may need padding to work with haproxy
copy(fullAddr, s[1:])
s = string(fullAddr)
}
diff --git a/infra/conf/trojan.go b/infra/conf/trojan.go
index 62c8f55..b224d5a 100644
--- a/infra/conf/trojan.go
+++ b/infra/conf/trojan.go
@@ -6,8 +6,8 @@ import (
"runtime"
"strconv"
"strings"
- "syscall"
+ "github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol"
@@ -149,7 +149,7 @@ func (c *TrojanServerConfig) Build() (proto.Message, error) {
} else if filepath.IsAbs(fb.Dest) || fb.Dest[0] == '@' {
fb.Type = "unix"
if strings.HasPrefix(fb.Dest, "@@") && (runtime.GOOS == "linux" || runtime.GOOS == "android") {
- fullAddr := make([]byte, len(syscall.RawSockaddrUnix{}.Path)) // may need padding to work with haproxy
+ fullAddr := make([]byte, common.RawSockAddrUnixLen) // may need padding to work with haproxy
copy(fullAddr, fb.Dest[1:])
fb.Dest = string(fullAddr)
}
diff --git a/infra/conf/vless.go b/infra/conf/vless.go
index 27da68d..3e9f2d1 100644
--- a/infra/conf/vless.go
+++ b/infra/conf/vless.go
@@ -6,8 +6,8 @@ import (
"runtime"
"strconv"
"strings"
- "syscall"
+ "github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol"
@@ -105,7 +105,7 @@ func (c *VLessInboundConfig) Build() (proto.Message, error) {
} else if filepath.IsAbs(fb.Dest) || fb.Dest[0] == '@' {
fb.Type = "unix"
if strings.HasPrefix(fb.Dest, "@@") && (runtime.GOOS == "linux" || runtime.GOOS == "android") {
- fullAddr := make([]byte, len(syscall.RawSockaddrUnix{}.Path)) // may need padding to work with haproxy
+ fullAddr := make([]byte, common.RawSockAddrUnixLen) // may need padding to work with haproxy
copy(fullAddr, fb.Dest[1:])
fb.Dest = string(fullAddr)
}
diff --git a/proxy/shadowsocks/client.go b/proxy/shadowsocks/client.go
index c2ad1c1..71ef74a 100644
--- a/proxy/shadowsocks/client.go
+++ b/proxy/shadowsocks/client.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package shadowsocks
import (
diff --git a/proxy/shadowsocks/protocol.go b/proxy/shadowsocks/protocol.go
index c992f61..40aa976 100644
--- a/proxy/shadowsocks/protocol.go
+++ b/proxy/shadowsocks/protocol.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package shadowsocks
import (
diff --git a/proxy/shadowsocks/server.go b/proxy/shadowsocks/server.go
index 356868e..576e398 100644
--- a/proxy/shadowsocks/server.go
+++ b/proxy/shadowsocks/server.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package shadowsocks
import (
diff --git a/proxy/shadowsocks_2022/inbound.go b/proxy/shadowsocks_2022/inbound.go
index a889fa0..2a71621 100644
--- a/proxy/shadowsocks_2022/inbound.go
+++ b/proxy/shadowsocks_2022/inbound.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package shadowsocks_2022
import (
diff --git a/proxy/shadowsocks_2022/inbound_multi.go b/proxy/shadowsocks_2022/inbound_multi.go
index 4bfa086..df8096e 100644
--- a/proxy/shadowsocks_2022/inbound_multi.go
+++ b/proxy/shadowsocks_2022/inbound_multi.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package shadowsocks_2022
import (
diff --git a/proxy/shadowsocks_2022/inbound_relay.go b/proxy/shadowsocks_2022/inbound_relay.go
index 19afd46..0a49313 100644
--- a/proxy/shadowsocks_2022/inbound_relay.go
+++ b/proxy/shadowsocks_2022/inbound_relay.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package shadowsocks_2022
import (
diff --git a/proxy/shadowsocks_2022/outbound.go b/proxy/shadowsocks_2022/outbound.go
index dd2e425..9e18e8f 100644
--- a/proxy/shadowsocks_2022/outbound.go
+++ b/proxy/shadowsocks_2022/outbound.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package shadowsocks_2022
import (
diff --git a/transport/internet/filelocker_other.go b/transport/internet/filelocker_other.go
index 36d937c..2ee03fc 100644
--- a/transport/internet/filelocker_other.go
+++ b/transport/internet/filelocker_other.go
@@ -1,5 +1,5 @@
-//go:build !windows
-// +build !windows
+//go:build !wasm && !windows
+// +build !wasm !windows
package internet
diff --git a/transport/internet/filelocker_wasm.go b/transport/internet/filelocker_wasm.go
new file mode 100644
index 0000000..152df97
--- /dev/null
+++ b/transport/internet/filelocker_wasm.go
@@ -0,0 +1,14 @@
+//go:build wasm
+// +build wasm
+
+package internet
+
+// Acquire lock
+func (fl *FileLocker) Acquire() error {
+ panic("unimplemented")
+}
+
+// Release lock
+func (fl *FileLocker) Release() {
+ panic("unimplemented")
+}
diff --git a/transport/internet/grpc/dial.go b/transport/internet/grpc/dial.go
index b8740da..42f9562 100644
--- a/transport/internet/grpc/dial.go
+++ b/transport/internet/grpc/dial.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package grpc
import (
diff --git a/transport/internet/grpc/hub.go b/transport/internet/grpc/hub.go
index ae8788f..48c30f8 100644
--- a/transport/internet/grpc/hub.go
+++ b/transport/internet/grpc/hub.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package grpc
import (
diff --git a/transport/internet/httpupgrade/dialer.go b/transport/internet/httpupgrade/dialer.go
index 013f4f2..f4d3524 100644
--- a/transport/internet/httpupgrade/dialer.go
+++ b/transport/internet/httpupgrade/dialer.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package httpupgrade
import (
diff --git a/transport/internet/httpupgrade/hub.go b/transport/internet/httpupgrade/hub.go
index dc67c74..6ce0a24 100644
--- a/transport/internet/httpupgrade/hub.go
+++ b/transport/internet/httpupgrade/hub.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package httpupgrade
import (
diff --git a/transport/internet/kcp/dialer.go b/transport/internet/kcp/dialer.go
index 0a3968d..010c6a0 100644
--- a/transport/internet/kcp/dialer.go
+++ b/transport/internet/kcp/dialer.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package kcp
import (
diff --git a/transport/internet/kcp/listener.go b/transport/internet/kcp/listener.go
index 71ce646..60e98c9 100644
--- a/transport/internet/kcp/listener.go
+++ b/transport/internet/kcp/listener.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package kcp
import (
diff --git a/transport/internet/splithttp/dialer.go b/transport/internet/splithttp/dialer.go
index d2e89eb..80da178 100644
--- a/transport/internet/splithttp/dialer.go
+++ b/transport/internet/splithttp/dialer.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package splithttp
import (
diff --git a/transport/internet/splithttp/hub.go b/transport/internet/splithttp/hub.go
index 58113f0..e7f5ce8 100644
--- a/transport/internet/splithttp/hub.go
+++ b/transport/internet/splithttp/hub.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package splithttp
import (
diff --git a/transport/internet/system_listener.go b/transport/internet/system_listener.go
index ad7ae89..a275073 100644
--- a/transport/internet/system_listener.go
+++ b/transport/internet/system_listener.go
@@ -13,6 +13,7 @@ import (
"github.com/sagernet/sing/common/control"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
+ "github.com/xtls/xray-core/common"
)
var effectiveListener = DefaultListener{}
@@ -83,8 +84,9 @@ func (dl *DefaultListener) Listen(ctx context.Context, addr net.Addr, sockopt *S
if (runtime.GOOS == "linux" || runtime.GOOS == "android") && address[0] == '@' {
// linux abstract unix domain socket is lockfree
if len(address) > 1 && address[1] == '@' {
+ // 108 = len(syscall.RawSockaddrUnix{}.Path)
// but may need padding to work with haproxy
- fullAddr := make([]byte, len(syscall.RawSockaddrUnix{}.Path))
+ fullAddr := make([]byte, common.RawSockAddrUnixLen)
copy(fullAddr, address[1:])
address = string(fullAddr)
}
diff --git a/transport/internet/tcp/dialer.go b/transport/internet/tcp/dialer.go
index bf50ed7..f38848c 100644
--- a/transport/internet/tcp/dialer.go
+++ b/transport/internet/tcp/dialer.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package tcp
import (
diff --git a/transport/internet/tcp/hub.go b/transport/internet/tcp/hub.go
index 84e3916..65cf614 100644
--- a/transport/internet/tcp/hub.go
+++ b/transport/internet/tcp/hub.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package tcp
import (
diff --git a/transport/internet/udp/dialer.go b/transport/internet/udp/dialer.go
index 27f1505..99a9bce 100644
--- a/transport/internet/udp/dialer.go
+++ b/transport/internet/udp/dialer.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package udp
import (
diff --git a/transport/internet/udp/hub.go b/transport/internet/udp/hub.go
index c16085d..73f9065 100644
--- a/transport/internet/udp/hub.go
+++ b/transport/internet/udp/hub.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package udp
import (
diff --git a/transport/internet/websocket/dialer.go b/transport/internet/websocket/dialer.go
index aa15c1a..aebb52a 100644
--- a/transport/internet/websocket/dialer.go
+++ b/transport/internet/websocket/dialer.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package websocket
import (
diff --git a/transport/internet/websocket/hub.go b/transport/internet/websocket/hub.go
index 6e07d9a..6a54f8d 100644
--- a/transport/internet/websocket/hub.go
+++ b/transport/internet/websocket/hub.go
@@ -1,3 +1,6 @@
+//go:build !wasm
+// +build !wasm
+
package websocket
import (