ing

commons/pcap/pcap.go

@@ -2,6 +2,7 @@ package pcap
 
 import (
 	"sync"
+	"time"
 
 	"git.loafle.net/overflow/overflow_discovery/api/module/discovery/model"
 )
@@ -36,10 +37,13 @@ func ReleaseScanner(zone *model.Zone) {
 	defer mtx.Unlock()
 
 	if ps, ok := instances[zone.Network]; ok {
-		if ps.release() {
+		go func() {
-			ps.stop()
+			time.Sleep(2 * time.Second)
-			delete(instances, zone.Network)
+			if ps.release() {
-		}
+				ps.stop()
+				delete(instances, zone.Network)
+			}
+		}()
 	}
 }
 

commons/pcap/pcap_scan.go

@@ -197,6 +197,7 @@ func (ps *pCapScan) release() bool {
 	if 0 > ps.refCount {
 		ps.refCount = 0
 	}
+
 	return 0 == ps.refCount
 }
 
@@ -243,6 +244,7 @@ func handleReceive(ps *pCapScan) {
 			handlePacket(ps, packet)
 		case <-ps.stopChan:
 			ps.destroy()
+			return
 		}
 	}
 }

discovery/ipv4/host.go

@@ -15,17 +15,26 @@ import (
 )
 
 func ScanHost(zone *model.Zone, dh *model.DiscoveryHost, resultChan chan interface{}, errChan chan error, doneChan chan<- struct{}) {
+	defer func() {
+		doneChan <- struct{}{}
+	}()
+
 	ps, err := pcap.RetainScanner(zone)
 	if nil != err {
 		errChan <- fmt.Errorf("Discovery: Cannot retain pcap instance %v", err)
-		// doneChan <- struct{}{}
 		return
 	}
+
+	defer func() {
+		pcap.ReleaseScanner(zone)
+	}()
+
 	cr, err := cidr.NewCIDRRanger(zone.Network)
 	if nil != err {
 		errChan <- err
 		return
 	}
+
 	hostRanges, err := getTargetHostRange(dh, cr)
 	if nil != err {
 		errChan <- err
@@ -34,11 +43,7 @@ func ScanHost(zone *model.Zone, dh *model.DiscoveryHost, resultChan chan interfa
 
 	arpChan := ps.OpenARP()
 	defer func() {
-		if nil != ps {
+		ps.CloseARP(arpChan)
-			ps.CloseARP(arpChan)
-			pcap.ReleaseScanner(zone)
-		}
-		doneChan <- struct{}{}
 	}()
 
 	go func() {