common: moved port allocator to its own package

datadope-io · Mar 3, 2020 · d99de8c · d99de8c
1 parent 2661b4d
commit d99de8c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/cmd/injector/standalone.go b/cmd/injector/standalone.go
@@ -26,7 +26,6 @@ import (
 
 	"github.com/skydive-project/go-debouncer"
 
-	"github.com/skydive-project/skydive/common"
 	"github.com/skydive-project/skydive/packetinjector"
 	pi "github.com/skydive-project/skydive/packetinjector"
 	"github.com/skydive-project/skydive/rawsocket"

diff --git a/flow/probes/pcapsocket/pcapsocket.go b/flow/probes/pcapsocket/pcapsocket.go
@@ -27,6 +27,7 @@ import (
 	"github.com/skydive-project/skydive/flow"
 	"github.com/skydive-project/skydive/flow/probes"
 	"github.com/skydive-project/skydive/graffiti/graph"
+	"github.com/skydive-project/skydive/portallocator"
 	"github.com/skydive-project/skydive/probe"
 )
 
@@ -45,7 +46,7 @@ type ProbeHandler struct {
 	Ctx           probes.Context
 	addr          *net.TCPAddr
 	wg            sync.WaitGroup
-	portAllocator *common.PortAllocator
+	portAllocator *portallocator.PortAllocator
 }
 
 func (p *Probe) run() {
@@ -171,7 +172,7 @@ func NewProbe(ctx probes.Context, bundle *probe.Bundle) (probes.FlowProbeHandler
 		return nil, err
 	}
 
-	portAllocator, err := common.NewPortAllocator(minPort, maxPort)
+	portAllocator, err := portallocator.New(minPort, maxPort)
 	if err != nil {
 		return nil, err
 	}

diff --git a/netflow/agent.go b/netflow/agent.go
@@ -24,14 +24,15 @@ import (
 	"net"
 	"time"
 
-	"github.com/safchain/insanelock"
 	netflow "github.com/VerizonDigital/vflow/netflow/v5"
 	"github.com/google/gopacket/layers"
+	"github.com/safchain/insanelock"
 
 	"github.com/skydive-project/skydive/common"
 	"github.com/skydive-project/skydive/config"
 	"github.com/skydive-project/skydive/flow"
 	"github.com/skydive-project/skydive/logging"
+	"github.com/skydive-project/skydive/portallocator"
 )
 
 const (
@@ -57,7 +58,7 @@ type Agent struct {
 // AgentAllocator describes an NetFlow agent allocator to manage multiple NetFlow agent probe
 type AgentAllocator struct {
 	insanelock.RWMutex
-	portAllocator *common.PortAllocator
+	portAllocator *portallocator.PortAllocator
 	agents        []*Agent
 }
 
@@ -270,7 +271,7 @@ func NewAgentAllocator() (*AgentAllocator, error) {
 	min := config.GetInt("agent.flow.netflow.port_min")
 	max := config.GetInt("agent.flow.netflow.port_max")
 
-	portAllocator, err := common.NewPortAllocator(min, max)
+	portAllocator, err := portallocator.New(min, max)
 	if err != nil {
 		return nil, err
 	}

diff --git a/common/port_allocator.go → portallocator/port_allocator.go b/common/port_allocator.go → portallocator/port_allocator.go
@@ -15,7 +15,7 @@
  *
  */
 
-package common
+package portallocator
 
 import (
 	"errors"
@@ -76,8 +76,8 @@ func (p *PortAllocator) ReleaseAll() {
 	p.PortMap = make(map[int]bool)
 }
 
-// NewPortAllocator creates a new port allocator range
-func NewPortAllocator(min, max int) (*PortAllocator, error) {
+// New creates a new port allocator range
+func New(min, max int) (*PortAllocator, error) {
 	if min <= 0 || max < min {
 		return nil, ErrInvalidPortRange
 	}

diff --git a/sflow/agent.go b/sflow/agent.go
@@ -33,6 +33,7 @@ import (
 	"github.com/skydive-project/skydive/flow"
 	"github.com/skydive-project/skydive/graffiti/graph"
 	"github.com/skydive-project/skydive/logging"
+	"github.com/skydive-project/skydive/portallocator"
 )
 
 const (
@@ -61,7 +62,7 @@ type Agent struct {
 // AgentAllocator describes an SFlow agent allocator to manage multiple SFlow agent probe
 type AgentAllocator struct {
 	insanelock.RWMutex
-	portAllocator *common.PortAllocator
+	portAllocator *portallocator.PortAllocator
 	agents        []*Agent
 }
 
@@ -388,7 +389,7 @@ func NewAgentAllocator() (*AgentAllocator, error) {
 	min := config.GetInt("agent.flow.sflow.port_min")
 	max := config.GetInt("agent.flow.sflow.port_max")
 
-	portAllocator, err := common.NewPortAllocator(min, max)
+	portAllocator, err := portallocator.New(min, max)
 	if err != nil {
 		return nil, err
 	}