Fixed some namespacing and method calling bugs

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

lib/msf/core/exploit/dialup.rb

@@ -34,17 +34,17 @@ module Exploit::Remote::Dialup
 		data_bits  = datastore['DATABITS'].to_i
 		stop_bits  = datastore['STOPBITS'].to_i
 		parity     = case datastore['PARITY']
-			when 'Even' : Modem::EVEN
-			when 'Odd'  : Modem::ODD
-			when 'Mark' : Modem::MARK
-			when 'Space': Modem::SPACE
-			else          Modem::NONE
+			when 'Even' : Telephony::Modem::EVEN
+			when 'Odd'  : Telephony::Modem::ODD
+			when 'Mark' : Telephony::Modem::MARK
+			when 'Space': Telephony::Modem::SPACE
+			else          Telephony::Modem::NONE
 		end
 		flowcontrol  = case datastore['FLOWCONTROL']
-			when 'Hardware' : Modem::HARD
-			when 'Software' : Modem::SOFT
-			when 'Both'     : Modem::HARD | Modem::SOFT
-			else              Modem::NONE
+			when 'Hardware' : Telephony::Modem::HARD
+			when 'Software' : Telephony::Modem::SOFT
+			when 'Both'     : Telephony::Modem::HARD | Telephony::Modem::SOFT
+			else              Telephony::Modem::NONE
 		end
 		initstring   = datastore['INITSTRING']
 		dialprefix   = datastore['DIALPREFIX']

lib/telephony/modem.rb

@@ -45,8 +45,8 @@ class Modem
 		end
 	end
 
-	# This provides pass-through support for the SerialPort 
-	def method_missing(meth, *args); self.sp(meth, *args); end
+	# This provides pass-through method support for the SerialPort object
+	def method_missing(meth, *args); self.sp.send(meth, *args); end
 
 	def put_command(command, timeout)
 		switchback = false