Merge pull request #1 from KiriKira/master

back

websocket+TLS/config_client.json

@@ -1,105 +1,111 @@
 {
-  "outbound": {
-    "streamSettings": {
-      "network": "ws",
-      "kcpSettings": null,
-      "wsSettings": {
-        "headers": {
-          "host": "example.domain"
-        },
-        "path": ""
-      },
-      "tcpSettings": null,
-      "tlsSettings": {},
-      "security": "tls"
-    },
-    "tag": "agentout",
-    "protocol": "vmess",
-    "mux": {
-      "enabled": true,
-      "concurrency": 8
-    },
-    "settings": {
-      "vnext": [{
-        "users": [{
-          "alterId": 100,
-          "security": "aes-128-gcm",
-          "id": "e2b39869-7e9e-411b-a561-00904419bed9"
-        }],
-        "port": 443,
-        "address": "example.domain"
-      }]
-    }
-  },
-  "log": {
-    "access": "",
-    "loglevel": "debug",
-    "error": ""
-  },
-  "outboundDetour": [{
-      "tag": "direct",
-      "protocol": "freedom",
-      "settings": {
-        "response": null
-      }
-    },
+ "outbound": {
+  "streamSettings": {
+   "network": "ws", 
+   "kcpSettings": null, 
+   "wsSettings": {
+    "headers": {
+     "host": "example.domain"
+    }, 
+    "path": ""
+   }, 
+   "tcpSettings": null, 
+   "tlsSettings": {}, 
+   "security": "tls"
+  }, 
+  "tag": "agentout", 
+  "protocol": "vmess", 
+  "mux": {
+   "enabled": true
+  }, 
+  "settings": {
+   "vnext": [
     {
-      "tag": "blockout",
-      "protocol": "blackhole",
-      "settings": {
-        "response": {
-          "type": "http"
-        }
+     "users": [
+      {
+       "alterId": 100, 
+       "security": "aes-128-gcm", 
+       "id": "0cdf8a45-303d-4fed-9780-29aa7f54175e"
       }
+     ], 
+     "port": 443, 
+     "address": "example.domain"
+    }
+   ]
+  }
+ }, 
+ "log": {
+  "access": "", 
+  "loglevel": "info", 
+  "error": ""
+ }, 
+ "outboundDetour": [
+  {
+   "tag": "direct", 
+   "protocol": "freedom", 
+   "settings": {
+    "response": null
+   }
+  }, 
+  {
+   "tag": "blockout", 
+   "protocol": "blackhole", 
+   "settings": {
+    "response": {
+     "type": "http"
     }
-  ],
-  "inbound": {
-    "streamSettings": null,
-    "settings": {
-      "ip": "127.0.0.1",
-      "udp": true,
-      "clients": null,
-      "auth": "noauth"
-    },
-    "protocol": "socks",
-    "port": 10086,
-    "listen": "0.0.0.0"
-  },
-  "inboundDetour": null,
-  "routing": {
-    "settings": {
-      "rules": [{
-        "ip": [
-          "0.0.0.0/8",
-          "10.0.0.0/8",
-          "100.64.0.0/10",
-          "127.0.0.0/8",
-          "169.254.0.0/16",
-          "172.16.0.0/12",
-          "192.0.0.0/24",
-          "192.0.2.0/24",
-          "192.168.0.0/16",
-          "198.18.0.0/15",
-          "198.51.100.0/24",
-          "203.0.113.0/24",
-          "::1/128",
-          "fc00::/7",
-          "fe80::/10"
-        ],
-        "domain": null,
-        "type": "field",
-        "port": null,
-        "outboundTag": "direct"
-      }],
-      "domainStrategy": "IPIfNonMatch"
-    },
-    "strategy": "rules"
-  },
-  "dns": {
-    "servers": [
-      "8.8.8.8",
-      "8.8.4.4",
-      "localhost"
-    ]
+   }
   }
+ ], 
+ "inbound": {
+  "streamSettings": null, 
+  "settings": {
+   "ip": "127.0.0.1", 
+   "udp": true, 
+   "clients": null, 
+   "auth": "noauth"
+  }, 
+  "protocol": "socks", 
+  "port": 1080, 
+  "listen": "0.0.0.0"
+ }, 
+ "inboundDetour": null, 
+ "routing": {
+  "settings": {
+   "rules": [
+    {
+     "ip": [
+      "0.0.0.0/8", 
+      "10.0.0.0/8", 
+      "100.64.0.0/10", 
+      "127.0.0.0/8", 
+      "169.254.0.0/16", 
+      "172.16.0.0/12", 
+      "192.0.0.0/24", 
+      "192.0.2.0/24", 
+      "192.168.0.0/16", 
+      "198.18.0.0/15", 
+      "198.51.100.0/24", 
+      "203.0.113.0/24", 
+      "::1/128", 
+      "fc00::/7", 
+      "fe80::/10"
+     ], 
+     "domain": null, 
+     "type": "field", 
+     "port": null, 
+     "outboundTag": "direct"
+    }
+   ], 
+   "domainStrategy": "IPIfNonMatch"
+  }, 
+  "strategy": "rules"
+ }, 
+ "dns": {
+  "servers": [
+   "8.8.8.8", 
+   "8.8.4.4", 
+   "localhost"
+  ]
+ }
 }

websocket+TLS/config_server.json

@@ -1,91 +1,92 @@
 {
-  "outbound": {
-    "streamSettings": null,
-    "tag": null,
-    "protocol": "freedom",
-    "mux": null,
-    "settings": null
-  },
-  "log": {
-    "access": "/var/log/v2ray/access.log",
-    "loglevel": "info",
-    "error": "/var/log/v2ray/error.log"
-  },
-  "outboundDetour": [{
-    "tag": "blocked",
-    "protocol": "blackhole",
-    "settings": null
-  }],
-  "inbound": {
-    "streamSettings": {
-      "network": "kcp",
-      "kcpSettings": {
-        "uplinkCapacity": 100,
-        "downlinkCapacity": 100,
-        "readBufferSize": 2,
-        "mtu": 1350,
-        "header": {
-          "type": "srtp",
-          "request": null,
-          "response": null
-        },
-        "tti": 50,
-        "congestion": false,
-        "writeBufferSize": 2
-      },
-      "wsSettings": null,
-      "tcpSettings": null,
-      "tlsSettings": {
-        "certificates": [{
-          "keyFile": "/path/to/example.domain.key",
-          "certificateFile": "/path/to/example.domain/fullchain.cer"
-        }]
-      },
-      "security": "tls"
-    },
-    "settings": {
-      "ip": null,
-      "udp": true,
-      "clients": [{
-        "alterId": 100,
-        "security": "aes-128-gcm",
-        "id": "e2b39869-7e9e-411b-a561-00904419bed9"
-      }],
-      "auth": null
-    },
-    "protocol": "vmess",
-    "port": 443,
-    "listen": null
-  },
-  "inboundDetour": null,
-  "routing": {
-    "settings": {
-      "rules": [{
-        "ip": [
-          "0.0.0.0/8",
-          "10.0.0.0/8",
-          "100.64.0.0/10",
-          "127.0.0.0/8",
-          "169.254.0.0/16",
-          "172.16.0.0/12",
-          "192.0.0.0/24",
-          "192.0.2.0/24",
-          "192.168.0.0/16",
-          "198.18.0.0/15",
-          "198.51.100.0/24",
-          "203.0.113.0/24",
-          "::1/128",
-          "fc00::/7",
-          "fe80::/10"
-        ],
-        "domain": null,
-        "type": "field",
-        "port": null,
-        "outboundTag": "blocked"
-      }],
-      "domainStrategy": null
-    },
-    "strategy": "rules"
-  },
-  "dns": null
+ "outbound": {
+  "streamSettings": null, 
+  "tag": null, 
+  "protocol": "freedom", 
+  "mux": null, 
+  "settings": null
+ }, 
+ "log": {
+  "access": "/var/log/v2ray/access.log", 
+  "loglevel": "error", 
+  "error": "/var/log/v2ray/error.log"
+ }, 
+ "inboundDetour": null, 
+ "inbound": {
+  "streamSettings": {
+   "network": "ws", 
+   "kcpSettings": null, 
+   "wsSettings": {
+    "headers": {
+     "host": "example.domain"
+    }, 
+    "path": "", 
+    "connectionReuse": true
+   }, 
+   "tcpSettings": null, 
+   "tlsSettings": {
+    "certificates": [
+     {
+      "keyFile": "/path/to/example.domain.key", 
+      "certificateFile": "/path/to/example.domain/fullchain.cer"
+     }
+    ]
+   }, 
+   "security": "tls"
+  }, 
+  "listen": null, 
+  "protocol": "vmess", 
+  "port": 443, 
+  "settings": {
+   "ip": null, 
+   "udp": true, 
+   "clients": [
+    {
+     "alterId": 100, 
+     "security": "aes-128-gcm", 
+     "id": "0cdf8a45-303d-4fed-9780-29aa7f54175e"
+    }
+   ], 
+   "auth": null
+  }
+ }, 
+ "outboundDetour": [
+  {
+   "tag": "blocked", 
+   "protocol": "blackhole", 
+   "settings": null
+  }
+ ], 
+ "routing": {
+  "strategy": "rules", 
+  "settings": {
+   "rules": [
+    {
+     "ip": [
+      "0.0.0.0/8", 
+      "10.0.0.0/8", 
+      "100.64.0.0/10", 
+      "127.0.0.0/8", 
+      "169.254.0.0/16", 
+      "172.16.0.0/12", 
+      "192.0.0.0/24", 
+      "192.0.2.0/24", 
+      "192.168.0.0/16", 
+      "198.18.0.0/15", 
+      "198.51.100.0/24", 
+      "203.0.113.0/24", 
+      "::1/128", 
+      "fc00::/7", 
+      "fe80::/10"
+     ], 
+     "domain": null, 
+     "type": "field", 
+     "port": null, 
+     "outboundTag": "blocked"
+    }
+   ], 
+   "domainStrategy": null
+  }
+ }, 
+ "dns": null
 }