bettercap 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04fcfc9b8b34c69b44236a52f322bd0e9dc42e68
-  data.tar.gz: a37d61a2d587eedc1e4682ee4c885629db12bd86
+  metadata.gz: 214e440979cb074a4c28623b1f460d109b6ab387
+  data.tar.gz: 33ffe4a92b00400ec8b6ef6571f39eea61f2f391
 SHA512:
-  metadata.gz: 33c42e7fee3330128513900d7ad5bbb6058adae66177fd75516d164cdd18d78ca6d9cacf928b071dd16b1781ca9de93f90a58442911cf4aea0b6ad64fc5206b3
-  data.tar.gz: 77d9f295dcf9e390bfdaabbb20c972bdf2768b1edf4a443aaea0845b525c2d1f203ed68acc210b87ef59729873e3bd36cdb4ed03f1bd2f73cb7bc0f0426933f1
+  metadata.gz: 4f54113d707ce98a6d32dbd0449f6de4642f2bc4db864682d5a3e672c1ccb7daf8caa74cab9c1a6a3a10fb92efc8f3cffdca98e9c24298e8eaf374f43fefe21d
+  data.tar.gz: 237137662023bd41e07f8fd0ba5c7f408ccb76fe7037999a154873193cfd837f124abe7151bfa0442d6c529142b487f3d7d4a99f32fc816ec5444ec97770fe5f

data/lib/bettercap/discovery/agents/base.rb

@@ -35,7 +35,10 @@ class Base
         ip = ip.succ
       end
     else
-      unless skip_address?(@address)
+      if skip_address?(@address)
+        Logger.debug "Skipping #{@address} ..."
+      else
+        Logger.debug "Probing #{@address} ..."
         @ctx.packets.push( get_probe(@address) )
       end
     end
@@ -46,11 +49,20 @@ class Base
   # Return true if +ip+ must be skipped during discovery, otherwise false.
   def skip_address?(ip)
     # don't send probes to the gateway
-    ( ip == @ctx.gateway or \
-      # don't send probes to our device
-      ip == @local_ip or \
-      # don't stress endpoints we already discovered
-      !@ctx.find_target( ip.to_s, nil ).nil? )
+    if ip == @ctx.gateway
+      return true
+    # don't send probes to our device
+    elsif ip == @local_ip
+      return true
+    # don't stress endpoints we already discovered
+    else
+      target = @ctx.find_target( ip.to_s, nil )
+      # known target?
+      return false if target.nil?
+      # do we still need to get the mac for this target?
+      return ( target.mac.nil?? false : true )
+    end
+
   end
 
   # Each Discovery::Agent::Base derived class should implement this method.

data/lib/bettercap/version.rb

@@ -12,7 +12,7 @@ This project is released under the GPL 3 license.
 =end
 module BetterCap
   # Current version of bettercap.
-  VERSION = '1.3.9'
+  VERSION = '1.4.0'
   # Program banner.
   BANNER = File.read( File.dirname(__FILE__) + '/banner' ).gsub( '#VERSION#', "v#{VERSION}")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bettercap
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - Simone Margaritelli