From acc2c8967a6ba6b45035155a6403292bf311e394 Mon Sep 17 00:00:00 2001
From: Song Gao <song@gao.io>
Date: Thu, 19 Nov 2015 19:24:13 +0000
Subject: [PATCH] return error instead of panic()

---
 ipv4_test.go      | 2 +-
 syscalls_other.go | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ipv4_test.go b/ipv4_test.go
index 84cb523..f855521 100644
--- a/ipv4_test.go
+++ b/ipv4_test.go
@@ -38,7 +38,7 @@ func TestBroadcast(t *testing.T) {
 
 	ifce, err := NewTAP("test")
 	if err != nil {
-		t.Fatal(err)
+		t.Fatalf("creating TAP error: %v\n", err)
 	}
 
 	setupIfce(t, net.IPNet{IP: self, Mask: mask}, ifce.Name())
diff --git a/syscalls_other.go b/syscalls_other.go
index a38ce85..ace8c3c 100644
--- a/syscalls_other.go
+++ b/syscalls_other.go
@@ -2,10 +2,12 @@
 
 package water
 
+import "errors"
+
 func newTAP(ifName string) (ifce *Interface, err error) {
-	panic("water: tap interface not implemented on this platform")
+	return nil, errors.New("tap interface not implemented on this platform")
 }
 
 func newTUN(ifName string) (ifce *Interface, err error) {
-	panic("water: tap interface not implemented on this platform")
+	return nil, errors.New("tap interface not implemented on this platform")
 }