common: unexport IpStrToUint32 method

Author: lebauce

common/types.go

@@ -18,9 +18,7 @@
 package common
 
 import (
-	"encoding/binary"
 	"errors"
-	"net"
 	"time"
 )
 
@@ -78,16 +76,3 @@ type Metric interface {
 	SetLast(last int64)
 	IsZero() bool
 }
-
-// IPStrToUint32 converts IP string to 32bits
-func IPStrToUint32(ipAddr string) (uint32, error) {
-	ip := net.ParseIP(ipAddr)
-	if ip == nil {
-		return 0, errors.New("wrong ipAddr format")
-	}
-	ip = ip.To4()
-	if ip == nil {
-		return 0, errors.New("wrong ipAddr format")
-	}
-	return binary.BigEndian.Uint32(ip), nil
-}

flow/probes/targets/netflow_v5.go

@@ -20,6 +20,7 @@ package targets
 import (
 	"bytes"
 	"encoding/binary"
+	"errors"
 	"math"
 	"net"
 	"sync"
@@ -54,20 +55,32 @@ func (nf *NetFlowV5Target) SendPacket(packet gopacket.Packet, bpf *flow.BPF) {
 func (nf *NetFlowV5Target) sendFlowBulk(flows []*flow.Flow, now time.Time) {
 	records := new(bytes.Buffer)
 
+	ipStrToUint32 := func(ipAddr string) (uint32, error) {
+		ip := net.ParseIP(ipAddr)
+		if ip == nil {
+			return 0, errors.New("wrong ipAddr format")
+		}
+		ip = ip.To4()
+		if ip == nil {
+			return 0, errors.New("wrong ipAddr format")
+		}
+		return binary.BigEndian.Uint32(ip), nil
+	}
+
 	var nFlows uint16
 	for _, f := range flows {
 		if f.Network == nil {
 			continue
 		}
 
 		// Source IP Address
-		ipA, err := common.IPStrToUint32(f.Network.A)
+		ipA, err := ipStrToUint32(f.Network.A)
 		if err != nil {
 			continue
 		}
 
 		// Destination IP Address
-		ipB, err := common.IPStrToUint32(f.Network.B)
+		ipB, err := ipStrToUint32(f.Network.B)
 		if err != nil {
 			continue
 		}