Reapply "wgengine/netstack: avoid returning from sender goroutines on error (#21332) (#21445)"

This reverts commit d93ea830ed.
This commit is contained in:
Nick O'Neill committed 2026-09-24 15:39:41 -07:00
1 parent 81e83b8808
commit f07b22d4df
1 file changed
+20 -2
+20 -2
View File
@@ -1073,7 +1073,16 @@ func (ns *Impl) inject() {
if sendToHost {
if err := ns.tundev.InjectInboundPacketBuffer(pkt, inboundBuffs, inboundBuffsSizes); err != nil {
ns.logf("netstack inject inbound: %v", err)
return
// When failing to inject an outbound packet buffer, log the error, but
// continue serving the ReadContext for sending subsequent packets, as
// nothing manages or restarts a failed inject. An error here
// only applies to the current packet and should not terminate the long-lived
// packet pump.
// The exception to this is if the context has ended, indicating a shutdown.
if ns.ctx.Err() != nil {
return
}
continue
}
} else {
// Self-addressed packet: deliver back into gVisor directly
@@ -1088,7 +1097,16 @@ func (ns *Impl) inject() {
if err := ns.tundev.InjectOutboundPacketBuffer(pkt); err != nil {
ns.logf("netstack inject outbound: %v", err)
return
// When failing to inject an outbound packet buffer, log the error, but
// continue serving the ReadContext for sending subsequent packets, as
// nothing manages or restarts a failed inject. An error here
// only applies to the current packet and should not terminate the long-lived
// packet pump.
// The exception to this is if the context has ended, indicating a shutdown.
if ns.ctx.Err() != nil {
return
}
continue
}
}
}