lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 07:26:24 -05:00
Code Issues Releases Wiki Activity

Do not convert @ to \x00

Browse Source
This commit is contained in:
RPRX 2020-09-07 16:39:53 +08:00 committed by GitHub
parent f10f5b4a47
commit 16fe0b03f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infra/conf/vless.go
View File

@ -97,10 +97,7 @@ func (c *VLessInboundConfig) Build() (proto.Message, error) {
fb.Type = "serve" fb.Type = "serve"
} else { } else {
switch fb.Dest[0] { switch fb.Dest[0] {
case '@': case '@', '/':
fb.Dest = "\x00" + fb.Dest[1:]
fallthrough
case '/':
fb.Type = "unix" fb.Type = "unix"
default: default:
if _, err := strconv.Atoi(fb.Dest); err == nil { if _, err := strconv.Atoi(fb.Dest); err == nil {

2
infra/conf/vless_test.go
View File

@ -113,7 +113,7 @@ func TestVLessInbound(t *testing.T) {
Alpn: "h2", Alpn: "h2",
Path: "", Path: "",
Type: "unix", Type: "unix",
Dest: "\x00/dev/shm/domain.socket", Dest: "@/dev/shm/domain.socket",
Xver: 2, Xver: 2,
}, },
{ {

6
proxy/vless/inbound/inbound.go
View File

@ -260,11 +260,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i
} }
return nil return nil
}); err != nil { }); err != nil {
dest := fb.Dest return newError("failed to dial to " + fb.Dest).Base(err).AtWarning()
if dest[0] == '\x00' {
dest = "@" + dest[1:]
}
return newError("failed to dial to " + dest).Base(err).AtWarning()
} }
defer conn.Close() // nolint: errcheck defer conn.Close() // nolint: errcheck