Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/MHSanaei/3x-ui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMHSanaei <ho3ein.sanaei@gmail.com>2024-01-26 21:27:46 +0300
committerMHSanaei <ho3ein.sanaei@gmail.com>2024-01-26 21:27:46 +0300
commitdaa43540477e18ae5c6e19e887733b793c17ad72 (patch)
tree9d3af65c41f78fe46cefca23ef25e08e735d41e8
parentec88053df0f2619bdb6285bcd2085675efbc8ca8 (diff)
ipv6 for familyProtect and some changes
-rw-r--r--web/assets/js/model/outbound.js4
-rw-r--r--web/assets/js/model/xray.js2
-rw-r--r--web/html/xui/warp_modal.html1
-rw-r--r--web/html/xui/xray.html6
4 files changed, 8 insertions, 5 deletions
diff --git a/web/assets/js/model/outbound.js b/web/assets/js/model/outbound.js
index 0191c4a4..42fb50a1 100644
--- a/web/assets/js/model/outbound.js
+++ b/web/assets/js/model/outbound.js
@@ -915,7 +915,7 @@ Outbound.HttpSettings = class extends CommonClass {
Outbound.WireguardSettings = class extends CommonClass {
constructor(
mtu=1420, secretKey=Wireguard.generateKeypair().privateKey,
- address='', workers=2, domainStrategy='', reserved='',
+ address=[''], workers=2, domainStrategy='ForceIPv6v4', reserved='',
peers=[new Outbound.WireguardSettings.Peer()], kernelMode=false) {
super();
this.mtu = mtu;
@@ -965,7 +965,7 @@ Outbound.WireguardSettings = class extends CommonClass {
};
Outbound.WireguardSettings.Peer = class extends CommonClass {
- constructor(publicKey='', psk='', allowedIPs=['0.0.0.0/0','::/0'], endpoint='', keepAlive=0) {
+ constructor(publicKey=Wireguard.generateKeypair().publicKey, psk='', allowedIPs=['0.0.0.0/0','::/0'], endpoint='', keepAlive=0) {
super();
this.publicKey = publicKey;
this.psk = psk;
diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index b2c8a2e5..e9676252 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -2297,7 +2297,7 @@ Inbound.WireguardSettings = class extends XrayCommonClass {
};
Inbound.WireguardSettings.Peer = class extends XrayCommonClass {
- constructor(publicKey='', psk='', allowedIPs=['0.0.0.0/0','::/0'], keepAlive=0) {
+ constructor(publicKey=Wireguard.generateKeypair().publicKey, psk='', allowedIPs=['0.0.0.0/0','::/0'], keepAlive=0) {
super();
this.publicKey = publicKey;
this.psk = psk;
diff --git a/web/html/xui/warp_modal.html b/web/html/xui/warp_modal.html
index d1663df0..4e6dd4fa 100644
--- a/web/html/xui/warp_modal.html
+++ b/web/html/xui/warp_modal.html
@@ -140,6 +140,7 @@
mtu: 1420,
secretKey: warpModal.warpData.private_key,
address: Object.values(config.interface.addresses),
+ domainStrategy: 'ForceIPv6v4',
peers: [{
publicKey: peer.public_key,
endpoint: peer.endpoint.host,
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index 05f5f178..d6f0c0f8 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -569,9 +569,11 @@
familyProtectDNS: {
"servers": [
"1.1.1.3", // https://developers.cloudflare.com/1.1.1.1/setup/
- "1.0.0.3"
+ "1.0.0.3",
+ "2606:4700:4700::1113",
+ "2606:4700:4700::1003"
],
- "queryStrategy": "UseIPv4"
+ "queryStrategy": "UseIP"
},
}
},