From 31ba95b918889e7fa1ce00266e61bfa14fe7e4d9 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 18 Dec 2014 00:22:41 +0000
Subject: [PATCH] Don't override port.protocol in comm.lua; socket.connect
 already defaults to tcp

---
 nselib/comm.lua | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/nselib/comm.lua b/nselib/comm.lua
index ea9746565..517a7f201 100644
--- a/nselib/comm.lua
+++ b/nselib/comm.lua
@@ -56,19 +56,6 @@ local function get_timeouts(host, opts)
   return connect_timeout, request_timeout
 end
 
--- Makes sure that opts exists and the default proto is there
-local initopts = function(opts)
-  if not opts then
-    opts = {}
-  end
-
-  if not opts.proto then
-    opts.proto = "tcp"
-  end
-
-  return opts
-end
-
 -- Sets up the socket and connects to host:port
 local setup_connect = function(host, port, opts)
   local sock = nmap.new_socket()
@@ -117,7 +104,7 @@ end
 -- @return Status (true or false).
 -- @return Data (if status is true) or error string (if status is false).
 get_banner = function(host, port, opts)
-  opts = initopts(opts)
+  opts = opts or {}
   opts.recv_before = true
   local socket, nothing, correct, banner = tryssl(host, port, "", opts)
   if socket then
@@ -140,7 +127,7 @@ end
 -- @return Status (true or false).
 -- @return Data (if status is true) or error string (if status is false).
 exchange = function(host, port, data, opts)
-  opts = initopts(opts)
+  opts = opts or {}
 
   local status, sock = setup_connect(host, port, opts)
   local ret