wireguard - noKernelTun

This commit is contained in:
MHSanaei 2024-10-20 12:01:55 +02:00
parent 07bf741b15
commit bebf83f06c
No known key found for this signature in database
GPG key ID: 7E4060F2FBE5AB7A
6 changed files with 15 additions and 34 deletions

View file

@ -1182,8 +1182,7 @@ Outbound.WireguardSettings = class extends CommonClass {
domainStrategy = '', domainStrategy = '',
reserved = '', reserved = '',
peers = [new Outbound.WireguardSettings.Peer()], peers = [new Outbound.WireguardSettings.Peer()],
kernelMode = false, noKernelTun = false,
kernelTun = false
) { ) {
super(); super();
this.mtu = mtu; this.mtu = mtu;
@ -1194,8 +1193,7 @@ Outbound.WireguardSettings = class extends CommonClass {
this.domainStrategy = domainStrategy; this.domainStrategy = domainStrategy;
this.reserved = Array.isArray(reserved) ? reserved.join(',') : reserved; this.reserved = Array.isArray(reserved) ? reserved.join(',') : reserved;
this.peers = peers; this.peers = peers;
this.kernelMode = kernelMode; this.noKernelTun = noKernelTun;
this.kernelTun = kernelTun;
} }
addPeer() { addPeer() {
@ -1215,8 +1213,7 @@ Outbound.WireguardSettings = class extends CommonClass {
json.domainStrategy, json.domainStrategy,
json.reserved, json.reserved,
json.peers.map(peer => Outbound.WireguardSettings.Peer.fromJson(peer)), json.peers.map(peer => Outbound.WireguardSettings.Peer.fromJson(peer)),
json.kernelMode, json.noKernelTun,
json.kernelTun,
); );
} }
@ -1229,8 +1226,7 @@ Outbound.WireguardSettings = class extends CommonClass {
domainStrategy: WireguardDomainStrategy.includes(this.domainStrategy) ? this.domainStrategy : undefined, domainStrategy: WireguardDomainStrategy.includes(this.domainStrategy) ? this.domainStrategy : undefined,
reserved: this.reserved ? this.reserved.split(",").map(Number) : undefined, reserved: this.reserved ? this.reserved.split(",").map(Number) : undefined,
peers: Outbound.WireguardSettings.Peer.toJsonArray(this.peers), peers: Outbound.WireguardSettings.Peer.toJsonArray(this.peers),
kernelMode: this.kernelMode, noKernelTun: this.noKernelTun,
kernelTun: this.kernelTun,
}; };
} }
}; };

View file

@ -2651,16 +2651,14 @@ Inbound.WireguardSettings = class extends XrayCommonClass {
mtu = 1420, mtu = 1420,
secretKey = Wireguard.generateKeypair().privateKey, secretKey = Wireguard.generateKeypair().privateKey,
peers = [new Inbound.WireguardSettings.Peer()], peers = [new Inbound.WireguardSettings.Peer()],
kernelMode = false, noKernelTun = false
kernelTun = false,
) { ) {
super(protocol); super(protocol);
this.mtu = mtu; this.mtu = mtu;
this.secretKey = secretKey; this.secretKey = secretKey;
this.pubKey = secretKey.length > 0 ? Wireguard.generateKeypair(secretKey).publicKey : ''; this.pubKey = secretKey.length > 0 ? Wireguard.generateKeypair(secretKey).publicKey : '';
this.peers = peers; this.peers = peers;
this.kernelMode = kernelMode; this.noKernelTun = noKernelTun;
this.kernelTun = kernelTun;
} }
addPeer() { addPeer() {
@ -2677,8 +2675,7 @@ Inbound.WireguardSettings = class extends XrayCommonClass {
json.mtu, json.mtu,
json.secretKey, json.secretKey,
json.peers.map(peer => Inbound.WireguardSettings.Peer.fromJson(peer)), json.peers.map(peer => Inbound.WireguardSettings.Peer.fromJson(peer)),
json.kernelMode, json.noKernelTun,
json.kernelTun,
); );
} }
@ -2687,8 +2684,7 @@ Inbound.WireguardSettings = class extends XrayCommonClass {
mtu: this.mtu ?? undefined, mtu: this.mtu ?? undefined,
secretKey: this.secretKey, secretKey: this.secretKey,
peers: Inbound.WireguardSettings.Peer.toJsonArray(this.peers), peers: Inbound.WireguardSettings.Peer.toJsonArray(this.peers),
kernelMode: this.kernelMode, noKernelTun: this.noKernelTun,
kernelTun: this.kernelTun,
}; };
} }
}; };

View file

@ -147,11 +147,8 @@
<a-form-item label='Workers'> <a-form-item label='Workers'>
<a-input-number v-model.number="outbound.settings.workers" min="0"></a-input-number> <a-input-number v-model.number="outbound.settings.workers" min="0"></a-input-number>
</a-form-item> </a-form-item>
<a-form-item label='Kernel Mode'> <a-form-item label='No Kernel Tun'>
<a-switch v-model="outbound.settings.kernelMode"></a-switch> <a-switch v-model="outbound.settings.noKernelTun"></a-switch>
</a-form-item>
<a-form-item label='Kernel Tun'>
<a-switch v-model="outbound.settings.kernelTun"></a-switch>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<template slot="label"> <template slot="label">

View file

@ -18,11 +18,8 @@
<a-form-item label='MTU'> <a-form-item label='MTU'>
<a-input-number v-model.number="inbound.settings.mtu"></a-input-number> <a-input-number v-model.number="inbound.settings.mtu"></a-input-number>
</a-form-item> </a-form-item>
<a-form-item label='Kernel Mode'> <a-form-item label='No Kernel Tun'>
<a-switch v-model="inbound.settings.kernelMode"></a-switch> <a-switch v-model="inbound.settings.noKernelTun"></a-switch>
</a-form-item>
<a-form-item label='Kernel Tun'>
<a-switch v-model="inbound.settings.kernelTun"></a-switch>
</a-form-item> </a-form-item>
<a-form-item label="Peers"> <a-form-item label="Peers">
<a-button icon="plus" type="primary" size="small" @click="inbound.settings.addPeer()"></a-button> <a-button icon="plus" type="primary" size="small" @click="inbound.settings.addPeer()"></a-button>

View file

@ -370,12 +370,8 @@
<td>[[ inbound.settings.mtu ]]</td> <td>[[ inbound.settings.mtu ]]</td>
</tr> </tr>
<tr> <tr>
<td>Kernel Mode</td> <td>No Kernel Tun</td>
<td>[[ inbound.settings.kernelMode ]]</td> <td>[[ inbound.settings.noKernelTun ]]</td>
</tr>
<tr>
<td>Kernel Tun</td>
<td>[[ inbound.settings.kernelTun ]]</td>
</tr> </tr>
<template v-for="(peer, index) in inbound.settings.peers"> <template v-for="(peer, index) in inbound.settings.peers">
<tr> <tr>

View file

@ -147,8 +147,7 @@
publicKey: peer.public_key, publicKey: peer.public_key,
endpoint: peer.endpoint.host, endpoint: peer.endpoint.host,
}], }],
kernelMode: false, noKernelTun: false,
kernelTun: false,
} }
}); });
} }