Accept IPv6 addresses in the return if getaddress

lib/msf/core/db.rb

@@ -1490,7 +1490,7 @@ class DBManager
 			end
 
 			# Force addr to be the address and not hostname
-			addr = Rex::Socket.getaddress(addr)
+			addr = Rex::Socket.getaddress(addr, true)
 		end
 
 		ret = {}

lib/msf/core/option_container.rb

@@ -320,7 +320,7 @@ class OptAddress < OptBase
 
 		if (value != nil and value.empty? == false)
 			begin
-				::Rex::Socket.getaddress(value)
+				::Rex::Socket.getaddress(value, true)
 			rescue
 				return false
 			end
@@ -351,8 +351,7 @@ class OptAddressRange < OptBase
 			ret = ''
 			count.times {
 				ret << " " if not ret.empty?
-				ip = "%u.%u.%u.%u" % [1+rand(0xfe),1+rand(0xfe),1+rand(0xfe),1+rand(0xfe)]
-				ret << ip
+				ret << [ rand(0x100000000) ].pack("N").unpack("C*").join(".")
 			}
 			return ret
 		end