SagerNet/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-04-04 04:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Refactor inbound/outbound options struct

Browse source
This commit is contained in:
世界 2023-12-11 18:36:06 +08:00
parent 36b0f2e91a
commit 6ddcd3954d
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
31 changed files with 844 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

104
option/inbound.go
View file

@ -31,45 +31,55 @@ type _Inbound struct {
type Inbound _Inbound
func (h Inbound) MarshalJSON() ([]byte, error) {
var v any
func (h *Inbound) RawOptions() (any, error) {
var rawOptionsPtr any
switch h.Type {
case C.TypeTun:
v = h.TunOptions
rawOptionsPtr = &h.TunOptions
case C.TypeRedirect:
v = h.RedirectOptions
rawOptionsPtr = &h.RedirectOptions
case C.TypeTProxy:
v = h.TProxyOptions
rawOptionsPtr = &h.TProxyOptions
case C.TypeDirect:
v = h.DirectOptions
rawOptionsPtr = &h.DirectOptions
case C.TypeSOCKS:
v = h.SocksOptions
rawOptionsPtr = &h.SocksOptions
case C.TypeHTTP:
v = h.HTTPOptions
rawOptionsPtr = &h.HTTPOptions
case C.TypeMixed:
v = h.MixedOptions
rawOptionsPtr = &h.MixedOptions
case C.TypeShadowsocks:
v = h.ShadowsocksOptions
rawOptionsPtr = &h.ShadowsocksOptions
case C.TypeVMess:
v = h.VMessOptions
rawOptionsPtr = &h.VMessOptions
case C.TypeTrojan:
v = h.TrojanOptions
rawOptionsPtr = &h.TrojanOptions
case C.TypeNaive:
v = h.NaiveOptions
rawOptionsPtr = &h.NaiveOptions
case C.TypeHysteria:
v = h.HysteriaOptions
rawOptionsPtr = &h.HysteriaOptions
case C.TypeShadowTLS:
v = h.ShadowTLSOptions
rawOptionsPtr = &h.ShadowTLSOptions
case C.TypeVLESS:
v = h.VLESSOptions
rawOptionsPtr = &h.VLESSOptions
case C.TypeTUIC:
v = h.TUICOptions
rawOptionsPtr = &h.TUICOptions
case C.TypeHysteria2:
v = h.Hysteria2Options
rawOptionsPtr = &h.Hysteria2Options
case "":
return nil, E.New("missing inbound type")
default:
return nil, E.New("unknown inbound type: ", h.Type)
}
return MarshallObjects((_Inbound)(h), v)
return rawOptionsPtr, nil
}
func (h Inbound) MarshalJSON() ([]byte, error) {
rawOptions, err := h.RawOptions()
if err != nil {
return nil, err
}
return MarshallObjects((_Inbound)(h), rawOptions)
}
func (h *Inbound) UnmarshalJSON(bytes []byte) error {
@ -77,46 +87,11 @@ func (h *Inbound) UnmarshalJSON(bytes []byte) error {
if err != nil {
return err
}
var v any
switch h.Type {
case C.TypeTun:
v = &h.TunOptions
case C.TypeRedirect:
v = &h.RedirectOptions
case C.TypeTProxy:
v = &h.TProxyOptions
case C.TypeDirect:
v = &h.DirectOptions
case C.TypeSOCKS:
v = &h.SocksOptions
case C.TypeHTTP:
v = &h.HTTPOptions
case C.TypeMixed:
v = &h.MixedOptions
case C.TypeShadowsocks:
v = &h.ShadowsocksOptions
case C.TypeVMess:
v = &h.VMessOptions
case C.TypeTrojan:
v = &h.TrojanOptions
case C.TypeNaive:
v = &h.NaiveOptions
case C.TypeHysteria:
v = &h.HysteriaOptions
case C.TypeShadowTLS:
v = &h.ShadowTLSOptions
case C.TypeVLESS:
v = &h.VLESSOptions
case C.TypeTUIC:
v = &h.TUICOptions
case C.TypeHysteria2:
v = &h.Hysteria2Options
case "":
return E.New("missing inbound type")
default:
return E.New("unknown inbound type: ", h.Type)
rawOptions, err := h.RawOptions()
if err != nil {
return err
}
err = UnmarshallExcluded(bytes, (*_Inbound)(h), v)
err = UnmarshallExcluded(bytes, (*_Inbound)(h), rawOptions)
if err != nil {
return err
}
@ -160,3 +135,16 @@ func (c *UDPTimeoutCompat) UnmarshalJSON(data []byte) error {
}
return json.Unmarshal(data, (*Duration)(c))
}
type ListenOptionsWrapper interface {
TakeListenOptions() ListenOptions
ReplaceListenOptions(options ListenOptions)
}
func (o *ListenOptions) TakeListenOptions() ListenOptions {
return *o
}
func (o *ListenOptions) ReplaceListenOptions(options ListenOptions) {
*o = options
}