WireGuard proxy: Fix potential startup races (#6852)

https://github.com/XTLS/Xray-core/pull/6852#issuecomment-5871816550

Fixes https://github.com/XTLS/Xray-core/issues/6850
This commit is contained in:
v2ray authored and RPRX committed 2026-09-29 18:13:43 +00:00
1 parent 48ad0300ea
commit 08cb6e6bca
3 files changed
+25 -10

No files matched your search

+5 -3
View File
@@ -113,7 +113,7 @@ func NewServer(ctx context.Context, conf *DeviceConfig) (*Server, error) {
users.Store(user.Account.(*MemoryAccount).Pub, user)
}
return &Server{
s := &Server{
conf: conf,
ctx: core.ToBackgroundDetachedContext(ctx),
policyManager: p,
@@ -131,7 +131,10 @@ func NewServer(ctx context.Context, conf *DeviceConfig) (*Server, error) {
pub: pub,
users: users,
}, nil
}
// Install the stack's protocol handlers before the device can deliver packets to it (Start -> dev.Up).
CreateForwarder(stack, s.HandleConnection)
return s, nil
}
func (s *Server) AddUser(ctx context.Context, user *protocol.MemoryUser) error {
@@ -320,7 +323,6 @@ func (s *Server) Start() error {
return err
}
s.dev = dev
CreateForwarder(s.stack, s.HandleConnection)
return nil
}