more test data for plain packet

1 files changed, 43 insertions, 75 deletions

diff --git a/satp/packet_test.go b/satp/packet_test.go
index 048ebca..f1e25b7 100644
--- a/satp/packet_test.go
+++ b/satp/packet_test.go
@@ -36,66 +36,46 @@ import (
 	"testing"
 )
 
+var (
+	IPv4     = uint16(0x0800)
+	IPv4Ping = []byte{
+		0x45, 0x00, 0x00, 0x54, 0xB7, 0xCC, 0x40, 0x00, 0x40, 0x01, 0xAD, 0x73, 0xC0, 0xA8, 0x2A, 0x17,
+		0xC0, 0xA8, 0x2A, 0x01, 0x08, 0x00, 0xB4, 0x04, 0x3D, 0xE2, 0x00, 0x01, 0xE6, 0x00, 0xB1, 0x59,
+		0x00, 0x00, 0x00, 0x00, 0xA4, 0xEA, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x12, 0x13,
+		0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23,
+		0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33,
+		0x34, 0x35, 0x36, 0x37}
+
+	IPv6     = uint16(0x86DD)
+	IPv6Ping = []byte{
+		0x60, 0x0E, 0x9B, 0x1F, 0x00, 0x40, 0x3A, 0x40, 0x2A, 0x02, 0x12, 0x34, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2A, 0x02, 0x12, 0x34, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x80, 0x00, 0xE6, 0x21, 0x46, 0x22, 0x00, 0x01,
+		0x3E, 0x06, 0xB1, 0x59, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5E, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+		0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
+		0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37}
+
+	Ethernet   = uint16(0x6558)
+	ARPRequest = []byte{
+		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x5A, 0xD4, 0xC7, 0x23, 0x43, 0x08, 0x06, 0x00, 0x01,
+		0x08, 0x00, 0x06, 0x04, 0x00, 0x01, 0xC6, 0x5A, 0xD4, 0xC7, 0x23, 0x43, 0xC0, 0xA8, 0x2A, 0x17,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xA8, 0x2A, 0x01}
+)
+
 func TestPlainPacketMarshal(t *testing.T) {
 	testvectors := []struct {
 		packet   PlainPacket
 		valid    bool
 		expected []byte
 	}{
-		{
-			PlainPacket{}, true,
-			[]byte{0x0, 0x0},
-		},
-		{
-			*NewPlainPacket(0x0800), true,
-			[]byte{0x8, 0x0},
-		},
-		{
-			*NewPlainPacket(0x86DD), true,
-			[]byte{0x86, 0xDD},
-		},
-		{
-			PlainPacket{Payload: []byte{0x0, 0x0, 0x0}}, true,
-			[]byte{0x0, 0x0, 0x0, 0x0, 0x0},
-		},
-		{
-			PlainPacket{Type: 0x0800, Payload: []byte{
-				0x45, 0x00, 0x00, 0x54, 0xB7, 0xCC, 0x40, 0x00, 0x40, 0x01, 0xAD, 0x73, 0xC0, 0xA8, 0x2A, 0x17,
-				0xC0, 0xA8, 0x2A, 0x01, 0x08, 0x00, 0xB4, 0x04, 0x3D, 0xE2, 0x00, 0x01, 0xE6, 0x00, 0xB1, 0x59,
-				0x00, 0x00, 0x00, 0x00, 0xA4, 0xEA, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x12, 0x13,
-				0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23,
-				0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33,
-				0x34, 0x35, 0x36, 0x37}}, true,
-			[]byte{0x8, 0x0,
-				0x45, 0x00, 0x00, 0x54, 0xB7, 0xCC, 0x40, 0x00, 0x40, 0x01, 0xAD, 0x73, 0xC0, 0xA8, 0x2A, 0x17,
-				0xC0, 0xA8, 0x2A, 0x01, 0x08, 0x00, 0xB4, 0x04, 0x3D, 0xE2, 0x00, 0x01, 0xE6, 0x00, 0xB1, 0x59,
-				0x00, 0x00, 0x00, 0x00, 0xA4, 0xEA, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x12, 0x13,
-				0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23,
-				0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33,
-				0x34, 0x35, 0x36, 0x37},
-		},
-		{
-			PlainPacket{Type: 0x86DD, Payload: []byte{
-				0x60, 0x00, 0x00, 0x00, 0x00, 0x08, 0x3A, 0xFF, 0xFE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x49, 0xCF, 0x96, 0xCA, 0x4C, 0x44, 0x31, 0xBE, 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x85, 0x00, 0x1E, 0x9B, 0x00, 0x00, 0x00, 0x00}}, true,
-			[]byte{0x86, 0xDD,
-				0x60, 0x00, 0x00, 0x00, 0x00, 0x08, 0x3A, 0xFF, 0xFE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x49, 0xCF, 0x96, 0xCA, 0x4C, 0x44, 0x31, 0xBE, 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x85, 0x00, 0x1E, 0x9B, 0x00, 0x00, 0x00, 0x00},
-		},
-		{
-			PlainPacket{Type: 0x6558, Payload: []byte{
-				0x01, 0x00, 0x5E, 0x00, 0x00, 0x16, 0x86, 0x4C, 0x78, 0xD7, 0x75, 0xE3, 0x08, 0x00, 0x46, 0xC0,
-				0x00, 0x28, 0x00, 0x00, 0x40, 0x00, 0x01, 0x02, 0x19, 0x3A, 0xC0, 0xA8, 0x2A, 0x17, 0xE0, 0x00,
-				0x00, 0x16, 0x94, 0x04, 0x00, 0x00, 0x22, 0x00, 0xF9, 0x02, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00,
-				0x00, 0x00, 0xE0, 0x00, 0x00, 0xFB}}, true,
-			[]byte{0x65, 0x58,
-				0x01, 0x00, 0x5E, 0x00, 0x00, 0x16, 0x86, 0x4C, 0x78, 0xD7, 0x75, 0xE3, 0x08, 0x00, 0x46, 0xC0,
-				0x00, 0x28, 0x00, 0x00, 0x40, 0x00, 0x01, 0x02, 0x19, 0x3A, 0xC0, 0xA8, 0x2A, 0x17, 0xE0, 0x00,
-				0x00, 0x16, 0x94, 0x04, 0x00, 0x00, 0x22, 0x00, 0xF9, 0x02, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00,
-				0x00, 0x00, 0xE0, 0x00, 0x00, 0xFB},
-		},
+		{PlainPacket{}, true, []byte{0x0, 0x0}},
+		{*NewPlainPacket(IPv4), true, []byte{0x8, 0x0}},
+		{*NewPlainPacket(IPv6), true, []byte{0x86, 0xDD}},
+		{PlainPacket{Type: Ethernet, Payload: []byte{0x0, 0x0, 0x0}}, true, []byte{0x65, 0x58, 0x0, 0x0, 0x0}},
+		{PlainPacket{Type: 0x0800, Payload: IPv4Ping}, true, append([]byte{0x8, 0x0}, IPv4Ping...)},
+		{PlainPacket{Type: 0x86DD, Payload: IPv6Ping}, true, append([]byte{0x86, 0xDD}, IPv6Ping...)},
+		{PlainPacket{Type: 0x6558, Payload: ARPRequest}, true, append([]byte{0x65, 0x58}, ARPRequest...)},
 	}
 
 	for _, vector := range testvectors {
@@ -121,27 +101,15 @@ func TestPlainPacketUnmarshal(t *testing.T) {
 		valid    bool
 		expected PlainPacket
 	}{
-		{
-			[]byte{},
-			false, PlainPacket{},
-		},
-		{
-			[]byte{0x0},
-			false, PlainPacket{},
-		},
-		{
-			[]byte{0x0, 0x0},
-			true, PlainPacket{},
-		},
-		{
-			[]byte{0x0, 0x0, 0x0},
-			true, PlainPacket{Payload: []byte{0x0}},
-		},
-		{
-			[]byte{0x0, 0x0, 0x0, 0x01},
-			true, PlainPacket{Payload: []byte{0x0, 0x01}},
-		},
-		// TODO: much more test vectors
+		{[]byte{}, false, PlainPacket{}},
+		{[]byte{0x0}, false, PlainPacket{}},
+		{[]byte{0x0, 0x0}, true, PlainPacket{}},
+		{[]byte{0x8, 0x0}, true, *NewPlainPacket(IPv4)},
+		{[]byte{0x86, 0xDD}, true, *NewPlainPacket(IPv6)},
+		{[]byte{0x65, 0x58, 0x0, 0x0, 0x0}, true, PlainPacket{Type: Ethernet, Payload: []byte{0x0, 0x0, 0x0}}},
+		{append([]byte{0x8, 0x0}, IPv4Ping...), true, PlainPacket{Type: 0x0800, Payload: IPv4Ping}},
+		{append([]byte{0x86, 0xDD}, IPv6Ping...), true, PlainPacket{Type: 0x86DD, Payload: IPv6Ping}},
+		{append([]byte{0x65, 0x58}, ARPRequest...), true, PlainPacket{Type: 0x6558, Payload: ARPRequest}},
 	}
 
 	for _, vector := range testvectors {