@@ -24,18 +24,24 @@ import (
2424 "github.com/metacubex/mihomo/dns"
2525 "github.com/metacubex/mihomo/log"
2626
27+ amnezia "github.com/metacubex/amneziawg-go/device"
2728 wireguard "github.com/metacubex/sing-wireguard"
29+ "github.com/metacubex/wireguard-go/device"
2830
2931 "github.com/sagernet/sing/common/debug"
3032 E "github.com/sagernet/sing/common/exceptions"
3133 M "github.com/sagernet/sing/common/metadata"
32- "github.com/sagernet/wireguard-go/device"
3334)
3435
36+ type wireguardGoDevice interface {
37+ Close ()
38+ IpcSet (uapiConf string ) error
39+ }
40+
3541type WireGuard struct {
3642 * Base
3743 bind * wireguard.ClientBind
38- device * device. Device
44+ device wireguardGoDevice
3945 tunDevice wireguard.Device
4046 dialer proxydialer.SingDialer
4147 resolver * dns.Resolver
@@ -67,6 +73,8 @@ type WireGuardOption struct {
6773 UDP bool `proxy:"udp,omitempty"`
6874 PersistentKeepalive int `proxy:"persistent-keepalive,omitempty"`
6975
76+ AmneziaWGOption * AmneziaWGOption `proxy:"amnezia-wg-option,omitempty"`
77+
7078 Peers []WireGuardPeerOption `proxy:"peers,omitempty"`
7179
7280 RemoteDnsResolve bool `proxy:"remote-dns-resolve,omitempty"`
@@ -84,6 +92,18 @@ type WireGuardPeerOption struct {
8492 AllowedIPs []string `proxy:"allowed-ips,omitempty"`
8593}
8694
95+ type AmneziaWGOption struct {
96+ JC int `proxy:"jc"`
97+ JMin int `proxy:"jmin"`
98+ JMax int `proxy:"jmax"`
99+ S1 int `proxy:"s1"`
100+ S2 int `proxy:"s2"`
101+ H1 uint32 `proxy:"h1"`
102+ H2 uint32 `proxy:"h2"`
103+ H3 uint32 `proxy:"h3"`
104+ H4 uint32 `proxy:"h4"`
105+ }
106+
87107type wgSingErrorHandler struct {
88108 name string
89109}
@@ -243,14 +263,19 @@ func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
243263 if err != nil {
244264 return nil , E .Cause (err , "create WireGuard device" )
245265 }
246- outbound . device = device . NewDevice ( context . Background (), outbound . tunDevice , outbound . bind , & device.Logger {
266+ logger := & device.Logger {
247267 Verbosef : func (format string , args ... interface {}) {
248268 log .SingLogger .Debug (fmt .Sprintf ("[WG](%s) %s" , option .Name , fmt .Sprintf (format , args ... )))
249269 },
250270 Errorf : func (format string , args ... interface {}) {
251271 log .SingLogger .Error (fmt .Sprintf ("[WG](%s) %s" , option .Name , fmt .Sprintf (format , args ... )))
252272 },
253- }, option .Workers )
273+ }
274+ if option .AmneziaWGOption != nil {
275+ outbound .device = amnezia .NewDevice (outbound .tunDevice , outbound .bind , logger , option .Workers )
276+ } else {
277+ outbound .device = device .NewDevice (outbound .tunDevice , outbound .bind , logger , option .Workers )
278+ }
254279
255280 var has6 bool
256281 for _ , address := range outbound .localPrefixes {
@@ -367,6 +392,17 @@ func (w *WireGuard) genIpcConf(ctx context.Context, updateOnly bool) (string, er
367392 ipcConf := ""
368393 if ! updateOnly {
369394 ipcConf += "private_key=" + w .option .PrivateKey + "\n "
395+ if w .option .AmneziaWGOption != nil {
396+ ipcConf += "jc=" + strconv .Itoa (w .option .AmneziaWGOption .JC ) + "\n "
397+ ipcConf += "jmin=" + strconv .Itoa (w .option .AmneziaWGOption .JMin ) + "\n "
398+ ipcConf += "jmax=" + strconv .Itoa (w .option .AmneziaWGOption .JMax ) + "\n "
399+ ipcConf += "s1=" + strconv .Itoa (w .option .AmneziaWGOption .S1 ) + "\n "
400+ ipcConf += "s2=" + strconv .Itoa (w .option .AmneziaWGOption .S2 ) + "\n "
401+ ipcConf += "h1=" + strconv .FormatUint (uint64 (w .option .AmneziaWGOption .H1 ), 10 ) + "\n "
402+ ipcConf += "h2=" + strconv .FormatUint (uint64 (w .option .AmneziaWGOption .H2 ), 10 ) + "\n "
403+ ipcConf += "h3=" + strconv .FormatUint (uint64 (w .option .AmneziaWGOption .H3 ), 10 ) + "\n "
404+ ipcConf += "h4=" + strconv .FormatUint (uint64 (w .option .AmneziaWGOption .H4 ), 10 ) + "\n "
405+ }
370406 }
371407 if len (w .option .Peers ) > 0 {
372408 for i , peer := range w .option .Peers {
0 commit comments