From ae0c62aae829ee3b87fbf7f5e9d26ec832d6e3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Tue, 5 May 2026 20:19:19 +0800
Subject: [PATCH] Fix reset network

---
 route/router.go              |  1 -
 service/oomkiller/service.go |  6 +++---
 service/oomkiller/timer.go   | 10 +++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/route/router.go b/route/router.go
index 2d50c22e..76a8f1bb 100644
--- a/route/router.go
+++ b/route/router.go
@@ -280,7 +280,6 @@ func (r *Router) NeighborResolver() adapter.NeighborResolver {
 }
 
 func (r *Router) ResetNetwork() {
-	r.network.ResetNetwork()
 	r.httpClientManager.ResetNetwork()
 	r.dns.ResetNetwork()
 }
diff --git a/service/oomkiller/service.go b/service/oomkiller/service.go
index 7c19562e..03fbdb19 100644
--- a/service/oomkiller/service.go
+++ b/service/oomkiller/service.go
@@ -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() {
diff --git a/service/oomkiller/timer.go b/service/oomkiller/timer.go
index f2070ce3..47fb6856 100644
--- a/service/oomkiller/timer.go
+++ b/service/oomkiller/timer.go
@@ -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()