update miner

Author: Alban Siffer

miner/config.go

@@ -88,7 +88,7 @@ func SetPromiscuous(b bool) error {
 // SetSnapshotLen sets the maximum size of packets which are captured
 func SetSnapshotLen(sl int32) error {
 	if sl <= 0 {
-		return fmt.Errorf("Snapshot length must be strictly positive")
+		return fmt.Errorf("snapshot length must be strictly positive")
 	}
 	snapshotLen = sl
 	minerLogger.Debug().Msgf("Snapshot length set to %d", sl)
@@ -119,7 +119,7 @@ func SetDevice(dev string) error {
 			device = dev
 			iface = false
 		} else {
-			err := fmt.Errorf("Unknown device %s", dev)
+			err := fmt.Errorf("unknown device %s", dev)
 			minerLogger.Error().Msg(err.Error())
 			return err
 		}

miner/dispatcher.go

@@ -136,7 +136,7 @@ func (d *Dispatcher) buildCounterList() {
 func (d *Dispatcher) load(name string) error {
 	ctr, exists := counters.AvailableCounters[name]
 	if !exists {
-		return fmt.Errorf("The counter %s does not exists", name)
+		return fmt.Errorf("the counter %s does not exists", name)
 	}
 	// ensure the counter is zero
 	ctr.Reset()
@@ -148,7 +148,7 @@ func (d *Dispatcher) load(name string) error {
 func (d *Dispatcher) unload(name string) error {
 	_, exists := counters.AvailableCounters[name]
 	if !exists {
-		return fmt.Errorf("The counter %s does not exists", name)
+		return fmt.Errorf("the counter %s does not exists", name)
 	}
 
 	delete(d.counters, name)

miner/miner.go

@@ -11,7 +11,6 @@ import (
 	"os"
 	"path"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/asiffer/netspot/miner/counters"
@@ -42,7 +41,6 @@ var (
 
 // Storing/Accessing the counters
 var (
-	mux, valmux          sync.RWMutex            // Locker for the counter map access
 	internalEventChannel = make(EventChannel, 1) // to receive events
 	// externalDataChannel  = make(DataChannel, 1)  // to send data to the analyzer
 )
@@ -57,14 +55,6 @@ var (
 	timeout          time.Duration // time to wait if nothing happens
 )
 
-// Packet sniffing/parsing
-var (
-	handle *pcap.Handle
-	// ringHandle *pfring.Ring
-	parser *gopacket.DecodingLayerParser
-	err    error
-)
-
 // Dispatcher
 var dispatcher = NewDispatcher()
 
@@ -121,7 +111,7 @@ func InitLogger() {
 func Zero() error {
 	if IsSniffing() {
 		minerLogger.Error().Msg("Cannot reload, sniffing in progress")
-		return errors.New("Cannot reload, sniffing in progress")
+		return errors.New("cannot reload, sniffing in progress")
 	}
 
 	reset()
@@ -323,11 +313,11 @@ func sniff(period time.Duration, data DataChannel) {
 // channel where counters are sent
 func Start(period time.Duration) (DataChannel, error) {
 	if IsSniffing() {
-		return nil, fmt.Errorf("Already sniffing")
+		return nil, fmt.Errorf("already sniffing")
 	}
 	ctr := dispatcher.loadedCounters()
 	if len(ctr) == 0 {
-		return nil, fmt.Errorf("No counters loaded")
+		return nil, fmt.Errorf("no counters loaded")
 	}
 
 	minerLogger.Info().Msgf("Start sniffing %s", device)
@@ -343,7 +333,7 @@ func Start(period time.Duration) (DataChannel, error) {
 	for !IsSniffing() {
 		select {
 		case <-internalEventChannel: // error case
-			return nil, fmt.Errorf("Something bad happened")
+			return nil, fmt.Errorf("something bad happened")
 		default:
 			// pass
 		}
@@ -391,9 +381,3 @@ func fileExists(name string) bool {
 	}
 	return true
 }
-
-// Main ===================================================================== //
-// ========================================================================== //
-// ========================================================================== //
-
-func main() {}

miner/offline.go

@@ -27,7 +27,7 @@ func sniffOffline(packetChan chan gopacket.Packet,
 	for {
 		select {
 		// manage events
-		case e, _ := <-internalEventChannel:
+		case e := <-internalEventChannel:
 			switch e {
 			case STOP:
 				// the counters are stopped

miner/online.go

@@ -69,7 +69,8 @@ func sniffOnline(packetChan chan gopacket.Packet,
 	data DataChannel) error {
 
 	// set the flush tick
-	tick := time.Tick(period)
+	tick := time.NewTicker(period)
+	// tick := time.Tick(period)
 
 	// now we are sniffing!
 	minerLogger.Debug().Msgf("Sniffing interface...")
@@ -81,12 +82,12 @@ func sniffOnline(packetChan chan gopacket.Packet,
 	for {
 		select {
 		// periodic flush
-		case st := <-tick:
+		case st := <-tick.C:
 			sourceTime.Set(st)
 			dispatcher.terminate()
 			data <- dispatcher.flushAll()
 		// manage events
-		case e, _ := <-internalEventChannel:
+		case e := <-internalEventChannel:
 			switch e {
 			case STOP:
 				// the counters are stopped