增强: HTTP/SOCKS5混合端口

app/cmd/client_test.go

@@ -53,6 +53,13 @@ func TestClientConfig(t *testing.T) {
 		},
 		FastOpen: true,
 		Lazy:     true,
+		Mixed: &mixedConfig{
+			Listen:     "127.0.0.1:1080",
+			Username:   "anon",
+			Password:   "bro",
+			DisableUDP: true,
+			Realm:      "martian",
+		},
 		SOCKS5: &socks5Config{
 			Listen:     "127.0.0.1:1080",
 			Username:   "anon",

app/cmd/client_test.yaml

@@ -1,81 +1,88 @@
-server: example.com
+server: example.com
-
+
-auth: weak_ahh_password
+auth: weak_ahh_password
-
+
-transport:
+transport:
-  type: udp
+  type: udp
-  udp:
+  udp:
-    hopInterval: 30s
+    hopInterval: 30s
-
+
-obfs:
+obfs:
-  type: salamander
+  type: salamander
-  salamander:
+  salamander:
-    password: cry_me_a_r1ver
+    password: cry_me_a_r1ver
-
+
-tls:
+tls:
-  sni: another.example.com
+  sni: another.example.com
-  insecure: true
+  insecure: true
-  pinSHA256: 114515DEADBEEF
+  pinSHA256: 114515DEADBEEF
-  ca: custom_ca.crt
+  ca: custom_ca.crt
-
+
-quic:
+quic:
-  initStreamReceiveWindow: 1145141
+  initStreamReceiveWindow: 1145141
-  maxStreamReceiveWindow: 1145142
+  maxStreamReceiveWindow: 1145142
-  initConnReceiveWindow: 1145143
+  initConnReceiveWindow: 1145143
-  maxConnReceiveWindow: 1145144
+  maxConnReceiveWindow: 1145144
-  maxIdleTimeout: 10s
+  maxIdleTimeout: 10s
-  keepAlivePeriod: 4s
+  keepAlivePeriod: 4s
-  disablePathMTUDiscovery: true
+  disablePathMTUDiscovery: true
-
+
-bandwidth:
+bandwidth:
-  up: 200 mbps
+  up: 200 mbps
-  down: 1 gbps
+  down: 1 gbps
-
+
-fastOpen: true
+fastOpen: true
-
+
-lazy: true
+lazy: true
-
+
-socks5:
+mixed:
-  listen: 127.0.0.1:1080
+  listen: 127.0.0.1:1080
-  username: anon
+  username: anon
-  password: bro
+  password: bro
-  disableUDP: true
+  disableUDP: true
-
+  realm: martian
-http:
+
-  listen: 127.0.0.1:8080
+socks5:
-  username: qqq
+  listen: 127.0.0.1:1080
-  password: bruh
+  username: anon
-  realm: martian
+  password: bro
-
+  disableUDP: true
-tcpForwarding:
+
-  - listen: 127.0.0.1:8088
+http:
-    remote: internal.example.com:80
+  listen: 127.0.0.1:8080
-
+  username: qqq
-udpForwarding:
+  password: bruh
-  - listen: 127.0.0.1:5353
+  realm: martian
-    remote: internal.example.com:53
+
-    timeout: 50s
+tcpForwarding:
-
+  - listen: 127.0.0.1:8088
-tcpTProxy:
+    remote: internal.example.com:80
-  listen: 127.0.0.1:2500
+
-
+udpForwarding:
-udpTProxy:
+  - listen: 127.0.0.1:5353
-  listen: 127.0.0.1:2501
+    remote: internal.example.com:53
-  timeout: 20s
+    timeout: 50s
-
+
-tcpRedirect:
+tcpTProxy:
-  listen: 127.0.0.1:3500
+  listen: 127.0.0.1:2500
-
+
-tun:
+udpTProxy:
-  name: "hytun"
+  listen: 127.0.0.1:2501
-  mtu: 1500
+  timeout: 20s
-  timeout: 1m
+
-  address:
+tcpRedirect:
-    ipv4: 100.100.100.101/30
+  listen: 127.0.0.1:3500
-    ipv6: 2001::ffff:ffff:ffff:fff1/126
+
-  route:
+tun:
-    strict: true
+  name: "hytun"
-    ipv4: [0.0.0.0/0]
+  mtu: 1500
-    ipv6: ["2000::/3"]
+  timeout: 1m
-    ipv4Exclude: [192.0.2.1/32]
+  address:
-    ipv6Exclude: ["2001:db8::1/128"]
+    ipv4: 100.100.100.101/30
+    ipv6: 2001::ffff:ffff:ffff:fff1/126
+  route:
+    strict: true
+    ipv4: [0.0.0.0/0]
+    ipv6: ["2000::/3"]
+    ipv4Exclude: [192.0.2.1/32]
+    ipv6Exclude: ["2001:db8::1/128"]