Merge from remote branch

2021-07-28 22:13:21 +08:00
parent 09299e5e5a 3705996974
commit ba2fd00f01
33 changed files with 1549 additions and 142 deletions
--- a/constant/metadata.go
+++ b/constant/metadata.go
@ -18,7 +18,8 @@ const (

 	HTTP Type = iota
 	HTTPCONNECT
-	SOCKS
+	SOCKS4
+	SOCKS5
 	REDIR
 	TPROXY
 	TUN
@ -47,7 +48,9 @@ func (t Type) String() string {
 		return "HTTP"
 	case HTTPCONNECT:
 		return "HTTP Connect"
-	case SOCKS:
+	case SOCKS4:
+		return "Socks4"
+	case SOCKS5:
 		return "Socks5"
 	case REDIR:
 		return "Redir"