Split VPN fabric batches by stream

2026-05-16 12:33:27 +03:00
parent bbd9f8c257
commit bd70ca6342
3 changed files with 83 additions and 15 deletions
@@ -284,6 +284,43 @@ func TestFabricSessionPacketTransportShardsStreamsByTrafficClass(t *testing.T) {
 	}
 }

+func TestFabricSessionPacketTransportSplitsMixedBatchByStream(t *testing.T) {
+	sender := &captureFabricSessionSender{}
+	transport := &FabricSessionPacketTransport{
+		Sender:          sender,
+		VPNConnectionID: "vpn-1",
+		SendDirection:   FabricDirectionClientToGateway,
+		StreamIDsByTrafficClass: map[string][]uint64{
+			FabricTrafficClassInteractive: []uint64{801},
+			FabricTrafficClassBulk:        []uint64{901, 902},
+		},
+	}
+	bulkA := testIPv4TCPPacket([4]byte{10, 77, 0, 2}, [4]byte{192, 168, 200, 95}, 51000, 443)
+	bulkB := packetWithDifferentShard(bulkA, 2)
+	control := testIPv4TCPPacket([4]byte{10, 77, 0, 2}, [4]byte{192, 168, 200, 95}, 51001, 3389)
+	control[33] = 0x02
+
+	if err := transport.SendGatewayPacketBatch(context.Background(), [][]byte{bulkA, bulkB, control}); err != nil {
+		t.Fatalf("send mixed batch: %v", err)
+	}
+	if len(sender.frames) != 3 {
+		t.Fatalf("sent frames = %d, want 3: %+v", len(sender.frames), sender.frames)
+	}
+	streams := map[uint64]fabricproto.TrafficClass{}
+	for _, frame := range sender.frames {
+		streams[frame.StreamID] = frame.TrafficClass
+	}
+	if streams[801] != fabricproto.TrafficClassInteractive ||
+		streams[901] != fabricproto.TrafficClassBulk ||
+		streams[902] != fabricproto.TrafficClassBulk {
+		t.Fatalf("unexpected stream/class split: %+v", sender.frames)
+	}
+	snapshot := transport.Snapshot()
+	if snapshot["send_stream_count"] != 3 || snapshot["send_class_count"] != 2 {
+		t.Fatalf("unexpected mixed-batch shard summary: %+v", snapshot)
+	}
+}
+
 func TestFabricSessionPacketTransportClosesAllStreamShards(t *testing.T) {
 	sender := &captureFabricSessionSender{}
 	transport := &FabricSessionPacketTransport{