diff options
| author | pwnnex <eternxles@gmail.com> | 2026-04-22 18:55:09 +0300 |
|---|---|---|
| committer | pwnnex <eternxles@gmail.com> | 2026-04-22 18:55:09 +0300 |
| commit | eb4791a1cdabebbf0b0d5a81a40ecc7d88924656 (patch) | |
| tree | 9c8e302bd2e0594f3d64341561716f83c4b1c56f /sub/subClashService.go | |
| parent | e6d0c33937f5776911e5fc1e9d8015d8a9323450 (diff) | |
hysteria: also accept "hysteria2" protocol string
UI stores v1 and v2 both as "hysteria" with settings.version, but
inbounds that came in from imports / manual SQL can carry the
literal "hysteria2" string and get silently dropped everywhere we
switch on protocol.
Add Hysteria2 constant + IsHysteria helper, use it in the places
that gate on protocol (sub SQL, getLink, genHysteriaLink, clash
buildProxy, json gen, inbound.go validation, xray AddUser).
Existing "hysteria" inbounds are untouched.
closes #4081
Diffstat (limited to 'sub/subClashService.go')
| -rw-r--r-- | sub/subClashService.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sub/subClashService.go b/sub/subClashService.go index d0445aa4..7b6b8214 100644 --- a/sub/subClashService.go +++ b/sub/subClashService.go @@ -159,13 +159,10 @@ func (s *SubClashService) getProxies(inbound *model.Inbound, client model.Client } func (s *SubClashService) buildProxy(inbound *model.Inbound, client model.Client, stream map[string]any, extraRemark string) map[string]any { - // Hysteria (v1 / v2) doesn't ride an xray `streamSettings.network` - // transport and the TLS story is handled inside hysteria itself, so - // applyTransport / applySecurity below don't model it. Build the - // proxy directly. Without this, hysteria inbounds fell into the - // `default: return nil` branch and silently vanished from the - // generated Clash config. - if inbound.Protocol == model.Hysteria { + // Hysteria has its own transport + TLS model, applyTransport / + // applySecurity don't fit. IsHysteria also covers the literal + // "hysteria2" protocol string (#4081). + if model.IsHysteria(inbound.Protocol) { return s.buildHysteriaProxy(inbound, client, extraRemark) } |
