Wrap the modulation setting as well

git-svn-id: file:///home/svn/framework3/trunk@5768 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/core/exploit/lorcon.rb

@@ -35,7 +35,7 @@ module Exploit::Lorcon
 				OptString.new('DRIVER', [true, 'The name of the wireless driver for lorcon', default_driver]),
 				OptInt.new('CHANNEL', [true, 'The default channel number', 11]),
 				OptInt.new('TXRATE', [true, 'The injected transmit rate', 2]),
-				OptEnum.new('TXMOD', [true, 'The injected modulation type', 'DEFAULT', %w{DEFAULT FHSS DSSS OFDM TURBO MIMO MIMOGF}])
+				OptEnum.new('TXMOD', [true, 'The injected modulation type', 'DSSS', %w{DEFAULT FHSS DSSS OFDM TURBO MIMO MIMOGF}])
 			], Msf::Exploit::Lorcon
 		)
 
@@ -80,12 +80,20 @@ module Exploit::Lorcon
 		# Configure the card for reliable injection
 		self.wifi.fmode      = "INJECT"
 		self.wifi.channel    = (datastore['CHANNEL'] || 11).to_i
-		self.wifi.modulation = datastore['TXMOD']
 		
+
+		# Configure modulation
+		begin
+			self.wifi.modulation = datastore['TXMOD']
+		rescue ::ArgumentError => e
+			print_status("Warning: #{e}")
+		end
+				
+		# Configure the transmission rate
 		begin
 			self.wifi.txrate     = datastore['TXRATE'].to_i if datastore['TXRATE']
 		rescue ::ArgumentError => e
-			print_status("Error setting TXRATE: #{e}")
+			print_status("Warning: #{e}")
 		end
 
 		self.wifi