From ec3a0a108d75f322fc4efcb2c19559ab3c24371d Mon Sep 17 00:00:00 2001
From: Adam Cammack <adam_cammack@rapid7.com>
Date: Tue, 22 Mar 2016 19:25:51 -0500
Subject: [PATCH] Change OptPort to inherit from OptInt

Fixes the normalize and validate methods.
---
 lib/msf/core/opt_port.rb | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/lib/msf/core/opt_port.rb b/lib/msf/core/opt_port.rb
index 295ae04538..c24d180a1e 100644
--- a/lib/msf/core/opt_port.rb
+++ b/lib/msf/core/opt_port.rb
@@ -7,24 +7,13 @@ module Msf
 # Network port option.
 #
 ###
-class OptPort < OptBase
+class OptPort < OptInt
   def type
     return 'port'
   end
 
-  def normalize(value)
-    value.to_i
-  end
-
   def valid?(value)
-    return false if empty_required_value?(value)
-
-    if ((value != nil and value.to_s.empty? == false) and
-        ((value.to_s.match(/^\d+$/) == nil or value.to_i < 0 or value.to_i > 65535)))
-      return false
-    end
-
-    return super
+    super && normalize(value) <= 65535 && normalize(value) > 0
   end
 end