prefer Addrinfo over ipaddress gem

Author: busterb

Gemfile.lock

@@ -11,7 +11,6 @@ PATH
       bit-struct
       dnsruby
       filesize
-      ipaddress
       jsobfu
       json
       metasm
@@ -129,7 +128,6 @@ GEM
     fivemat (1.3.5)
     hashery (2.1.2)
     i18n (0.8.6)
-    ipaddress (0.8.3)
     jsobfu (0.4.2)
       rkelly-remix
     json (2.1.0)

lib/msf/core/auxiliary/udp_scanner.rb

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
 
-require 'ipaddress'
-
 module Msf
 
 ###
@@ -129,7 +127,8 @@ def scanner_send(data, ip, port)
     resend_count = 0
 
     begin
-      unless IPAddress(ip).multicast?
+      addrinfo = Addrinfo.ip(ip)
+      unless addrinfo.ipv4_multicast? || addrinfo.ipv6_multicast?
         sock = udp_socket(ip, port, bind_peer: true)
         sock.send(data, 0)
       else

metasploit-framework.gemspec

@@ -54,8 +54,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'backports'
   # Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb)
   spec.add_runtime_dependency 'bcrypt'
-  # Address manipulation (TODO: evaluate to replace rex-socket address handling)
-  spec.add_runtime_dependency 'ipaddress'
   # Needed for Javascript obfuscation
   spec.add_runtime_dependency 'jsobfu'
   # Needed for some admin modules (scrutinizer_add_user.rb)