ing

discovery/discoverer.go

@@ -82,10 +82,6 @@ func (d *ofDiscoverer) Message() <-chan types.DiscoveryMessage {
 }
 
 func (d *ofDiscoverer) SendMessage(discoveryRequest types.DiscoveryRequest, messageType types.DiscoveryMessageType, datas ...interface{}) {
-	if discoveryRequest.(*ofDiscoveryRequest).canceled.Load().(bool) {
-		return
-	}
-
 	d.messageChan <- types.MakeDiscoveryMessage(discoveryRequest, messageType, datas...)
 }
 
@@ -170,7 +166,6 @@ LOOP:
 			case <-time.After(time.Millisecond * 500):
 			}
 			d.SendMessage(req, types.DiscoveryMessageTypeStop, omu.Now())
-			s.DiscoveryRequest().(*ofDiscoveryRequest).canceled.Store(true)
 
 			if _, ok := d.processingSessions.Load(req.RequestID()); ok {
 				d.processingSessions.Delete(req.RequestID())

discovery/discovery-request.go

@@ -2,7 +2,6 @@ package discovery
 
 import (
 	"sync"
-	"sync/atomic"
 
 	"git.loafle.net/overflow_scanner/probe/discovery/types"
 	uuid "github.com/satori/go.uuid"
@@ -14,8 +13,6 @@ type ofDiscoveryRequest struct {
 	requestType types.DiscoveryRequestType
 	params      []interface{}
 
-	canceled atomic.Value
-
 	dequeue chan bool
 	timeout bool
 }
@@ -55,7 +52,6 @@ func retainDiscoveryRequest(requesterID string, requestType types.DiscoveryReque
 	dr.requesterID = requesterID
 	dr.requestType = requestType
 	dr.params = params
-	dr.canceled.Store(false)
 	dr.dequeue = make(chan bool, 1)
 	dr.timeout = false