some more testcases

5 files changed, 122 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index deec582..56f7a36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /app/anygone
+coverage.out
diff --git a/app/Makefile b/app/Makefile
index 2bf7c07..92cb899 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -38,8 +38,8 @@ LIBS := "go.anytun.org/anygone/satp" \
         "github.com/lab11/go-tuntap/tuntap" \
         "github.com/spf13/pflag"
 
-all: build
-.PHONY: vet format build clean distclean
+all: build test
+.PHONY: vet format getlibs updatelibs build build-static test bench cover clean distclean
 
 vet:
 	$(GOCMD) vet
@@ -59,6 +59,16 @@ build: getlibs
 build-static: getlibs
 	$(GOCMD) build -tags netgo -o $(EXECUTEABLE)
 
+test:
+	$(GOCMD) test
+
+bench:
+	@$(GOCMD) test -bench=.
+
+cover:
+	@$(GOCMD) test -coverprofile=coverage.out
+	@$(GOCMD) tool cover -html=coverage.out
+
 distclean: clean
 	rm -f $(EXECUTEABLE).8
 
diff --git a/app/anygone.go b/app/anygone.go
index 8e06c65..ce1734c 100644
--- a/app/anygone.go
+++ b/app/anygone.go
@@ -108,6 +108,15 @@ func main() {
 			al.Printf("Error while reading packet from device: %v", err)
 			os.Exit(1)
 		}
-		adl.Printf("got packat: %v", pkt)
+		payload := ""
+		for i, b := range pkt.Packet {
+			if i == 0 {
+				payload = fmt.Sprintf("{0x%02X", b)
+			} else {
+				payload = payload + fmt.Sprintf(", 0x%02X", b)
+			}
+		}
+		payload = payload + "}"
+		adl.Printf("got packet: Type {0x%04X}, Payload %s", pkt.Protocol, payload)
 	}
 }
diff --git a/satp/Makefile b/satp/Makefile
new file mode 100644
index 0000000..a3f7dcd
--- /dev/null
+++ b/satp/Makefile
@@ -0,0 +1,53 @@
+##
+## Copyright (c) 2017 anygone contributors (see AUTHORS file)
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are met:
+##
+## * Redistributions of source code must retain the above copyright notice, this
+##   list of conditions and the following disclaimer.
+##
+## * Redistributions in binary form must reproduce the above copyright notice,
+##   this list of conditions and the following disclaimer in the documentation
+##   and/or other materials provided with the distribution.
+##
+## * Neither the name of anygone nor the names of its
+##   contributors may be used to endorse or promote products derived from
+##   this software without specific prior written permission.
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+## AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+## DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+## SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+## CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+##
+
+GOCMD := go
+ifdef GOROOT
+GOCMD = $(GOROOT)/bin/go
+endif
+
+all: test
+.PHONY: vet format test bench cover
+
+vet:
+	$(GOCMD) vet
+
+format:
+	$(GOCMD) fmt
+
+test:
+	$(GOCMD) test
+
+bench:
+	@$(GOCMD) test -bench=.
+
+cover:
+	@$(GOCMD) test -coverprofile=coverage.out
+	@$(GOCMD) tool cover -html=coverage.out
diff --git a/satp/packet_test.go b/satp/packet_test.go
index 5fce4f4..048ebca 100644
--- a/satp/packet_test.go
+++ b/satp/packet_test.go
@@ -47,10 +47,55 @@ func TestPlainPacketMarshal(t *testing.T) {
 			[]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},
 		},
-		// TODO: much more test vectors
+		{
+			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},
+		},
 	}
 
 	for _, vector := range testvectors {