Fixes for network_interface PR rapid7#2085

Implementing the suggestions from @limhoff-r7.

See rapid7#2085

FixRM rapid7#8023
FixRM rapid7#7943

Author: Tod Beardsley

Gemfile

@@ -23,7 +23,7 @@ group :db do
 end
 
 group :pcap do
-  gem 'network_interface'
+  gem 'network_interface', '~> 0.0.1'
 	# For sniffer and raw socket modules
 	gem 'pcaprub'
 end

Gemfile.lock

@@ -69,7 +69,7 @@ DEPENDENCIES
   json
   metasploit_data_models (~> 0.16.1)
   msgpack
-  network_interface
+  network_interface (~> 0.0.1)
   nokogiri
   packetfu (= 1.1.8)
   pcaprub

lib/msf/core/exploit/capture.rb

@@ -64,17 +64,17 @@ def initialize(info = {})
 			end
 
 			def stats_recv(pcap=self.capture)
-				return(0) if not pcap
+				return(0) unless pcap
 				pcap.stats['recv']
 			end
 
 			def stats_drop(pcap=self.capture)
-				return(0) if not pcap
+				return(0) unless pcap
 				pcap.stats['drop']
 			end
 
 			def stats_ifdrop(pcap=self.capture)
-				return(0) if not pcap
+				return(0) unless pcap
 				pcap.stats['ifdrop']
 			end
 
@@ -133,7 +133,7 @@ def open_pcap(opts={})
 			end
 
 			def close_pcap
-				return if not self.capture
+				return unless self.capture
 				self.capture     = nil
 				self.arp_capture = nil
 				GC.start()
@@ -147,7 +147,7 @@ def capture_extract_ies(raw)
 
 				while (idx < raw.length)
 					len = raw[idx+1]
-					return set if not len
+					return set unless len
 					set[raw[idx]] ||= []
 					set[raw[idx]].push(raw[idx + 2, len])
 					idx += len + 2
@@ -161,7 +161,7 @@ def capture_extract_ies(raw)
 			# signal handling of Ruby 1.9
 			#
 			def each_packet
-				return if not capture
+				return unless capture
 				begin
 					@capture_count = 0
 					reader         = framework.threads.spawn("PcapReceiver", false) do
@@ -218,7 +218,7 @@ def inject_eth(args={})
 
 			def inject_pcap(pcap_file, filter=nil, delay = 0, pcap=self.capture)
 				check_pcaprub_loaded
-				if not pcap
+				unless pcap
 					raise RuntimeError, "Could not access the capture process (remember to open_pcap first!)"
 				end
 
@@ -234,7 +234,7 @@ def inject_pcap(pcap_file, filter=nil, delay = 0, pcap=self.capture)
 				capture_file.setfilter(filter) if filter
 				while (pkt = capture_file.next) do
 					pcap.inject(pkt)
-					Kernel.select(nil, nil, nil, (delay * 1.0)/1000)
+					Rex.sleep((delay * 1.0)/1000)
 				end
 				GC.start
 			end
@@ -283,7 +283,7 @@ def inject_reply(proto=:udp, pcap=self.capture)
 			# UDP packet using the regular socket to learn the source host's
 			# and gateway's mac addresses.
 			def lookup_eth(addr=nil, iface=nil)
-				raise RuntimeError, "Could not access the capture process." if not self.arp_capture
+				raise RuntimeError, "Could not access the capture process." unless self.arp_capture
 
 				self.arp_cache ||= {}
 				self.dst_cache ||= {}
@@ -336,7 +336,7 @@ def arp(target_ip=nil)
 				return self.arp_cache[target_ip] if self.arp_cache[target_ip]
 				return self.arp_cache[:gateway] unless should_arp? target_ip
 				source_ip = Rex::Socket.source_address(target_ip)
-				raise RuntimeError, "Could not access the capture process." if not self.arp_capture
+				raise RuntimeError, "Could not access the capture process." unless self.arp_capture
 				p = arp_packet(target_ip, source_ip)
 				inject_eth(:eth_type  => 0x0806,
 					:payload   => p,
@@ -515,7 +515,7 @@ def get_ipv4_broadcast(dev, num=0)
 			def get_ipv6_addr_count(dev)
 				check_pcaprub_loaded
 				dev = get_interface_guid(dev)
-				raise RuntimeError, "IPv6 information is not available on this platform" if not ::NetworkInterface.const_defined?(:AF_INET6)
+				raise RuntimeError, "IPv6 information is not available on this platform" unless ::NetworkInterface.const_defined?(:AF_INET6)
 				addrs = NetworkInterface.addresses(dev)
 				raise RuntimeError, "Interface #{dev} do not exists" if !addrs
 				addrs[NetworkInterface::AF_INET6].length
@@ -525,7 +525,7 @@ def get_ipv6_addr_count(dev)
 			def get_ipv6_addr(dev, num=0)
 				check_pcaprub_loaded
 				dev = get_interface_guid(dev)
-				raise RuntimeError, "IPv6 information is not available on this platform" if not ::NetworkInterface.const_defined?(:AF_INET6)
+				raise RuntimeError, "IPv6 information is not available on this platform" unless ::NetworkInterface.const_defined?(:AF_INET6)
 				addrs = NetworkInterface.addresses(dev)
 				raise RuntimeError, "Interface #{dev} do not exists" if !addrs
 				raise RuntimeError, "Interface #{dev} do not have an ipv6 address at position #{num}" if addrs[NetworkInterface::AF_INET6].length < num + 1
@@ -536,7 +536,7 @@ def get_ipv6_addr(dev, num=0)
 			def get_ipv6_netmask(dev, num=0)
 				check_pcaprub_loaded
 				dev = get_interface_guid(dev)
-				raise RuntimeError, "IPv6 information is not available on this platform" if not ::NetworkInterface.const_defined?(:AF_INET6)
+				raise RuntimeError, "IPv6 information is not available on this platform" unless ::NetworkInterface.const_defined?(:AF_INET6)
 				addrs = NetworkInterface.addresses(dev)
 				raise RuntimeError, "Interface #{dev} do not exists" if !addrs
 				raise RuntimeError, "Interface #{dev} do not have an ipv6 address at position #{num}" if addrs[NetworkInterface::AF_INET6].length < num + 1