librex 0.0.65 → 0.0.66

data/lib/rex/proto/http/server.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/socket'
 require 'rex/proto/http'
 require 'rex/proto/http/handler'

data/lib/rex/proto/http/server.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -18,7 +19,7 @@ class Rex::Proto::Http::Server::UnitTest < Test::Unit::TestCase
 			s   = start_srv
 			c   = CliKlass.new(ListenHost, ListenPort)
 
-			1.upto(10) { 
+			1.upto(10) {
 				req = c.request_raw('uri' => '/')
 				res = c.send_recv(req)
 				assert_not_nil(res)
@@ -34,16 +35,16 @@ class Rex::Proto::Http::Server::UnitTest < Test::Unit::TestCase
 			s   = start_srv
 			c   = CliKlass.new(ListenHost, ListenPort)
 
-			s.add_resource('/foo', 
+			s.add_resource('/foo',
 				'Proc' => Proc.new { |cli, req|
 					resp = Rex::Proto::Http::Response::OK.new
 
 					resp.body = "Chickens everywhere"
-				
+
 					cli.send_response(resp)
 				})
 
-			1.upto(10) { 
+			1.upto(10) {
 				req = c.request_raw('uri' => '/foo')
 				res = c.send_recv(req)
 				assert_not_nil(res)
@@ -76,4 +77,4 @@ protected
 
 attr_accessor :srv
 
-end
+end

data/lib/rex/proto/iax2.rb

@@ -1 +1,2 @@
+# -*- coding: binary -*-
 require 'rex/proto/iax2/client'

data/lib/rex/proto/iax2/call.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module IAX2
@@ -14,33 +15,33 @@ class Call
 	attr_accessor :audio_buff
 	attr_accessor :time_limit
 	attr_accessor :busy
-	
+
 	attr_accessor :caller_name
 	attr_accessor :caller_number
 	attr_accessor :dtmf
-	
-	
+
+
 	def initialize(client, src_id)
 		self.client = client
 		self.scall  = src_id
-		self.dcall  = 0 
+		self.dcall  = 0
 		self.iseq   = 0
 		self.oseq   = 0
 		self.state  = nil
-		
+
 		self.itime  = ::Time.now
-		self.queue  = ::Queue.new 
-		
+		self.queue  = ::Queue.new
+
 		self.audio_buff = []
-		
+
 		self.busy = false
 		self.dtmf = ''
 	end
-	
-	
+
+
 	def dprint(msg)
 		self.client.dprint(msg)
-	end 
+	end
 
 	def wait_for(*stypes)
 		begin
@@ -55,46 +56,46 @@ class Call
 			return nil
 		end
 	end
-	
+
 	# Register with the IAX endpoint
 	def register
 		self.client.send_regreq(self)
 		res = wait_for( IAX_SUBTYPE_REGAUTH, IAX_SUBTYPE_REGREJ )
 		return if not res
 
-		if res[1] == IAX_SUBTYPE_REGREJ 
+		if res[1] == IAX_SUBTYPE_REGREJ
 			reason = res[2][IAX_IE_REGREJ_CAUSE] || "Unknown Reason"
 			dprint("REGREJ: #{reason}")
 			# Acknowledge the REGREJ
-			self.client.send_ack(self)			
+			self.client.send_ack(self)
 			return
-		end 
+		end
 
 		chall = nil
 		if res[2][14] == "\x00\x03" and res[2][IAX_IE_CHALLENGE_DATA]
 			self.dcall = res[0][0]
 			chall = res[2][IAX_IE_CHALLENGE_DATA]
 		end
-		
+
 		self.client.send_regreq_chall_response(self, chall)
 		res = wait_for( IAX_SUBTYPE_REGACK, IAX_SUBTYPE_REGREJ )
 		return if not res
 
-		if res[1] == IAX_SUBTYPE_REGREJ 
+		if res[1] == IAX_SUBTYPE_REGREJ
 			reason = res[2][IAX_IE_REGREJ_CAUSE] || "Unknown Reason"
 			dprint("REGREJ: #{reason}")
 			return
-		end 
-		
+		end
+
 		if res[2][IAX_IE_APPARENT_ADDR]
 			r_fam, r_port, r_addr = res[2][IAX_IE_APPARENT_ADDR].unpack('nnA4')
 			r_addr = r_addr.unpack("C*").map{|x| x.to_s }.join(".")
 			dprint("REGACK: Registered from address #{r_addr}:#{r_port}")
 		end
-		
+
 		# Acknowledge the REGACK
 		self.client.send_ack(self)
-		
+
 		self.state = :registered
 
 		true
@@ -130,7 +131,7 @@ class Call
 		self.state = :hangup
 		true
 	end
-	
+
 	def ring_time
 		(self.ring_finish || Time.now).to_i - self.ring_start.to_i
 	end
@@ -149,7 +150,7 @@ class Call
 		end
 		res
 	end
-	
+
 	# Handling incoming control packets
 	# TODO: Enforce sequence order to prevent duplicates from breaking our state
 	def handle_control(pkt)
@@ -172,7 +173,7 @@ class Call
 
 		# Increment the received sequence number
 		self.iseq = (self.iseq + 1) & 0xff
-					
+
 		if self.state == :hangup
 			dprint("Packet received after hangup, replying with invalid")
 			self.client.send_invalid(self)
@@ -186,49 +187,49 @@ class Call
 		when IAX_TYPE_DTMF_BEGIN
 			self.dprint("DTMF BEG: #{pkt[11,1]}")
 			self.dtmf << pkt[11,1]
-			
+
 		when IAX_TYPE_DTMF_END
 			self.dprint("DTMF END: #{pkt[11,1]}")
-			
+
 		when IAX_TYPE_CONTROL
 			case stype
 			when IAX_CTRL_HANGUP
 				dprint("HANGUP")
 				self.client.send_ack(self)
 				self.state = :hangup
-				
+
 			when IAX_CTRL_RINGING
 				dprint("RINGING")
 				self.client.send_ack(self)
-				
+
 			when IAX_CTRL_BUSY
 				dprint("BUSY")
-				self.busy  = true 
+				self.busy  = true
 				self.state = :hangup
 				self.client.send_ack(self)
-				
+
 			when IAX_CTRL_ANSWER
 				dprint("ANSWER")
 				if self.state == :ringing
 					self.state = :answered
 					self.ring_finish = ::Time.now.to_i
-				end 
+				end
 				self.client.send_ack(self)
-			
+
 			when IAX_CTRL_PROGRESS
 				dprint("PROGRESS")
 
 			when IAX_CTRL_PROCEED
 				dprint("PROCEED")
-												
+
 			when 255
 				dprint("STOP SOUNDS")
 			end
-			# Acknowledge all control packets	
+			# Acknowledge all control packets
 			# self.client.send_ack(self)
-		
+
 		when IAX_TYPE_IAX
-				
+
 			dprint( ["RECV", phdr, stype, info].inspect )
 			case stype
 			when IAX_SUBTYPE_HANGUP
@@ -240,7 +241,7 @@ class Call
 			when IAX_SUBTYPE_ACK
 				# Nothing to do here
 			when IAX_SUBTYPE_PING
-				# Pongs echo the timestamp 
+				# Pongs echo the timestamp
 				self.client.send_pong(self, tstamp)
 			when IAX_SUBTYPE_PONG
 				self.client.send_ack(self)
@@ -248,7 +249,7 @@ class Call
 				dprint( ["RECV-QUEUE", phdr, stype, info].inspect )
 				self.queue.push( [phdr, stype, info ] )
 			end
-			
+
 		when IAX_TYPE_VOICE
 			v_codec = stype
 			if self.state == :answered
@@ -261,18 +262,18 @@ class Call
 		end
 	end
 
-	
+
 	# Encoded audio from the client
 	def handle_audio(pkt)
 		# Ignore audio received before the call is answered (ring ring)
 		return if self.state != :answered
-		
+
 		# Extract the data from the packet (full or mini)
 		data = audio_packet_data(pkt)
 
 		# Decode the data into linear PCM frames
 		buff = decode_audio_frame(data)
-		
+
 		# Call the caller-provided hook if its exists
 		if self.audio_hook
 			self.audio_buff(buff)
@@ -290,26 +291,26 @@ class Call
 
 	def decode_audio_frame(buff)
 		case self.codec
-		
+
 		# Convert u-law into signed PCM
 		when IAX_CODEC_G711_MULAW
 			Rex::Proto::IAX2::Codecs::MuLaw.decode(buff)
-		
+
 		# Convert a-law into signed PCM
 		when IAX_CODEC_G711_ALAW
 			Rex::Proto::IAX2::Codecs::ALaw.decode(buff)
-			
-		# Linear little-endian signed PCM is our native format		
+
+		# Linear little-endian signed PCM is our native format
 		when IAX_CODEC_LINEAR_PCM
 			buff
-		
+
 		# Unsupported codec, return empty
 		else
 			dprint("UNKNOWN CODEC: #{self.codec.inspect}")
 			''
 		end
 	end
-	
+
 	def audio_packet_data(pkt)
 		(pkt[0,1].unpack("C")[0] & 0x80 == 0) ? pkt[4,pkt.length-4] : pkt[12,pkt.length-12]
 	end

data/lib/rex/proto/iax2/client.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/iax2/constants'
 require 'rex/proto/iax2/codecs'
 require 'rex/proto/iax2/call'
@@ -17,7 +18,7 @@ class Client
 	attr_accessor :sock, :monitor
 	attr_accessor :src_call_idx
 	attr_accessor :debugging
-	attr_accessor :calls	
+	attr_accessor :calls
 
 	def initialize(uopts={})
 		opts = {
@@ -26,31 +27,31 @@ class Client
 			:server_port   => IAX2_DEFAULT_PORT,
 			:context       => { }
 		}.merge(uopts)
-		
+
 		self.caller_name   = opts[:caller_name]
 		self.caller_number = opts[:caller_number]
 		self.server_host   = opts[:server_host]
 		self.server_port   = opts[:server_port]
 		self.username      = opts[:username]
 		self.password      = opts[:password]
-		
+
 		self.sock = Rex::Socket::Udp.create(
 			'PeerHost' => self.server_host,
 			'PeerPort' => self.server_port,
 			'Context'  => opts[:context]
 		)
-		
+
 		self.monitor   = ::Thread.new { monitor_socket }
 
 		self.src_call_idx = 0
 		self.calls = {}
-		
+
 	end
-	
+
 	def shutdown
 		self.monitor.kill rescue nil
 	end
-	
+
 	def create_call
 		cid  = allocate_call_id()
 		self.calls[ cid ] = IAX2::Call.new(self, cid)
@@ -65,11 +66,11 @@ class Client
 			begin
 				pkt, src = self.sock.recvfrom(65535)
 				next if not pkt
-				
-				# Find the matching call object 
-				mcall = matching_call(pkt)				
+
+				# Find the matching call object
+				mcall = matching_call(pkt)
 				next if not mcall
-	
+
 				if (pkt[0,1].unpack("C")[0] & 0x80) != 0
 					mcall.handle_control(pkt)
 				else
@@ -83,27 +84,27 @@ class Client
 		end
 		self.sock.close rescue nil
 	end
-	
+
 	def matching_call(pkt)
 		src_call = pkt[0,2].unpack('n')[0]
 		dst_call = nil
-		
+
 		if (src_call & 0x8000 != 0)
 			dst_call = pkt[2,2].unpack('n')[0]
 			dst_call ^= 0x8000 if (dst_call & 0x8000 != 0)
 		end
-		
+
 		src_call ^= 0x8000 if (src_call & 0x8000 != 0)
-		
+
 		# Find a matching call in our list
 		mcall = self.calls.values.select {|x| x.dcall == src_call or (dst_call and x.scall == dst_call) }.first
 		if not mcall
 			dprint("Packet received for non-existent call #{[src_call, dst_call].inspect}  vs #{self.calls.values.map{|x| [x.dcall, x.scall]}.inspect}")
 			return
 		end
-		mcall	
+		mcall
 	end
-	
+
 	def allocate_call_id
 		res = ( self.src_call_idx += 1 )
 		if ( res > 0x8000 )
@@ -130,7 +131,7 @@ class Client
 		data =	[ IAX_SUBTYPE_ACK ].pack('C')
 		send_data( call, create_pkt( call.scall, call.dcall, call.timestamp, call.oseq, call.iseq, IAX_TYPE_IAX, data ), false )
 	end
-	
+
 	def send_pong(call, stamp)
 		data =	[ IAX_SUBTYPE_PONG ].pack('C')
 		send_data( call, create_pkt( call.scall, call.dcall, stamp, call.oseq, call.iseq, IAX_TYPE_IAX, data ) )
@@ -146,18 +147,18 @@ class Client
 		data =	[ IAX_SUBTYPE_INVAL ].pack('C')
 		send_data( call, create_pkt( call.scall, call.dcall, call.timestamp, call.oseq, call.iseq, IAX_TYPE_IAX, data ) )
 	end
-	
+
 	def send_hangup(call)
 		data =	[ IAX_SUBTYPE_HANGUP ].pack('C')
 		send_data( call, create_pkt( call.scall, call.dcall, call.timestamp, call.oseq, call.iseq, IAX_TYPE_IAX, data ) )
 	end
-	
+
 	def send_new(call, number)
 		data = [ IAX_SUBTYPE_NEW ].pack('C')
-		
+
 		cid = call.caller_number || self.caller_number
 		cid = number if cid == 'SELF'
-		
+
 		data << create_ie(IAX_IE_CALLING_NUMBER, cid )
 		data << create_ie(IAX_IE_CALLING_NAME, call.caller_name || self.caller_name)
 		data << create_ie(IAX_IE_DESIRED_CODEC, [IAX_SUPPORTED_CODECS].pack("N") )

data/lib/rex/proto/iax2/codecs.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/iax2/codecs/g711'
 require 'rex/proto/iax2/codecs/mulaw'
 require 'rex/proto/iax2/codecs/alaw'