soypat/lneto
1
0
Fork 0
mirror of https://github.com/soypat/lneto.git synced 2026-08-07 00:13:43 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

ipv6: StackIP and StackAsync.Addr refactor (#105)

Browse Source 
* apply StackIP changes and internet package test passing

* fix tests and examples

* remove old Reset method on StackIP

* use encapsulate for ipv6

* add TCP over IPv6 tests
This commit is contained in:
Pat Whittingslow
2026-05-09 16:11:31 -03:00
committed by GitHub
parent a430f6c40a
commit bdbd38ab44
22 changed files with 609 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internet/stackbasic_test.go
+89 -6
View File
@@ -5,6 +5,7 @@ import (
"net/netip"
"testing"
"github.com/soypat/lneto"
"github.com/soypat/lneto/tcp"
)
@@ -44,7 +45,7 @@ func TestBasicStack2(t *testing.T) {
func expectExchange(t *testing.T, from, to *StackIP, buf []byte) {
t.Helper()
n, err := from.Encapsulate(buf, -1, 0)
n, err := from.Encapsulate(buf, 0, 0)
if err != nil {
t.Error("expectExchange:encapsulate:", err)
} else if n == 0 {
@@ -90,15 +91,97 @@ func testClientServerEstablish(t *testing.T, client, server *StackIP, connClient
}
}
func TestBasicStack6(t *testing.T) {
rng := rand.New(rand.NewSource(1))
var sbCl, sbSv StackIP
var connCl, connSv tcp.Conn
setupClientServer6(t, rng, &sbCl, &sbSv, &connCl, &connSv)
var buf [2048]byte
nextToSend := &sbCl
nextToRecv := &sbSv
exchangeAndExpectStates := func(clState, svState tcp.State) {
t.Helper()
expectExchange(t, nextToSend, nextToRecv, buf[:])
gotCl := connCl.State()
gotSv := connSv.State()
if gotCl != clState {
t.Errorf("want client state %s, got %s", clState, gotCl)
}
if gotSv != svState {
t.Errorf("want server state %s, got %s", svState, gotSv)
}
nextToSend, nextToRecv = nextToRecv, nextToSend
}
exchangeAndExpectStates(tcp.StateSynSent, tcp.StateSynRcvd)
exchangeAndExpectStates(tcp.StateEstablished, tcp.StateSynRcvd)
exchangeAndExpectStates(tcp.StateEstablished, tcp.StateEstablished)
}
func TestBasicStack6Established(t *testing.T) {
rng := rand.New(rand.NewSource(1))
var sbCl, sbSv StackIP
var connCl, connSv tcp.Conn
setupClientServer6(t, rng, &sbCl, &sbSv, &connCl, &connSv)
testClientServerEstablish(t, &sbCl, &sbSv, &connCl, &connSv)
}
func setupClientServer6(t *testing.T, rng *rand.Rand, client, server *StackIP, connClient, connServer *tcp.Conn) {
t.Helper()
_ = rng
const maxNodes = 1
bufsize := 2048
svip6 := netip.AddrFrom16([16]byte{0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}) // 2001:db8::1
clip6 := netip.AddrFrom16([16]byte{0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}) // 2001:db8::2
svip := netip.AddrPortFrom(svip6, 80)
clip := netip.AddrPortFrom(clip6, 1337)
if err := server.Reset(new(lneto.Validator), 0, maxNodes); err != nil {
t.Fatal(err)
}
if err := client.Reset(new(lneto.Validator), 0, maxNodes); err != nil {
t.Fatal(err)
}
server.SetAddr6(svip6.As16())
client.SetAddr6(clip6.As16())
err := connServer.Configure(tcp.ConnConfig{
RxBuf: make([]byte, bufsize),
TxBuf: make([]byte, bufsize),
TxPacketQueueSize: 3,
})
if err != nil {
t.Fatal(err)
}
err = connClient.Configure(tcp.ConnConfig{
RxBuf: make([]byte, bufsize),
TxBuf: make([]byte, bufsize),
TxPacketQueueSize: 3,
})
if err != nil {
t.Fatal(err)
}
if err = connServer.OpenListen(svip.Port(), 200); err != nil {
t.Fatal(err)
}
if err = connClient.OpenActive(clip.Port(), svip, 100); err != nil {
t.Fatal(err)
}
if err = server.Register6(connServer); err != nil {
t.Fatal(err)
}
if err = client.Register6(connClient); err != nil {
t.Fatal(err)
}
}
func setupClientServer(t *testing.T, rng *rand.Rand, client, server *StackIP, connClient, connServer *tcp.Conn) {
const maxNodes = 1
bufsize := 2048
// Ensure buffer sizes are OK with reused buffers.
svip := netip.AddrPortFrom(netip.AddrFrom4([4]byte{192, 168, 1, 0}), 80)
clip := netip.AddrPortFrom(netip.AddrFrom4([4]byte{192, 168, 1, 1}), 1337)
server.Reset(svip.Addr(), maxNodes)
client.Reset(clip.Addr(), maxNodes)
server.Reset(new(lneto.Validator), maxNodes, 0)
client.Reset(new(lneto.Validator), maxNodes, 0)
server.SetAddr4(svip.Addr().As4())
client.SetAddr4(clip.Addr().As4())
err := connServer.Configure(tcp.ConnConfig{
RxBuf: make([]byte, bufsize),
TxBuf: make([]byte, bufsize),
@@ -127,11 +210,11 @@ func setupClientServer(t *testing.T, rng *rand.Rand, client, server *StackIP, co
t.Fatal(err)
}
err = server.Register(connServer)
err = server.Register4(connServer)
if err != nil {
t.Fatal(err)
}
err = client.Register(connClient)
err = client.Register4(connClient)
if err != nil {
t.Fatal(err)
}