117243aa02
Обновление снапшота с 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-паникой, что в полевом крашдампе; с ним зелёный.
83 lines
2.6 KiB
Go
83 lines
2.6 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 flipcall
|
|
|
|
import (
|
|
"unsafe"
|
|
|
|
"github.com/sagernet/gvisor/pkg/atomicbitops"
|
|
"github.com/sagernet/gvisor/pkg/sync"
|
|
)
|
|
|
|
// Packets consist of a 16-byte header followed by an arbitrarily-sized
|
|
// datagram. The header consists of:
|
|
//
|
|
// - A 4-byte native-endian connection state.
|
|
//
|
|
// - A 4-byte native-endian datagram length in bytes.
|
|
//
|
|
// - 8 reserved bytes.
|
|
const (
|
|
// PacketHeaderBytes is the size of a flipcall packet header in bytes. The
|
|
// maximum datagram size supported by a flipcall connection is equal to the
|
|
// length of the packet window minus PacketHeaderBytes.
|
|
//
|
|
// PacketHeaderBytes is exported to support its use in constant
|
|
// expressions. Non-constant expressions may prefer to use
|
|
// PacketWindowLengthForDataCap().
|
|
PacketHeaderBytes = 16
|
|
)
|
|
|
|
func (ep *Endpoint) connState() *atomicbitops.Uint32 {
|
|
return (*atomicbitops.Uint32)(unsafe.Pointer(ep.packet))
|
|
}
|
|
|
|
func (ep *Endpoint) dataLen() *atomicbitops.Uint32 {
|
|
return (*atomicbitops.Uint32)(unsafe.Pointer(ep.packet + 4))
|
|
}
|
|
|
|
// Data returns the datagram part of ep's packet window as a byte slice.
|
|
//
|
|
// Note that the packet window is shared with the potentially-untrusted peer
|
|
// Endpoint, which may concurrently mutate the contents of the packet window.
|
|
// Thus:
|
|
//
|
|
// - Readers must not assume that two reads of the same byte in Data() will
|
|
// return the same result. In other words, readers should read any given byte
|
|
// in Data() at most once.
|
|
//
|
|
// - Writers must not assume that they will read back the same data that they
|
|
// have written. In other words, writers should avoid reading from Data() at
|
|
// all.
|
|
func (ep *Endpoint) Data() []byte {
|
|
ptr := unsafe.Pointer(ep.packet + PacketHeaderBytes)
|
|
return unsafe.Slice((*byte)(ptr), int(ep.dataCap))
|
|
}
|
|
|
|
// ioSync is a dummy variable used to indicate synchronization to the Go race
|
|
// detector. Compare syscall.ioSync.
|
|
var ioSync int64
|
|
|
|
func raceBecomeActive() {
|
|
if sync.RaceEnabled {
|
|
sync.RaceAcquire(unsafe.Pointer(&ioSync))
|
|
}
|
|
}
|
|
|
|
func raceBecomeInactive() {
|
|
if sync.RaceEnabled {
|
|
sync.RaceReleaseMerge(unsafe.Pointer(&ioSync))
|
|
}
|
|
}
|