Remzona54/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2026-05-13 05:51:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix reset network

Browse source
This commit is contained in:
世界 2026-05-05 20:19:19 +08:00
parent 4807ee9007
commit 3e5991744d
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
7 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
experimental/clashapi/connections.go
View file

@ -18,10 +18,10 @@ import (
"github.com/gofrs/uuid/v5"
)
func connectionRouter(ctx context.Context, router adapter.Router, trafficManager *trafficontrol.Manager) http.Handler {
func connectionRouter(ctx context.Context, network adapter.NetworkManager, trafficManager *trafficontrol.Manager) http.Handler {
r := chi.NewRouter()
r.Get("/", getConnections(ctx, trafficManager))
r.Delete("/", closeAllConnections(router, trafficManager))
r.Delete("/", closeAllConnections(network, trafficManager))
r.Delete("/{id}", closeConnection(trafficManager))
return r
}
@ -96,13 +96,13 @@ func closeConnection(trafficManager *trafficontrol.Manager) func(w http.Response
}
}
func closeAllConnections(router adapter.Router, trafficManager *trafficontrol.Manager) func(w http.ResponseWriter, r *http.Request) {
func closeAllConnections(network adapter.NetworkManager, trafficManager *trafficontrol.Manager) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
snapshot := trafficManager.Snapshot()
for _, c := range snapshot.Connections {
c.Close()
}
router.ResetNetwork()
network.ResetNetwork()
render.NoContent(w, r)
}
}

4
experimental/clashapi/server.go
View file

