Use a const instead of hardcoding "tcp" everywhere

Author: egypt

lib/msf/core/db_manager.rb

@@ -23,6 +23,10 @@
 class Msf::DBManager
   extend Metasploit::Framework::Require
 
+  # Default proto for making new `Mdm::Service`s. This should probably be a
+  # const on `Mdm::Service`
+  DEFAULT_SERVICE_PROTO = "tcp"
+
   autoload :Adapter, 'msf/core/db_manager/adapter'
   autoload :Client, 'msf/core/db_manager/client'
   autoload :Connection, 'msf/core/db_manager/connection'

lib/msf/core/db_manager/exploit_attempt.rb

@@ -38,7 +38,7 @@ def report_exploit_failure(opts)
 
     wspace = opts[:workspace] || workspace
     port   = opts[:port]
-    prot   = opts[:proto] || "tcp"
+    prot   = opts[:proto] || Msf::DBManager::DEFAULT_SERVICE_PROTO
     svc    = opts[:service]
 
     # Look up the service as appropriate
@@ -75,14 +75,14 @@ def report_exploit_success(opts)
 
     wspace = opts[:workspace] || workspace
     port   = opts[:port]
-    prot   = opts[:proto] || "tcp"
+    prot   = opts[:proto] || Msf::DBManager::DEFAULT_SERVICE_PROTO
     svc    = opts[:service]
 
     # Look up or generate the service as appropriate
     if port and svc.nil?
       # it is rude to modify arguments in place
       opts = opts.dup
-      opts[:proto] ||= "tcp"
+      opts[:proto] ||= Msf::DBManager::DEFAULT_SERVICE_PROTO
       opts[:service] = report_service(
         workspace: wspace, host: host, port: port, proto: prot
       )
@@ -168,7 +168,7 @@ def do_report_failure_or_success(opts)
 
       if port and svc.nil?
         attempt_info[:port]  = port
-        attempt_info[:proto] = prot || "tcp"
+        attempt_info[:proto] = prot || Msf::DBManager::DEFAULT_SERVICE_PROTO
       end
 
       host.exploit_attempts.create(attempt_info)

lib/msf/core/db_manager/service.rb

@@ -85,7 +85,7 @@ def report_service(opts)
     end
 =end
 
-    proto = opts[:proto] || 'tcp'
+    proto = opts[:proto] || Msf::DBManager::DEFAULT_SERVICE_PROTO
 
     service = host.services.where(port: opts[:port].to_i, proto: proto).first_or_initialize
     opts.each { |k,v|
@@ -126,4 +126,4 @@ def services(wspace = workspace, only_up = false, proto = nil, addresses = nil,
     wspace.services.includes(:host).where(conditions).order("hosts.address, port")
   }
   end
-end
+end