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

Remove map usage in options

Browse source
This commit is contained in:
世界 2025-03-18 09:27:53 +08:00
parent 08534c277e
commit b2f456d6c5
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
option/shadowtls.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/json/badjson"
) )
type ShadowTLSInboundOptions struct { type ShadowTLSInboundOptions struct {
@ -12,7 +13,7 @@ type ShadowTLSInboundOptions struct {
Password string `json:"password,omitempty"` Password string `json:"password,omitempty"`
Users []ShadowTLSUser `json:"users,omitempty"` Users []ShadowTLSUser `json:"users,omitempty"`
Handshake ShadowTLSHandshakeOptions `json:"handshake,omitempty"` Handshake ShadowTLSHandshakeOptions `json:"handshake,omitempty"`
HandshakeForServerName map[string]ShadowTLSHandshakeOptions `json:"handshake_for_server_name,omitempty"` HandshakeForServerName *badjson.TypedMap[string, ShadowTLSHandshakeOptions] `json:"handshake_for_server_name,omitempty"`
StrictMode bool `json:"strict_mode,omitempty"` StrictMode bool `json:"strict_mode,omitempty"`
WildcardSNI WildcardSNI `json:"wildcard_sni,omitempty"` WildcardSNI WildcardSNI `json:"wildcard_sni,omitempty"`
} }

10
protocol/shadowtls/inbound.go
View file

@ -46,17 +46,19 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo
var handshakeForServerName map[string]shadowtls.HandshakeConfig var handshakeForServerName map[string]shadowtls.HandshakeConfig
if options.Version > 1 { if options.Version > 1 {
handshakeForServerName = make(map[string]shadowtls.HandshakeConfig) handshakeForServerName = make(map[string]shadowtls.HandshakeConfig)
for serverName, serverOptions := range options.HandshakeForServerName { if options.HandshakeForServerName != nil {
handshakeDialer, err := dialer.New(ctx, serverOptions.DialerOptions, serverOptions.ServerIsDomain()) for _, entry := range options.HandshakeForServerName.Entries() {
handshakeDialer, err := dialer.New(ctx, entry.Value.DialerOptions, entry.Value.ServerIsDomain())
if err != nil { if err != nil {
return nil, err return nil, err
} }
handshakeForServerName[serverName] = shadowtls.HandshakeConfig{ handshakeForServerName[entry.Key] = shadowtls.HandshakeConfig{
Server: serverOptions.ServerOptions.Build(), Server: entry.Value.ServerOptions.Build(),
Dialer: handshakeDialer, Dialer: handshakeDialer,
} }
} }
} }
}
serverIsDomain := options.Handshake.ServerIsDomain() serverIsDomain := options.Handshake.ServerIsDomain()
if options.WildcardSNI != option.ShadowTLSWildcardSNIOff { if options.WildcardSNI != option.ShadowTLSWildcardSNIOff {
serverIsDomain = true serverIsDomain = true