@ -43,6 +43,7 @@ var _ adapter.ClashServer = (*Server)(nil)
type Server struct {
ctx context.Context
network adapter.NetworkManager
router adapter.Router
dnsRouter adapter.DNSRouter
outbound adapter.OutboundManager
@ -69,6 +70,7 @@ func NewServer(ctx context.Context, logFactory log.ObservableFactory, options op
chiRouter := chi.NewRouter()
s := &Server{
ctx: ctx,
network: service.FromContext[adapter.NetworkManager](ctx),
router: service.FromContext[adapter.Router](ctx),
dnsRouter: service.FromContext[adapter.DNSRouter](ctx),
outbound: service.FromContext[adapter.OutboundManager](ctx),
@ -124,7 +126,7 @@ func NewServer(ctx context.Context, logFactory log.ObservableFactory, options op
r.Mount("/configs", configRouter(s, logFactory))
r.Mount("/proxies", proxyRouter(s, s.router))
r.Mount("/rules", ruleRouter(s.router))
r.Mount("/connections", connectionRouter(s.ctx, s.router, trafficManager))
r.Mount("/connections", connectionRouter(s.ctx, s.network, trafficManager))
r.Mount("/providers/proxies", proxyProviderRouter())
r.Mount("/providers/rules", ruleProviderRouter())
r.Mount("/script", scriptRouter())

2
experimental/libbox/command_server.go
View file

@ -243,7 +243,7 @@ func (s *CommandServer) ResetNetwork() {
if instance == nil || instance.Box() == nil {
return
}
instance.Box().Router().ResetNetwork()
instance.Box().Network().ResetNetwork()
}
func (s *CommandServer) UpdateWIFIState() {

13
route/network.go
View file

@ -34,10 +34,11 @@ import (
var _ adapter.NetworkManager = (*NetworkManager)(nil)
type NetworkManager struct {
logger logger.ContextLogger
interfaceFinder *control.DefaultInterfaceFinder
networkInterfaces common.TypedValue[[]adapter.NetworkInterface]
ctx context.Context
logger logger.ContextLogger
router adapter.Router
interfaceFinder *control.DefaultInterfaceFinder
networkInterfaces common.TypedValue[[]adapter.NetworkInterface]
autoDetectInterface bool
defaultOptions adapter.NetworkOptions
autoRedirectOutputMark uint32
@ -70,6 +71,7 @@ func NewNetworkManager(ctx context.Context, logger logger.ContextLogger, options
return nil, E.New("`default_mark` is only supported on linux")
}
nm := &NetworkManager{
ctx: ctx,
logger: logger,
interfaceFinder: control.NewDefaultInterfaceFinder(),
autoDetectInterface: options.AutoDetectInterface,
@ -138,6 +140,7 @@ func (r *NetworkManager) Start(stage adapter.StartStage) error {
monitor := taskmonitor.New(r.logger, C.StartTimeout)
switch stage {
case adapter.StartStateInitialize:
r.router = service.FromContext[adapter.Router](r.ctx)
if r.networkMonitor != nil {
monitor.Start("initialize network monitor")
err := r.networkMonitor.Start()
@ -478,6 +481,8 @@ func (r *NetworkManager) ResetNetwork() {
listener.InterfaceUpdated()
}
}
r.router.ResetNetwork()
}
func (r *NetworkManager) notifyInterfaceUpdate(defaultInterface *control.Interface, flags int) {

1
route/router.go
View file

@ -280,7 +280,6 @@ func (r *Router) NeighborResolver() adapter.NeighborResolver {
}
func (r *Router) ResetNetwork() {
r.network.ResetNetwork()
r.httpClientManager.ResetNetwork()
r.dns.ResetNetwork()
}

6
service/oomkiller/service.go
View file

@ -27,7 +27,7 @@ type Service struct {
boxService.Adapter
ctx context.Context
logger log.ContextLogger
router adapter.Router
network adapter.NetworkManager
timerConfig timerConfig
adaptiveTimer *adaptiveTimer
lastReportTime atomic.Int64
@ -44,13 +44,13 @@ func NewService(ctx context.Context, logger log.ContextLogger, tag string, optio
Adapter: boxService.NewAdapter(boxConstant.TypeOOMKiller, tag),
ctx: ctx,
logger: logger,
router: service.FromContext[adapter.Router](ctx),
network: service.FromContext[adapter.NetworkManager](ctx),
timerConfig: config,
}, nil
}
func (s *Service) createTimer() {
s.adaptiveTimer = newAdaptiveTimer(s.logger, s.router, s.timerConfig, s.writeOOMReport)
s.adaptiveTimer = newAdaptiveTimer(s.logger, s.network, s.timerConfig, s.writeOOMReport)
}
func (s *Service) startTimer() {

10
service/oomkiller/timer.go
View file

@ -100,7 +100,7 @@ func buildTimerConfig(options option.OOMKillerServiceOptions, memoryLimit uint64
type adaptiveTimer struct {
timerConfig
logger log.ContextLogger
router adapter.Router
network adapter.NetworkManager
onTriggered func(uint64)
limitThresholds pressureThresholds
@ -115,11 +115,11 @@ type adaptiveTimer struct {
pressureBaselineTime time.Time
}
func newAdaptiveTimer(logger log.ContextLogger, router adapter.Router, config timerConfig, onTriggered func(uint64)) *adaptiveTimer {
func newAdaptiveTimer(logger log.ContextLogger, network adapter.NetworkManager, config timerConfig, onTriggered func(uint64)) *adaptiveTimer {
t := &adaptiveTimer{
timerConfig: config,
logger: logger,
router: router,
network: network,
onTriggered: onTriggered,
}
if config.policyMode == policyModeMemoryLimit || config.policyMode == policyModeNetworkExtension {
@ -218,14 +218,14 @@ func (t *adaptiveTimer) poll() {
t.logger.Warn("memory growth rate critical (report only), usage: ", byteformats.FormatMemoryBytes(sample.usage), t.logDetails(sample))
} else {
t.logger.Error("memory growth rate critical, usage: ", byteformats.FormatMemoryBytes(sample.usage), t.logDetails(sample), ", resetting network")
t.router.ResetNetwork()
t.network.ResetNetwork()
}
} else {
if t.killerDisabled {
t.logger.Warn("memory threshold reached (report only), usage: ", byteformats.FormatMemoryBytes(sample.usage), t.logDetails(sample))
} else {
t.logger.Error("memory threshold reached, usage: ", byteformats.FormatMemoryBytes(sample.usage), t.logDetails(sample), ", resetting network")
t.router.ResetNetwork()
t.network.ResetNetwork()
}
}
badCleanup()