fixed options display problem

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

documentation/TODO

@@ -15,6 +15,12 @@
   - target says what type of instruction is viable
   - pool returns a random return address for that target
   - automatic opcode db synchronization
+- add module meta-info
+  - payloads
+    - calling convention (staged shell is incompat with ord stagers)
+	 - stack requirements
+	 - etc
+- exploit reloading
 
 X	- switch to x86 from ia32
 X	- exploit kick-off
@@ -69,11 +75,6 @@ X - fix route addition/removal in stdapi server dll (mib structure issue)
 X - fix interactive stream pool channels
 X - make migrate on server not open with PROCESS_ALL_ACCESS
 N - dupe input instance when passing to sessions
-- add module meta-info
-  - payloads
-    - calling convention (staged shell is incompat with ord stagers)
-	 - stack requirements
-	 - etc
 X - fix module loading order
 X   - problems with dllinject getting loaded after meterpreter due to dependencies
 X - fix default handle inheritance in meterp process execution

lib/msf/ui/console/command_dispatcher/core.rb

@@ -579,10 +579,19 @@ protected
 
 	def show_options(mod)
 		print("\n" + Serializer::ReadableText.dump_options(mod) + "\n")
-		
+	
+		# If it's an exploit and a payload is defined, create it and
+		# display the payload's options
 		if (mod.exploit? and mod.datastore['PAYLOAD'])
 			p = framework.modules.create(mod.datastore['PAYLOAD'])
 
+			if (!p)
+				print_error("Invalid payload defined: #{mod.datastore['PAYLOAD']}\n")
+				return
+			end
+			
+			p.share_datastore(mod.datastore)
+
 			if (p)
 				print("  Payload options:\n\n" + Serializer::ReadableText.dump_options(p) + "\n");
 			end

lib/rex/io/stream_server.rb

@@ -139,9 +139,11 @@ protected
 
 				on_client_connect(cli)
 			end
+		rescue SyntaxError
+			elog("Syntax error in stream server listener monitor: #{$!}")
+			rlog(ExceptionCallStack)
 		rescue
 			elog("Error in stream server listener monitor: #{$!}")
-			rlog(ExceptionCallStack)
 		end while true
 
 	end
@@ -161,9 +163,11 @@ protected
 			sd[0].each { |fd|
 				on_client_data(self.fd2cli[fd])
 			}
+		rescue SyntaxError
+			elog("Syntax error in stream server listener monitor: #{$!}")
+			rlog(ExceptionCallStack)
 		rescue
 			elog("Error in stream server client monitor: #{$!}")
-			rlog(ExceptionCallStack)
 		end while true
 	end