black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-22 08:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing omitempty for NTP server fields

Browse source
This commit is contained in:
世界 2023-12-05 18:01:19 +08:00
parent 0ef268637e
commit cffc07579d
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ntp/service.go
View file

@ -33,7 +33,7 @@ type Service struct {
func NewService(ctx context.Context, router adapter.Router, logger logger.Logger, options option.NTPOptions) (*Service, error) { func NewService(ctx context.Context, router adapter.Router, logger logger.Logger, options option.NTPOptions) (*Service, error) {
ctx, cancel := common.ContextWithCancelCause(ctx) ctx, cancel := common.ContextWithCancelCause(ctx)
server := options.ServerOptions.Build() server := M.ParseSocksaddrHostPort(options.Server, options.ServerPort)
if server.Port == 0 { if server.Port == 0 {
server.Port = 123 server.Port = 123
} }

5
option/ntp.go
View file

@ -1,9 +1,10 @@
package option package option
type NTPOptions struct { type NTPOptions struct {
Enabled bool `json:"enabled"` Enabled bool `json:"enabled,omitempty"`
Server string `json:"server,omitempty"`
ServerPort uint16 `json:"server_port,omitempty"`
Interval Duration `json:"interval,omitempty"` Interval Duration `json:"interval,omitempty"`
WriteToSystem bool `json:"write_to_system,omitempty"` WriteToSystem bool `json:"write_to_system,omitempty"`
ServerOptions
DialerOptions DialerOptions
} }