Resolve conflicts

This commit is contained in:
Sergei Maklagin
2025-09-14 23:44:29 +03:00
86 changed files with 1161 additions and 1034 deletions

8
box.go
View File

@@ -318,15 +318,15 @@ func New(options Options) (*Box, error) {
return nil, E.Cause(err, "initialize service[", i, "]")
}
}
outboundManager.Initialize(common.Must1(
direct.NewOutbound(
outboundManager.Initialize(func() (adapter.Outbound, error) {
return direct.NewOutbound(
ctx,
router,
logFactory.NewLogger("outbound/direct"),
"direct",
option.DirectOutboundOptions{},
),
))
)
})
dnsTransportManager.Initialize(common.Must1(
local.NewTransport(
ctx,