diff options
| -rw-r--r-- | web/assets/js/model/outbound.js | 12 | ||||
| -rw-r--r-- | web/assets/js/model/xray.js | 12 | ||||
| -rw-r--r-- | web/html/xui/form/outbound.html | 7 | ||||
| -rw-r--r-- | web/html/xui/form/protocol/wireguard.html | 7 | ||||
| -rw-r--r-- | web/html/xui/inbound_info_modal.html | 8 | ||||
| -rw-r--r-- | web/html/xui/warp_modal.html | 3 |
6 files changed, 15 insertions, 34 deletions
diff --git a/web/assets/js/model/outbound.js b/web/assets/js/model/outbound.js index 4f8a8273..1011278d 100644 --- a/web/assets/js/model/outbound.js +++ b/web/assets/js/model/outbound.js @@ -1182,8 +1182,7 @@ Outbound.WireguardSettings = class extends CommonClass { domainStrategy = '', reserved = '', peers = [new Outbound.WireguardSettings.Peer()], - kernelMode = false, - kernelTun = false + noKernelTun = false, ) { super(); this.mtu = mtu; @@ -1194,8 +1193,7 @@ Outbound.WireguardSettings = class extends CommonClass { this.domainStrategy = domainStrategy; this.reserved = Array.isArray(reserved) ? reserved.join(',') : reserved; this.peers = peers; - this.kernelMode = kernelMode; - this.kernelTun = kernelTun; + this.noKernelTun = noKernelTun; } addPeer() { @@ -1215,8 +1213,7 @@ Outbound.WireguardSettings = class extends CommonClass { json.domainStrategy, json.reserved, json.peers.map(peer => Outbound.WireguardSettings.Peer.fromJson(peer)), - json.kernelMode, - json.kernelTun, + json.noKernelTun, ); } @@ -1229,8 +1226,7 @@ Outbound.WireguardSettings = class extends CommonClass { domainStrategy: WireguardDomainStrategy.includes(this.domainStrategy) ? this.domainStrategy : undefined, reserved: this.reserved ? this.reserved.split(",").map(Number) : undefined, peers: Outbound.WireguardSettings.Peer.toJsonArray(this.peers), - kernelMode: this.kernelMode, - kernelTun: this.kernelTun, + noKernelTun: this.noKernelTun, }; } }; diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 3e99ef34..209a3140 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -2651,16 +2651,14 @@ Inbound.WireguardSettings = class extends XrayCommonClass { mtu = 1420, secretKey = Wireguard.generateKeypair().privateKey, peers = [new Inbound.WireguardSettings.Peer()], - kernelMode = false, - kernelTun = false, + noKernelTun = false ) { super(protocol); this.mtu = mtu; this.secretKey = secretKey; this.pubKey = secretKey.length > 0 ? Wireguard.generateKeypair(secretKey).publicKey : ''; this.peers = peers; - this.kernelMode = kernelMode; - this.kernelTun = kernelTun; + this.noKernelTun = noKernelTun; } addPeer() { @@ -2677,8 +2675,7 @@ Inbound.WireguardSettings = class extends XrayCommonClass { json.mtu, json.secretKey, json.peers.map(peer => Inbound.WireguardSettings.Peer.fromJson(peer)), - json.kernelMode, - json.kernelTun, + json.noKernelTun, ); } @@ -2687,8 +2684,7 @@ Inbound.WireguardSettings = class extends XrayCommonClass { mtu: this.mtu ?? undefined, secretKey: this.secretKey, peers: Inbound.WireguardSettings.Peer.toJsonArray(this.peers), - kernelMode: this.kernelMode, - kernelTun: this.kernelTun, + noKernelTun: this.noKernelTun, }; } }; diff --git a/web/html/xui/form/outbound.html b/web/html/xui/form/outbound.html index f35391cf..07b8f275 100644 --- a/web/html/xui/form/outbound.html +++ b/web/html/xui/form/outbound.html @@ -147,11 +147,8 @@ <a-form-item label='Workers'> <a-input-number v-model.number="outbound.settings.workers" min="0"></a-input-number> </a-form-item> - <a-form-item label='Kernel Mode'> - <a-switch v-model="outbound.settings.kernelMode"></a-switch> - </a-form-item> - <a-form-item label='Kernel Tun'> - <a-switch v-model="outbound.settings.kernelTun"></a-switch> + <a-form-item label='No Kernel Tun'> + <a-switch v-model="outbound.settings.noKernelTun"></a-switch> </a-form-item> <a-form-item> <template slot="label"> diff --git a/web/html/xui/form/protocol/wireguard.html b/web/html/xui/form/protocol/wireguard.html index 60d547e0..31e2e653 100644 --- a/web/html/xui/form/protocol/wireguard.html +++ b/web/html/xui/form/protocol/wireguard.html @@ -18,11 +18,8 @@ <a-form-item label='MTU'> <a-input-number v-model.number="inbound.settings.mtu"></a-input-number> </a-form-item> - <a-form-item label='Kernel Mode'> - <a-switch v-model="inbound.settings.kernelMode"></a-switch> - </a-form-item> - <a-form-item label='Kernel Tun'> - <a-switch v-model="inbound.settings.kernelTun"></a-switch> + <a-form-item label='No Kernel Tun'> + <a-switch v-model="inbound.settings.noKernelTun"></a-switch> </a-form-item> <a-form-item label="Peers"> <a-button icon="plus" type="primary" size="small" @click="inbound.settings.addPeer()"></a-button> diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html index 94060e70..125307f9 100644 --- a/web/html/xui/inbound_info_modal.html +++ b/web/html/xui/inbound_info_modal.html @@ -370,12 +370,8 @@ <td>[[ inbound.settings.mtu ]]</td> </tr> <tr> - <td>Kernel Mode</td> - <td>[[ inbound.settings.kernelMode ]]</td> - </tr> - <tr> - <td>Kernel Tun</td> - <td>[[ inbound.settings.kernelTun ]]</td> + <td>No Kernel Tun</td> + <td>[[ inbound.settings.noKernelTun ]]</td> </tr> <template v-for="(peer, index) in inbound.settings.peers"> <tr> diff --git a/web/html/xui/warp_modal.html b/web/html/xui/warp_modal.html index fb7d54ee..3acd49e8 100644 --- a/web/html/xui/warp_modal.html +++ b/web/html/xui/warp_modal.html @@ -147,8 +147,7 @@ publicKey: peer.public_key, endpoint: peer.endpoint.host, }], - kernelMode: false, - kernelTun: false, + noKernelTun: false, } }); } |