test cleanup

.gitignore

@@ -1 +1,2 @@
 water.test
+water.test.exe

ipv4_darwin_test.go

@@ -4,13 +4,14 @@ import (
 	"net"
 	"os/exec"
 	"testing"
-	"time"
-
-	"github.com/songgao/water/waterutil"
 )
 
-func startPing(t *testing.T, dst net.IP) {
+func startPing(t *testing.T, dst net.IP, dashB bool) {
-	if err := exec.Command("ping", "-c", "4", dst.String()).Start(); err != nil {
+	params := []string{"-c", "4", dst.String()}
+	if dashB {
+		params = append([]string{"-b"}, params...)
+	}
+	if err := exec.Command("ping", params...).Start(); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -42,37 +43,10 @@ func TestP2PTUN(t *testing.T) {
 	}
 	defer teardownIfce(t, ifce)
 
-	dataCh := make(chan []byte)
+	dataCh, errCh := startRead(t, ifce)
-	errCh := make(chan error)
-	startRead(t, ifce, dataCh, errCh)
 
 	setupIfce(t, self, remote, ifce.Name())
-	startPing(t, remote)
+	startPing(t, remote, false)
 
-	timeout := time.NewTimer(8 * time.Second).C
+	waitForPingOrBust(t, false, false, self, remote, dataCh, errCh)
-
-readFrame:
-	for {
-		select {
-		case packet := <-dataCh:
-			if !waterutil.IsIPv4(packet) {
-				continue readFrame
-			}
-			if !waterutil.IPv4Source(packet).Equal(self) {
-				continue readFrame
-			}
-			if !waterutil.IPv4Destination(packet).Equal(remote) {
-				continue readFrame
-			}
-			if waterutil.IPv4Protocol(packet) != waterutil.ICMP {
-				continue readFrame
-			}
-			t.Logf("received broadcast packet: %#v\n", packet)
-			break readFrame
-		case err := <-errCh:
-			t.Fatalf("read error: %v", err)
-		case <-timeout:
-			t.Fatal("Waiting for broadcast packet timeout")
-		}
-	}
 }

ipv4_linux_test.go

@@ -4,13 +4,14 @@ import (
 	"net"
 	"os/exec"
 	"testing"
-	"time"
-
-	"github.com/songgao/water/waterutil"
 )
 
-func startBroadcast(t *testing.T, dst net.IP) {
+func startPing(t *testing.T, dst net.IP, dashB bool) {
-	if err := exec.Command("ping", "-b", "-c", "4", dst.String()).Start(); err != nil {
+	params := []string{"-c", "4", dst.String()}
+	if dashB {
+		params = append([]string{"-b"}, params...)
+	}
+	if err := exec.Command("ping", params...).Start(); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -46,45 +47,52 @@ func TestBroadcastTAP(t *testing.T) {
 	}
 	defer teardownIfce(t, ifce)
 
+	dataCh, errCh := startRead(t, ifce)
+
 	setupIfce(t, net.IPNet{IP: self, Mask: mask}, ifce.Name())
-	startBroadcast(t, brd)
+	startPing(t, brd, true)
 
-	dataCh := make(chan []byte)
+	waitForPingOrBust(t, true, true, self, brd, dataCh, errCh)
-	errCh := make(chan error)
+}
-	startRead(t, ifce, dataCh, errCh)
+
-
+func TestBroadcastTUN(t *testing.T) {
-	timeout := time.NewTimer(8 * time.Second).C
+	var (
-
+		self = net.IPv4(10, 0, 42, 1)
-readFrame:
+		mask = net.IPv4Mask(255, 255, 255, 0)
-	for {
+		brd  = net.IPv4(10, 0, 42, 255)
-		select {
+	)
-		case buffer := <-dataCh:
+
-			ethertype := waterutil.MACEthertype(buffer)
+	ifce, err := New(Config{DeviceType: TUN})
-			if ethertype != waterutil.IPv4 {
+	if err != nil {
-				continue readFrame
+		t.Fatalf("creating TUN error: %v\n", err)
-			}
+	}
-			if !waterutil.IsBroadcast(waterutil.MACDestination(buffer)) {
+	defer teardownIfce(t, ifce)
-				continue readFrame
+
-			}
+	dataCh, errCh := startRead(t, ifce)
-			packet := waterutil.MACPayload(buffer)
+
-			if !waterutil.IsIPv4(packet) {
+	setupIfce(t, net.IPNet{IP: self, Mask: mask}, ifce.Name())
-				continue readFrame
+	startPing(t, brd, true)
-			}
+
-			if !waterutil.IPv4Source(packet).Equal(self) {
+	waitForPingOrBust(t, false, true, self, brd, dataCh, errCh)
-				continue readFrame
+}
-			}
+
-			if !waterutil.IPv4Destination(packet).Equal(brd) {
+func TestUnicastTUN(t *testing.T) {
-				continue readFrame
+	var (
-			}
+		self   = net.IPv4(10, 0, 42, 1)
-			if waterutil.IPv4Protocol(packet) != waterutil.ICMP {
+		mask   = net.IPv4Mask(255, 255, 255, 0)
-				continue readFrame
+		remote = net.IPv4(10, 0, 42, 2)
-			}
+	)
-			t.Logf("received broadcast frame: %#v\n", buffer)
+
-			break readFrame
+	ifce, err := New(Config{DeviceType: TUN})
-		case err := <-errCh:
+	if err != nil {
-			t.Fatalf("read error: %v", err)
+		t.Fatalf("creating TUN error: %v\n", err)
-		case <-timeout:
+	}
-			t.Fatal("Waiting for broadcast packet timeout")
+	defer teardownIfce(t, ifce)
-		}
+
-	}
+	dataCh, errCh := startRead(t, ifce)
+
+	setupIfce(t, net.IPNet{IP: self, Mask: mask}, ifce.Name())
+	startPing(t, remote, false)
+
+	waitForPingOrBust(t, false, false, self, remote, dataCh, errCh)
 }

ipv4_test.go

@@ -1,12 +1,18 @@
 package water
 
 import (
+	"net"
 	"testing"
+	"time"
+
+	"github.com/songgao/water/waterutil"
 )
 
 const BUFFERSIZE = 1522
 
-func startRead(t *testing.T, ifce *Interface, dataCh chan<- []byte, errCh chan<- error) {
+func startRead(t *testing.T, ifce *Interface) (dataChan <-chan []byte, errChan <-chan error) {
+	dataCh := make(chan []byte)
+	errCh := make(chan error)
 	go func() {
 		for {
 			buffer := make([]byte, BUFFERSIZE)
@@ -19,4 +25,51 @@ func startRead(t *testing.T, ifce *Interface, dataCh chan<- []byte, errCh chan<-
 			}
 		}
 	}()
+	return dataCh, errCh
+}
+
+func waitForPingOrBust(t *testing.T,
+	isTAP bool,
+	expectBroadcast bool,
+	expectSrc net.IP,
+	expectDest net.IP,
+	dataCh <-chan []byte, errCh <-chan error) {
+	waitForPintTimeout := time.NewTimer(8 * time.Second).C
+readFrame:
+	for {
+		select {
+		case buffer := <-dataCh:
+			var packet []byte
+			if isTAP {
+				ethertype := waterutil.MACEthertype(buffer)
+				if ethertype != waterutil.IPv4 {
+					continue readFrame
+				}
+				if expectBroadcast && !waterutil.IsBroadcast(waterutil.MACDestination(buffer)) {
+					continue readFrame
+				}
+				packet = waterutil.MACPayload(buffer)
+			} else {
+				packet = buffer
+			}
+			if !waterutil.IsIPv4(packet) {
+				continue readFrame
+			}
+			if !waterutil.IPv4Source(packet).Equal(expectSrc) {
+				continue readFrame
+			}
+			if !waterutil.IPv4Destination(packet).Equal(expectDest) {
+				continue readFrame
+			}
+			if waterutil.IPv4Protocol(packet) != waterutil.ICMP {
+				continue readFrame
+			}
+			t.Logf("received broadcast frame: %#v\n", buffer)
+			break readFrame
+		case err := <-errCh:
+			t.Fatalf("read error: %v", err)
+		case <-waitForPintTimeout:
+			t.Fatal("Waiting for broadcast packet timeout")
+		}
+	}
 }

ipv4_windows_test.go

@@ -6,13 +6,10 @@ import (
 	"os/exec"
 	"strings"
 	"testing"
-	"time"
-
-	"github.com/songgao/water/waterutil"
 )
 
-func startBroadcast(t *testing.T, dst net.IP) {
+func startPing(t *testing.T, dst net.IP, _ bool) {
-	if err := exec.Command("ping", "-n", "2", dst.String()).Start(); err != nil {
+	if err := exec.Command("ping", "-n", "4", dst.String()).Start(); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -29,6 +26,12 @@ func setupIfce(t *testing.T, ipNet net.IPNet, dev string) {
 	}
 }
 
+func teardownIfce(t *testing.T, ifce *Interface) {
+	if err := ifce.Close(); err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestBroadcastTAP(t *testing.T) {
 	var (
 		self = net.IPv4(10, 0, 42, 1)
@@ -40,46 +43,12 @@ func TestBroadcastTAP(t *testing.T) {
 	if err != nil {
 		t.Fatalf("creating TAP error: %v\n", err)
 	}
+	defer teardownIfce(t, ifce)
+
+	dataCh, errCh := startRead(t, ifce)
 
 	setupIfce(t, net.IPNet{IP: self, Mask: mask}, ifce.Name())
-	startBroadcast(t, brd)
+	startPing(t, brd, true)
 
-	dataCh := make(chan []byte, 8)
+	waitForPingOrBust(t, true, true, self, brd, dataCh, errCh)
-	errCh := make(chan error)
-	startRead(t, ifce, dataCh, errCh)
-
-	timeout := time.NewTimer(8 * time.Second).C
-
-readFrame:
-	for {
-		select {
-		case buffer := <-dataCh:
-			ethertype := waterutil.MACEthertype(buffer)
-			if ethertype != waterutil.IPv4 {
-				continue readFrame
-			}
-			if !waterutil.IsBroadcast(waterutil.MACDestination(buffer)) {
-				continue readFrame
-			}
-			packet := waterutil.MACPayload(buffer)
-			if !waterutil.IsIPv4(packet) {
-				continue readFrame
-			}
-			if !waterutil.IPv4Source(packet).Equal(self) {
-				continue readFrame
-			}
-			if !waterutil.IPv4Destination(packet).Equal(brd) {
-				continue readFrame
-			}
-			if waterutil.IPv4Protocol(packet) != waterutil.ICMP {
-				continue readFrame
-			}
-			t.Logf("received broadcast frame: %#v\n", buffer)
-			break readFrame
-		case err := <-errCh:
-			t.Fatalf("read error: %v", err)
-		case <-timeout:
-			t.Fatal("Waiting for broadcast packet timeout")
-		}
-	}
 }