fixed bug preventing proper termination

cmd/amass/enum.go

@@ -488,6 +488,8 @@ loop:
 			next := time.Now().Sub(started) * 5
 			if next < 3*time.Second {
 				next = 3 * time.Second
+			} else if next > 10*time.Second {
+				next = 10 * time.Second
 			}
 			t.Reset(next)
 		}
@@ -511,7 +513,7 @@ func signalHandler(e *enum.Enumeration) {
 	// Signal the enumeration to finish
 	e.Done()
 	// Wait for output operations to complete
-	time.Sleep(5 * time.Second)
+	time.Sleep(20 * time.Second)
 	os.Exit(1)
 }
 

enum/enum.go

@@ -280,7 +280,7 @@ func (e *Enumeration) Start() error {
 	 * discovered names that will train the machine learning system and to
 	 * release the similar names generated by the algorithm
 	 */
-	if !e.Config.Passive && e.Config.Alterations {
+	if false && !e.Config.Passive && e.Config.Alterations {
 		e.guessMgr = NewGuessManager(e)
 		defer e.guessMgr.Stop()
 		e.managers = append(e.managers, e.guessMgr)
@@ -344,7 +344,7 @@ loop:
 				if inactive {
 					// End the enumeration!
 					e.Done()
-					continue loop
+					break loop
 				}
 
 				e.incNumSeqZeros()
@@ -404,15 +404,7 @@ func (e *Enumeration) requiredNumberOfNames(numsec int) int {
 	}
 
 	max := e.Config.MaxDNSQueries * numsec
-	// Acquire the number of DNS queries already in the queue
-	remaining := e.dnsNamesRemaining()
-	if remaining > 0 {
-		required = max - remaining
-	} else {
-		// If the queue is empty, then encourage additional activity
-		required = max
-	}
-
+	required = max - e.dnsNamesRemaining()
 	// Ensure a minimum value of one
 	if required <= 0 {
 		required = 1