Fix ipfix buffer use and mirror test

Author: themiron

vflow/ipfix_test.go

@@ -30,7 +30,7 @@ import (
 )
 
 func init() {
-	opts = &Options{}
+	opts = NewOptions()
 }
 
 func TestMirrorIPFIX(t *testing.T) {
@@ -39,21 +39,27 @@ func TestMirrorIPFIX(t *testing.T) {
 		fb    = make(chan IPFIXUDPMsg)
 		dst   = net.ParseIP("127.0.0.1")
 		ready = make(chan struct{})
+		errCh = make(chan struct{})
 	)
 
 	go func() {
 		err := mirrorIPFIX(dst, 10024, msg)
 		if err != nil {
 			if strings.Contains(err.Error(), "not permitted") {
 				t.Log(err)
-				ready <- struct{}{}
+				errCh <- struct{}{}
 			} else {
 				t.Fatal("unexpected error", err)
 			}
 		}
 	}()
 
-	time.Sleep(2 * time.Second)
+	select {
+	case <-errCh:
+		return
+	case <-time.After(2 * time.Second):
+		break
+	}
 
 	go func() {
 		b := make([]byte, 1500)
@@ -86,9 +92,11 @@ func TestMirrorIPFIX(t *testing.T) {
 
 	}()
 
-	_, ok := <-ready
-	if ok {
-		return
+	select {
+	case <-ready:
+		break
+	case <-time.After(2 * time.Second):
+		t.Fatal("timeout")
 	}
 
 	body := []byte("hello")
@@ -100,7 +108,15 @@ func TestMirrorIPFIX(t *testing.T) {
 		},
 	}
 
-	feedback := <-fb
+	var feedback IPFIXUDPMsg
+	select {
+	case feedback = <-fb:
+		break
+	case <-errCh:
+		return
+	case <-time.After(2 * time.Second):
+		t.Fatal("timeout")
+	}
 
 	if string(feedback.body) != "hello" {
 		t.Error("expect body is hello, got", string(feedback.body))

vflow/ipfix_unix.go

@@ -113,7 +113,9 @@ func mirrorIPFIX(dst net.IP, port int, ch chan IPFIXUDPMsg) error {
 		copy(packet[ipHLen:ipHLen+8], udpHdr)
 		copy(packet[ipHLen+8:], msg.body)
 
-		ipfixBuffer.Put(msg.body[:opts.IPFIXUDPSize])
+		if cap(msg.body) >= opts.IPFIXUDPSize {
+			ipfixBuffer.Put(msg.body[:opts.IPFIXUDPSize])
+		}
 
 		if err = conn.Send(packet[0 : ipHLen+8+pLen]); err != nil {
 			return err