Remove xmlrpc support in this branch (only msgpack is supported)

msfrpc

@@ -37,7 +37,7 @@ opts = {
 	'User' => 'msf',
 	'SSL'  => true,
 	'ServerPort' => 55553,
-	'Type' => 'Xml'
+	'Type' => 'Msg'
 }
 
 # Parse command line arguments.
@@ -53,8 +53,6 @@ arguments.parse(ARGV) { |opt, idx, val|
 			opts['User'] = val
 		when '-P'
 			opts['Pass'] = val
-		when '-t'
-			opts['Type'] = (val =~ /xml/i) ? 'XML' : 'Msg'
 		when "-h"
 			print("\nUsage: #{File.basename(__FILE__)} <options>\n" +	arguments.usage)
 			exit
@@ -76,11 +74,7 @@ end
 
 $0 = "msfrpc"
 
-if opts['Type'] == 'Msg'
-	require 'msf/core/rpc/v10/client'
-else
-	require 'msf/core/rpc/client'
-end
+require 'msf/core/rpc/v10/client'
 require 'rex/ui'
 
 rpc = Msf::RPC::Client.new(

msfrpcd

@@ -28,7 +28,6 @@ arguments = Rex::Parser::Arguments.new(
 	"-p" => [ true,  "Bind to this port instead of 55553"                   ],
 	"-U" => [ true,  "Specify the username to access msfrpcd"               ],
 	"-P" => [ true,  "Specify the password to access msfrpcd"               ],
-	"-t" => [ true,  "Server type, [Basic|Web|Msg]"                         ],
 	"-u" => [ true,  "URI for Web server"                                   ],
 	"-S" => [ false, "Disable SSL on the RPC socket"                     ],
 	"-f" => [ false, "Run the daemon in the foreground"                     ],
@@ -40,7 +39,7 @@ opts = {
 	'SSL'             => true,
 	'ServerHost'      => '0.0.0.0',
 	'ServerPort'      => 55553,
-	'ServerType'      => 'Basic'
+	'ServerType'      => 'Msg'
 }
 
 foreground = false
@@ -62,8 +61,6 @@ arguments.parse(ARGV) { |opt, idx, val|
 			opts['Pass'] = val
 		when "-f"
 			foreground = true
-		when "-t"
-			opts['ServerType'] = val
 		when "-u"
 			opts['URI'] = val
 		when "-n"
@@ -81,8 +78,7 @@ end
 
 $0 = "msfrpcd"
 
-rpctype = 'XML'
-rpctype = 'MSG' if opts['ServerType'].downcase == 'msg'
+rpctype = 'MSG'
 
 $stderr.puts "[*] #{rpctype}RPC starting on #{opts['ServerHost']}:#{opts['ServerPort']} (#{opts['SSL'] ? "SSL" : "NO SSL"}):#{opts['ServerType']}..."