Обновление снапшота с v0.0.0-20250811.0 на пин, которого требует sing-box после мержа 235 коммитов (upstream d620bbbf2 "Update gvisor to 20260727.0"). Прежний снапшот был взят 2026-08-04 ровно с той версии, на которой тогда стоял апстрим; разрыв возник 2026-08-05 вместе с его бампом. За год апстрим-gvisor изменил ~14 000 строк в 292 файлах. Значимое для нас — сетевой стек: tcp/connect.go (PMTU-discovery + исправление начального RTT/RTO: раньше задержка ACK внутри стека завышала стартовый таймаут на несколько RTT), tcp/snd.go, tcp/rcv.go, stack/conntrack.go, stack/packet_buffer.go. Всего 30 файлов в TCP и 37 в stack. Баг SPEC 048 апстрим НЕ исправил — проверено по коду новой версии: handleConnecting по-прежнему проверяет состояние endpoint'а, но не ep.h, а performHandshake так же зануляет h и отпускает мьютекс до Close(). Поэтому guard перенесён (12 строк) вместе со своим тестом (45 строк). Red/green проверен на новой базе: без guard'а тест падает с той же nil-паникой, что в полевом крашдампе; с ним зелёный.
180 lines
5.5 KiB
Go
180 lines
5.5 KiB
Go
// Copyright 2018 The gVisor Authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package tcp
|
|
|
|
import (
|
|
"github.com/sagernet/gvisor/pkg/tcpip"
|
|
"github.com/sagernet/gvisor/pkg/tcpip/header"
|
|
"github.com/sagernet/gvisor/pkg/tcpip/seqnum"
|
|
"github.com/sagernet/gvisor/pkg/tcpip/stack"
|
|
"github.com/sagernet/gvisor/pkg/waiter"
|
|
)
|
|
|
|
// Forwarder is a connection request forwarder, which allows clients to decide
|
|
// what to do with a connection request, for example: ignore it, send a RST, or
|
|
// attempt to complete the 3-way handshake.
|
|
//
|
|
// The canonical way of using it is to pass the Forwarder.HandlePacket function
|
|
// to stack.SetTransportProtocolHandler.
|
|
type Forwarder struct {
|
|
stack *stack.Stack
|
|
|
|
maxInFlight int
|
|
handler func(*ForwarderRequest)
|
|
|
|
mu forwarderMutex
|
|
inFlight map[stack.TransportEndpointID]struct{}
|
|
listen *listenContext
|
|
}
|
|
|
|
// NewForwarder allocates and initializes a new forwarder with the given
|
|
// maximum number of in-flight connection attempts. Once the maximum is reached
|
|
// new incoming connection requests will be ignored.
|
|
//
|
|
// If rcvWnd is set to zero, the default buffer size is used instead.
|
|
func NewForwarder(s *stack.Stack, rcvWnd, maxInFlight int, handler func(*ForwarderRequest)) *Forwarder {
|
|
if rcvWnd == 0 {
|
|
rcvWnd = DefaultReceiveBufferSize
|
|
}
|
|
return &Forwarder{
|
|
stack: s,
|
|
maxInFlight: maxInFlight,
|
|
handler: handler,
|
|
inFlight: make(map[stack.TransportEndpointID]struct{}),
|
|
listen: newListenContext(s, protocolFromStack(s), nil /* listenEP */, seqnum.Size(rcvWnd), true, 0),
|
|
}
|
|
}
|
|
|
|
// HandlePacket handles a packet if it is of interest to the forwarder (i.e., if
|
|
// it's a SYN packet), returning true if it's the case. Otherwise the packet
|
|
// is not handled and false is returned.
|
|
//
|
|
// This function is expected to be passed as an argument to the
|
|
// stack.SetTransportProtocolHandler function.
|
|
func (f *Forwarder) HandlePacket(id stack.TransportEndpointID, pkt *stack.PacketBuffer) bool {
|
|
s, err := newIncomingSegment(id, f.stack.Clock(), pkt)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
defer s.DecRef()
|
|
|
|
// We only care about well-formed SYN packets (not SYN-ACK) packets.
|
|
if !s.csumValid || !s.flags.Contains(header.TCPFlagSyn) || s.flags.Contains(header.TCPFlagAck) {
|
|
return false
|
|
}
|
|
|
|
opts := parseSynSegmentOptions(s)
|
|
|
|
f.mu.Lock()
|
|
defer f.mu.Unlock()
|
|
|
|
// We have an inflight request for this id, ignore this one for now.
|
|
if _, ok := f.inFlight[id]; ok {
|
|
return true
|
|
}
|
|
|
|
// Ignore the segment if we're beyond the limit.
|
|
if len(f.inFlight) >= f.maxInFlight {
|
|
f.stack.Stats().TCP.ForwardMaxInFlightDrop.Increment()
|
|
return true
|
|
}
|
|
|
|
// Launch a new goroutine to handle the request.
|
|
f.inFlight[id] = struct{}{}
|
|
s.IncRef()
|
|
go f.handler(&ForwarderRequest{ // S/R-SAFE: not used by Sentry.
|
|
forwarder: f,
|
|
segment: s,
|
|
synOptions: opts,
|
|
})
|
|
|
|
return true
|
|
}
|
|
|
|
// ForwarderRequest represents a connection request received by the forwarder
|
|
// and passed to the client. Clients must eventually call Complete() on it, and
|
|
// may optionally create an endpoint to represent it via CreateEndpoint.
|
|
type ForwarderRequest struct {
|
|
mu forwarderRequestMutex
|
|
forwarder *Forwarder
|
|
segment *segment
|
|
synOptions header.TCPSynOptions
|
|
}
|
|
|
|
// ID returns the 4-tuple (src address, src port, dst address, dst port) that
|
|
// represents the connection request.
|
|
func (r *ForwarderRequest) ID() stack.TransportEndpointID {
|
|
return r.segment.id
|
|
}
|
|
|
|
// Complete completes the request, and optionally sends a RST segment back to the
|
|
// sender.
|
|
func (r *ForwarderRequest) Complete(sendReset bool) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
|
|
if r.segment == nil {
|
|
panic("Completing already completed forwarder request")
|
|
}
|
|
|
|
// Remove request from the forwarder.
|
|
r.forwarder.mu.Lock()
|
|
delete(r.forwarder.inFlight, r.segment.id)
|
|
r.forwarder.mu.Unlock()
|
|
|
|
if sendReset {
|
|
replyWithReset(r.forwarder.stack, r.segment, stack.DefaultTOS, tcpip.UseDefaultIPv4TTL, tcpip.UseDefaultIPv6HopLimit)
|
|
}
|
|
|
|
// Release all resources.
|
|
r.segment.DecRef()
|
|
r.segment = nil
|
|
r.forwarder = nil
|
|
}
|
|
|
|
// CreateEndpoint creates a TCP endpoint for the connection request, performing
|
|
// the 3-way handshake in the process.
|
|
func (r *ForwarderRequest) CreateEndpoint(queue *waiter.Queue) (tcpip.Endpoint, tcpip.Error) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
|
|
if r.segment == nil {
|
|
return nil, &tcpip.ErrInvalidEndpointState{}
|
|
}
|
|
|
|
f := r.forwarder
|
|
ep, err := f.listen.performHandshake(r.segment, header.TCPSynOptions{
|
|
MSS: r.synOptions.MSS,
|
|
WS: r.synOptions.WS,
|
|
TS: r.synOptions.TS,
|
|
TSVal: r.synOptions.TSVal,
|
|
TSEcr: r.synOptions.TSEcr,
|
|
SACKPermitted: r.synOptions.SACKPermitted,
|
|
}, queue, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return ep, nil
|
|
}
|
|
|
|
// ForwardedPacketExperimentOption returns the experiment option value from the
|
|
// forwarded packet and a bool indicating whether an experiment option value was
|
|
// found.
|
|
func (r *ForwarderRequest) ForwardedPacketExperimentOption() (uint16, bool) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
return r.segment.pkt.ExperimentOptionValue()
|
|
}
|