Override to TCP when encountering UDP-unfriendly comms

lib/msf/base/sessions/meterpreter.rb

@@ -593,6 +593,10 @@ def create(param)
     sock
   end
 
+  def supports_udp?
+    true
+  end
+
   #
   # Get a string representation of the current session platform
   #

lib/msf/base/sessions/ssh_command_shell_bind.rb

@@ -287,6 +287,10 @@ def create(params)
       sock
     end
 
+    def supports_udp?
+      false
+    end
+
     def create_server_channel(params)
       msf_channel = nil
       mutex = Mutex.new

lib/msf/core/session/comm.rb

@@ -22,6 +22,13 @@ module Comm
   def create(param)
     raise NotImplementedError
   end
+
+  #
+  # Does the Comm support sending UDP messages?
+  #
+  def supports_udp?
+    raise NotImplementedError
+  end
 end
 
 end

lib/rex/proto/dns/resolver.rb

@@ -159,6 +159,9 @@ def send(argument, type = Dnsruby::Types::A, cls = Dnsruby::Classes::IN)
         if use_tcp? or !(proxies.nil? or proxies.empty?) # User requested TCP
           @logger.info "Sending #{packet_size} bytes using TCP due to tcp flag"
           method = :send_tcp
+        elsif !supports_udp?(nameservers)
+          @logger.info "Sending #{packet_size} bytes using TCP due to the presence of a non-UDP-compatible comm channel"
+          method = :send_tcp
         else # Finally use UDP
           @logger.info "Sending #{packet_size} bytes using UDP"
           method = :send_udp unless method == :send_tcp
@@ -334,7 +337,7 @@ def send_udp(packet,packet_data)
               socket = Rex::Socket::Udp.create(config)
             rescue
               @logger.warn "UDP Socket could not be established to #{ns}:#{@config[:port]}"
-              return nil
+              throw :next_ds
             end
             @logger.info "Contacting nameserver #{ns} port #{@config[:port]}"
             #socket.sendto(packet_data, ns.to_s, @config[:port].to_i, 0)
@@ -403,6 +406,17 @@ def query(name, type = Dnsruby::Types::A, cls = Dnsruby::Classes::IN)
       return send(name,type,cls)
 
     end
+
+    private
+
+    def supports_udp?(nameserver_results)
+      nameserver_results.each do |nameserver, socket_options|
+        comm = socket_options.fetch('Comm') { @config.fetch(:comm) { Rex::Socket::SwitchBoard.best_comm(ns) }}
+        next if comm.nil?
+        return false unless comm.supports_udp?
+      end
+      true
+    end
   end # Resolver
 
 end