1
0
Эх сурвалжийг харах

ipv6 for familyProtect and some changes

MHSanaei 1 жил өмнө
parent
commit
daa4354047

+ 2 - 2
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;

+ 1 - 1
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;

+ 1 - 0
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,

+ 4 - 2
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"
                 },
             }
         },