Fix: Resetting packet forwarding only AFTER restore packets are sent.

evilsocket · Feb 26, 2016 · e6deb54 · e6deb54
1 parent 18b12de
commit e6deb54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/bettercap/network/packet_queue.rb b/lib/bettercap/network/packet_queue.rb
@@ -49,7 +49,7 @@ def wait_empty( timeout )
 
   # Notify the queue to stop and wait for every worker to finish.
   def stop
-    wait_empty( 60 )
+    wait_empty( 6000 )
     @running = false
     @nworkers.times { push(nil) }
     @workers.map(&:join)

diff --git a/lib/bettercap/spoofers/arp.rb b/lib/bettercap/spoofers/arp.rb
@@ -67,8 +67,6 @@ def stop
     raise 'ARP spoofer is not running' unless @running
 
     Logger.debug 'Stopping ARP spoofer ...'
-    Logger.debug "Resetting packet forwarding to #{@forwarding} ..."
-    @ctx.firewall.enable_forwarding( @forwarding )
 
     @running = false
     begin
@@ -86,6 +84,10 @@ def stop
         end
       end
     end
+
+    Logger.debug "Resetting packet forwarding to #{@forwarding} ..."
+
+    @ctx.firewall.enable_forwarding( @forwarding )
   end
 
   private