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

Migrate ntp service to library

Browse source
This commit is contained in:
世界 2024-03-26 20:58:47 +08:00
parent 11c7b4a866
commit b5dcd6bf59
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 13 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

17
route/router.go
View file

@ -23,7 +23,6 @@ import (
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/experimental/libbox/platform"
"github.com/sagernet/sing-box/log"
"github.com/sagernet/sing-box/ntp"
"github.com/sagernet/sing-box/option"
"github.com/sagernet/sing-box/outbound"
"github.com/sagernet/sing-box/transport/fakeip"
@ -40,7 +39,7 @@ import (
F "github.com/sagernet/sing/common/format"
M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network"
serviceNTP "github.com/sagernet/sing/common/ntp"
"github.com/sagernet/sing/common/ntp"
"github.com/sagernet/sing/common/task"
"github.com/sagernet/sing/common/uot"
"github.com/sagernet/sing/common/winpowrprof"
@ -333,11 +332,19 @@ func NewRouter(
}
if ntpOptions.Enabled {
timeService, err := ntp.NewService(ctx, router, logFactory.NewLogger("ntp"), ntpOptions)
ntpDialer, err := dialer.New(router, ntpOptions.DialerOptions)
if err != nil {
return nil, err
return nil, E.Cause(err, "create NTP service")
}
service.ContextWith[serviceNTP.TimeService](ctx, timeService)
timeService := ntp.NewService(ntp.Options{
Context: ctx,
Dialer: ntpDialer,
Logger: logFactory.NewLogger("ntp"),
Server: ntpOptions.ServerOptions.Build(),
Interval: time.Duration(ntpOptions.Interval),
WriteToSystem: ntpOptions.WriteToSystem,
})
service.MustRegister[ntp.TimeService](ctx, timeService)
router.timeService = timeService
}
return router, nil