Обновление снапшота с 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-паникой, что в полевом крашдампе; с ним зелёный.
117 lines
3.7 KiB
Go
117 lines
3.7 KiB
Go
// Copyright 2019 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 udp
|
|
|
|
import (
|
|
"github.com/sagernet/gvisor/pkg/tcpip"
|
|
"github.com/sagernet/gvisor/pkg/tcpip/stack"
|
|
"github.com/sagernet/gvisor/pkg/waiter"
|
|
)
|
|
|
|
// ForwarderHandler handles incoming requests. Returning true marks the
|
|
// request as handled, returning false marks the request as unhandled.
|
|
// Stack may send an ICMP port unreachable message for unhandled requests.
|
|
type ForwarderHandler func(*ForwarderRequest) (handled bool)
|
|
|
|
// Forwarder is a session request forwarder, which allows clients to decide
|
|
// what to do with a session request, for example: ignore it, or process it.
|
|
//
|
|
// The canonical way of using it is to pass the Forwarder.HandlePacket function
|
|
// to stack.SetTransportProtocolHandler.
|
|
type Forwarder struct {
|
|
handler ForwarderHandler
|
|
|
|
stack *stack.Stack
|
|
}
|
|
|
|
// NewForwarder allocates and initializes a new forwarder.
|
|
func NewForwarder(s *stack.Stack, handler ForwarderHandler) *Forwarder {
|
|
return &Forwarder{
|
|
stack: s,
|
|
handler: handler,
|
|
}
|
|
}
|
|
|
|
// HandlePacket handles all packets.
|
|
//
|
|
// 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 {
|
|
return f.handler(&ForwarderRequest{
|
|
stack: f.stack,
|
|
id: id,
|
|
pkt: pkt.Clone(),
|
|
})
|
|
}
|
|
|
|
// ForwarderRequest represents a session request received by the forwarder and
|
|
// passed to the client. Clients may optionally create an endpoint to represent
|
|
// it via CreateEndpoint.
|
|
type ForwarderRequest struct {
|
|
stack *stack.Stack
|
|
id stack.TransportEndpointID
|
|
pkt *stack.PacketBuffer
|
|
}
|
|
|
|
// NewForwarderRequest creates a new ForwarderRequest.
|
|
func NewForwarderRequest(stack *stack.Stack, id stack.TransportEndpointID, pkt *stack.PacketBuffer) *ForwarderRequest {
|
|
return &ForwarderRequest{
|
|
stack: stack,
|
|
id: id,
|
|
pkt: pkt,
|
|
}
|
|
}
|
|
|
|
// ID returns the 4-tuple (src address, src port, dst address, dst port) that
|
|
// represents the session request.
|
|
func (r *ForwarderRequest) ID() stack.TransportEndpointID {
|
|
return r.id
|
|
}
|
|
|
|
// CreateEndpoint creates a connected UDP endpoint for the session request.
|
|
func (r *ForwarderRequest) CreateEndpoint(queue *waiter.Queue) (tcpip.Endpoint, tcpip.Error) {
|
|
ep := newEndpoint(r.stack, r.pkt.NetworkProtocolNumber, queue)
|
|
ep.mu.Lock()
|
|
defer ep.mu.Unlock()
|
|
|
|
netHdr := r.pkt.Network()
|
|
if err := ep.net.Bind(tcpip.FullAddress{NIC: r.pkt.NICID, Addr: netHdr.DestinationAddress(), Port: r.id.LocalPort}); err != nil {
|
|
ep.closeLocked()
|
|
return nil, err
|
|
}
|
|
|
|
if err := ep.net.Connect(tcpip.FullAddress{NIC: r.pkt.NICID, Addr: netHdr.SourceAddress(), Port: r.id.RemotePort}); err != nil {
|
|
ep.closeLocked()
|
|
return nil, err
|
|
}
|
|
|
|
if err := r.stack.RegisterTransportEndpoint([]tcpip.NetworkProtocolNumber{r.pkt.NetworkProtocolNumber}, ProtocolNumber, r.id, ep, ep.portFlags, tcpip.NICID(ep.ops.GetBindToDevice())); err != nil {
|
|
ep.closeLocked()
|
|
return nil, err
|
|
}
|
|
|
|
ep.localPort = r.id.LocalPort
|
|
ep.remotePort = r.id.RemotePort
|
|
ep.effectiveNetProtos = []tcpip.NetworkProtocolNumber{r.pkt.NetworkProtocolNumber}
|
|
ep.boundPortFlags = ep.portFlags
|
|
|
|
ep.rcvMu.Lock()
|
|
ep.rcvReady = true
|
|
ep.rcvMu.Unlock()
|
|
|
|
ep.HandlePacket(r.id, r.pkt)
|
|
|
|
return ep, nil
|
|
}
|