Merge branch 'ogn-dev' into with-tun

2022-03-03 04:17:00 +08:00
parent 705e5098ab b52d0c16e9
commit 5e0d4930cb
13 changed files with 23 additions and 104 deletions
--- a/test/config/vmess-aead.json
+++ b/test/config/vmess-aead.json
@ -1,28 +0,0 @@
-{
-    "inbounds": [
-        {
-            "port": 10002,
-            "listen": "0.0.0.0",
-            "protocol": "vmess",
-            "settings": {
-                "clients": [
-                    {
-                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
-                        "alterId": 0
-                    }
-                ]
-            },
-            "streamSettings": {
-                "network": "tcp"
-            }
-        }
-    ],
-    "outbounds": [
-        {
-            "protocol": "freedom"
-        }
-    ],
-    "log": {
-        "loglevel": "debug"
-    }
-}
--- a/test/config/vmess-grpc.json
+++ b/test/config/vmess-grpc.json
@ -7,8 +7,7 @@
            "settings": {
                "clients": [
                    {
-                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
-                        "alterId": 32
+                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811"
                    }
                ]
            },
--- a/test/config/vmess-http.json
+++ b/test/config/vmess-http.json
@ -7,8 +7,7 @@
            "settings": {
                "clients": [
                    {
-                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
-                        "alterId": 32
+                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811"
                    }
                ]
            },
--- a/test/config/vmess-http2.json
+++ b/test/config/vmess-http2.json
@ -7,8 +7,7 @@
            "settings": {
                "clients": [
                    {
-                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
-                        "alterId": 32
+                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811"
                    }
                ]
            },
--- a/test/config/vmess-tls.json
+++ b/test/config/vmess-tls.json
@ -7,8 +7,7 @@
            "settings": {
                "clients": [
                    {
-                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
-                        "alterId": 32
+                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811"
                    }
                ]
            },
--- a/test/config/vmess-ws-0rtt.json
+++ b/test/config/vmess-ws-0rtt.json
@ -7,8 +7,7 @@
            "settings": {
                "clients": [
                    {
-                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
-                        "alterId": 32
+                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811"
                    }
                ]
            },
--- a/test/config/vmess-ws-tls.json
+++ b/test/config/vmess-ws-tls.json
@ -7,8 +7,7 @@
            "settings": {
                "clients": [
                    {
-                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
-                        "alterId": 32
+                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811"
                    }
                ]
            },
--- a/test/config/vmess-ws.json
+++ b/test/config/vmess-ws.json
@ -7,8 +7,7 @@
            "settings": {
                "clients": [
                    {
-                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
-                        "alterId": 32
+                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811"
                    }
                ]
            },
--- a/test/config/vmess.json
+++ b/test/config/vmess.json
@ -7,8 +7,7 @@
            "settings": {
                "clients": [
                    {
-                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
-                        "alterId": 32
+                        "id": "b831381d-6324-4d53-ad4f-8cda48b30811"
                    }
                ]
            },