bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-23 17:35:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

vmess: support zero security

Browse Source
This commit is contained in:
nadoo 2022-01-01 00:44:31 +08:00
parent 39ae201afe
commit a529261893
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -213,8 +213,8 @@ VMess scheme:
vmess://[security:]uuid@host:port[?alterID=num] vmess://[security:]uuid@host:port[?alterID=num]
if alterID=0 or not set, VMessAEAD will be enabled if alterID=0 or not set, VMessAEAD will be enabled
Available securities for vmess: Available security for vmess:
none, aes-128-gcm, chacha20-poly1305 zero, none, aes-128-gcm, chacha20-poly1305
VLESS scheme: VLESS scheme:
vless://uuid@host:port[?fallback=127.0.0.1:80] vless://uuid@host:port[?fallback=127.0.0.1:80]

4
config.go
View File

@ -186,8 +186,8 @@ func usage() {
fmt.Fprintf(w, " if alterID=0 or not set, VMessAEAD will be enabled\n") fmt.Fprintf(w, " if alterID=0 or not set, VMessAEAD will be enabled\n")
fmt.Fprintf(w, "\n") fmt.Fprintf(w, "\n")
fmt.Fprintf(w, "Available securities for vmess:\n") fmt.Fprintf(w, "Available security for vmess:\n")
fmt.Fprintf(w, " none, aes-128-gcm, chacha20-poly1305\n") fmt.Fprintf(w, " zero, none, aes-128-gcm, chacha20-poly1305\n")
fmt.Fprintf(w, "\n") fmt.Fprintf(w, "\n")
fmt.Fprintf(w, "VLESS scheme:\n") fmt.Fprintf(w, "VLESS scheme:\n")

2
main.go
View File

@ -18,7 +18,7 @@ import (
) )
var ( var (
version = "0.15.2" version = "0.15.3"
config = parseConfig() config = parseConfig()
) )

7
proxy/vmess/client.go
View File

@ -27,7 +27,7 @@ const (
OptBasicFormat byte = 0 OptBasicFormat byte = 0
OptChunkStream byte = 1 OptChunkStream byte = 1
// OptReuseTCPConnection byte = 2 // OptReuseTCPConnection byte = 2
OptMetadataObfuscate byte = 4 OptChunkMasking byte = 4
) )
// Security types // Security types
@ -93,7 +93,7 @@ func NewClient(uuidStr, security string, alterID int, aead bool) (*Client, error
c.users = append(c.users, user.GenAlterIDUsers(alterID)...) c.users = append(c.users, user.GenAlterIDUsers(alterID)...)
c.count = len(c.users) c.count = len(c.users)
c.opt = OptChunkStream | OptMetadataObfuscate c.opt = OptChunkStream | OptChunkMasking
c.aead = aead c.aead = aead
security = strings.ToLower(security) security = strings.ToLower(security)
@ -104,6 +104,9 @@ func NewClient(uuidStr, security string, alterID int, aead bool) (*Client, error
c.security = SecurityChacha20Poly1305 c.security = SecurityChacha20Poly1305
case "none": case "none":
c.security = SecurityNone c.security = SecurityNone
case "zero":
c.security = SecurityNone
c.opt = OptBasicFormat
case "": case "":
c.security = SecurityChacha20Poly1305 c.security = SecurityChacha20Poly1305
if runtime.GOARCH == "amd64" || runtime.GOARCH == "s390x" || runtime.GOARCH == "arm64" { if runtime.GOARCH == "amd64" || runtime.GOARCH == "s390x" || runtime.GOARCH == "arm64" {

6
service/dhcpd/dhcpd.go
View File

@ -99,7 +99,7 @@ func handleDHCP(serverIP net.IP, mask net.IPMask, pool *Pool) server4.Handler {
return return
} }
replyIp, err := pool.LeaseIP(m.ClientHWAddr) replyIP, err := pool.LeaseIP(m.ClientHWAddr)
if err != nil { if err != nil {
log.F("[dpcpd] can not assign IP, error %s", err) log.F("[dpcpd] can not assign IP, error %s", err)
return return
@ -109,7 +109,7 @@ func handleDHCP(serverIP net.IP, mask net.IPMask, pool *Pool) server4.Handler {
dhcpv4.WithMessageType(replyType), dhcpv4.WithMessageType(replyType),
dhcpv4.WithServerIP(serverIP), dhcpv4.WithServerIP(serverIP),
dhcpv4.WithNetmask(mask), dhcpv4.WithNetmask(mask),
dhcpv4.WithYourIP(replyIp), dhcpv4.WithYourIP(replyIP),
dhcpv4.WithRouter(serverIP), dhcpv4.WithRouter(serverIP),
dhcpv4.WithDNS(serverIP), dhcpv4.WithDNS(serverIP),
// RFC 2131, Section 4.3.1. Server Identifier: MUST // RFC 2131, Section 4.3.1. Server Identifier: MUST
@ -131,7 +131,7 @@ func handleDHCP(serverIP net.IP, mask net.IPMask, pool *Pool) server4.Handler {
return return
} }
log.F("[dpcpd] lease %v to client %v", replyIp, reply.ClientHWAddr) log.F("[dpcpd] lease %v to client %v", replyIP, reply.ClientHWAddr)
} }
} }