librex 0.0.65 → 0.0.66

data/lib/rex/proto/proxy/socks4a.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 #
 # sf - Sept 2010
 #

data/lib/rex/proto/rfb.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 ##
 # $Id: $
 ##

data/lib/rex/proto/rfb.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 

data/lib/rex/proto/rfb/cipher.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 ##
 # $Id: $
 ##

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

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 ##
 # $Id: $
 ##

data/lib/rex/proto/rfb/constants.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 ##
 # $Id: $
 ##

data/lib/rex/proto/smb.rb

@@ -1,7 +1,8 @@
+# -*- coding: binary -*-
 require 'rex/proto/smb/constants'
 require 'rex/proto/smb/exceptions'
 require 'rex/proto/smb/evasions'
 require 'rex/proto/smb/crypt'
 require 'rex/proto/smb/utils'
 require 'rex/proto/smb/client'
-require 'rex/proto/smb/simpleclient'
+require 'rex/proto/smb/simpleclient'

data/lib/rex/proto/smb.rb.ts.rb

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/test'
 require 'rex/proto/smb/client.rb.ut.rb'
 require 'rex/proto/smb/constants.rb.ut.rb'
 require 'rex/proto/smb/crypt.rb.ut.rb'
 require 'rex/proto/smb/simpleclient.rb.ut.rb'
-require 'rex/proto/smb/utils.rb.ut.rb'
+require 'rex/proto/smb/utils.rb.ut.rb'

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

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module SMB
@@ -57,10 +58,10 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 		self.sequence_counter = 0
 		self.signing_key      = ''
 		self.require_signing  = false
-		
+
 		#Misc
 		self.spnopt = {}
-		
+
 	end
 
 	# Read a SMB packet from the socket
@@ -97,8 +98,8 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 
 		#signing
 		if self.require_signing && self.signing_key != ''
-			if self.verify_signature		
-				raise XCEPT::IncorrectSigningError if not CRYPT::is_signature_correct?(self.signing_key,self.sequence_counter,data)			
+			if self.verify_signature
+				raise XCEPT::IncorrectSigningError if not CRYPT::is_signature_correct?(self.signing_key,self.sequence_counter,data)
 			end
 			self.sequence_counter += 1
 		end
@@ -159,7 +160,7 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 		pkt = CONST::SMB_BASE_PKT.make_struct
 		pkt.from_s(data)
 		res  = pkt
-		
+
 		begin
 			case pkt['Payload']['SMB'].v['Command']
 
@@ -560,8 +561,8 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 		self.system_time = UTILS.time_smb_to_unix(ack['Payload'].v['SystemTimeHigh'],ack['Payload'].v['SystemTimeLow'])
 		self.system_time = ::Time.at( self.system_time )
 
-		# A signed 16-bit signed integer that represents the server's time zone, in minutes, 
-		# from UTC. The time zone of the server MUST be expressed in minutes, plus or minus, 
+		# A signed 16-bit signed integer that represents the server's time zone, in minutes,
+		# from UTC. The time zone of the server MUST be expressed in minutes, plus or minus,
 		# from UTC.
 		# NOTE: althought the spec says +/- it doesn't say that it should be inverted :-/
 		system_zone = ack['Payload'].v['ServerTimeZone']
@@ -581,7 +582,7 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 	def session_setup(*args)
 
 		if (self.dialect =~ /^(NT LANMAN 1.0|NT LM 0.12)$/)
-			
+
 			if (self.challenge_key)
 				return self.session_setup_no_ntlmssp(*args)
 			end
@@ -656,17 +657,17 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 		#raise XCEPT::SigningError if self.require_signing
 		self.require_signing = false if self.require_signing
 
-		
+
 		if NTLM_UTILS.is_pass_ntlm_hash?(pass)
 			arglm = {
 				:lm_hash => [ pass.upcase()[0,32] ].pack('H32'),
-				:challenge =>  self.challenge_key 
+				:challenge =>  self.challenge_key
 			}
 			hash_lm = NTLM_CRYPT::lm_response(arglm)
 
 			argntlm = {
-				:ntlm_hash =>  [ pass.upcase()[33,65] ].pack('H32'), 
-				:challenge =>  self.challenge_key 
+				:ntlm_hash =>  [ pass.upcase()[33,65] ].pack('H32'),
+				:challenge =>  self.challenge_key
 			}
 			hash_nt = NTLM_CRYPT::ntlm_response(argntlm)
 		else
@@ -768,7 +769,7 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 		return ack
 	end
 
-	# Authenticate using extended security negotiation 
+	# Authenticate using extended security negotiation
 	def session_setup_with_ntlmssp(user = '', pass = '', domain = '', name = nil, do_recv = true)
 
 		ntlm_options = {
@@ -865,17 +866,17 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 
 		resp_lm, resp_ntlm, client_challenge, ntlm_cli_challenge = NTLM_UTILS.create_lm_ntlm_responses(user, pass, self.challenge_key, domain,
 												default_name, default_domain, dns_host_name,
-												dns_domain_name, chall_MsvAvTimestamp , 
+												dns_domain_name, chall_MsvAvTimestamp ,
 												self.spnopt, ntlm_options)
 		enc_session_key = ''
 		self.sequence_counter = 0
 
 		if self.require_signing
-			self.signing_key, enc_session_key, ntlmssp_flags = NTLM_UTILS.create_session_key(ntlmssp_flags, server_ntlmssp_flags, user, pass, domain, 
-											self.challenge_key, client_challenge, ntlm_cli_challenge, 
+			self.signing_key, enc_session_key, ntlmssp_flags = NTLM_UTILS.create_session_key(ntlmssp_flags, server_ntlmssp_flags, user, pass, domain,
+											self.challenge_key, client_challenge, ntlm_cli_challenge,
 											ntlm_options)
 		end
-		
+
 		# Create the security blob data
 		blob = NTLM_UTILS.make_ntlmssp_secblob_auth(domain, name, user, resp_lm, resp_ntlm, enc_session_key, ntlmssp_flags)
 
@@ -909,11 +910,11 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 
 		# Make sure that authentication succeeded
 		if (ack['Payload']['SMB'].v['ErrorClass'] != 0)
-		
+
 			if (user.length == 0)
 				# Ensure that signing is disabled when we hit this corner case
 				self.require_signing = false
-				
+
 				# Fall back to the non-ntlmssp authentication method
 				return self.session_setup_no_ntlmssp(user, pass, domain)
 			end
@@ -1920,7 +1921,7 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 
 # public read/write methods
 	attr_accessor	:native_os, :native_lm, :encrypt_passwords, :extended_security, :read_timeout, :evasion_opts
-	attr_accessor	:verify_signature, :use_ntlmv2, :usentlm2_session, :send_lm, :use_lanman_key, :send_ntlm 
+	attr_accessor	:verify_signature, :use_ntlmv2, :usentlm2_session, :send_lm, :use_lanman_key, :send_ntlm
 	attr_accessor  	:system_time, :system_zone
 	#misc
 	attr_accessor   :spnopt # used for SPN
@@ -1931,7 +1932,7 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 	attr_reader		:multiplex_id, :last_tree_id, :last_file_id, :process_id, :last_search_id
 	attr_reader		:dns_host_name, :dns_domain_name
 	attr_reader		:security_mode, :server_guid
-	#signing related 
+	#signing related
 	attr_reader		:sequence_counter,:signing_key, :require_signing
 
 # private methods
@@ -1940,7 +1941,7 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
 	attr_writer		:dns_host_name, :dns_domain_name
 	attr_writer		:multiplex_id, :last_tree_id, :last_file_id, :process_id, :last_search_id
 	attr_writer		:security_mode, :server_guid
-	#signing related 
+	#signing related
 	attr_writer		:sequence_counter,:signing_key, :require_signing
 
 	attr_accessor	:socket

data/lib/rex/proto/smb/client.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 

data/lib/rex/proto/smb/constants.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module SMB

data/lib/rex/proto/smb/constants.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -15,4 +16,4 @@ class Rex::Proto::SMB::Constants::UnitTest < Test::Unit::TestCase
 		assert_equal(Klass::NT_TRANSACT_QUERY_SECURITY_DESC, 0x06)
 	end
 	
-end
+end

data/lib/rex/proto/smb/crypt.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/text'
 
 module Rex
@@ -6,7 +7,7 @@ module SMB
 class Crypt
 
 	@@loaded_openssl = false
-	
+
 	begin
 		require 'openssl'
 		@@loaded_openssl = true
@@ -18,7 +19,7 @@ class Crypt
 		raise RuntimeError, "No OpenSSL support" if not @@loaded_openssl
 		seq = Rex::Text::pack_int64le(sequence_counter)
 		netbios_hdr = data.slice!(0,4)
-		data[14,8] = seq 
+		data[14,8] = seq
 		signature = OpenSSL::Digest::MD5.digest(mackey + data)[0,8]
 		data[14,8] = signature
 		netbios_hdr + data

data/lib/rex/proto/smb/evasions.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module SMB

data/lib/rex/proto/smb/exceptions.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module SMB
@@ -730,7 +731,7 @@ class Error < ::RuntimeError
 		0xC003005E => "RPC_NT_WRONG_PIPE_VERSION",
 		0x400200AF => "RPC_NT_SEND_INCOMPLETE"
 	}
-		
+
 	def initialize(*args)
 		super(*args)
 	end
@@ -784,28 +785,28 @@ end
 
 class InvalidWordCount < InvalidPacket
 	def to_s
-		"The server responded with unimplemented WordCount " + 
+		"The server responded with unimplemented WordCount " +
 		self.word_count.to_s + ' for command ' + self.command.to_s
 	end
 end
 
 class InvalidCommand < InvalidPacket
 	def to_s
-		"The server responded with unimplemented command " + 
+		"The server responded with unimplemented command " +
 		self.command.to_s + ' with WordCount ' + self.word_count.to_s
 	end
 end
 
 class InvalidType < InvalidPacket
 	def to_s
-		"The server responded with unexpected packet (Command=" + 
+		"The server responded with unexpected packet (Command=" +
 		self.command.to_s + ' WordCount=' + self.word_count.to_s + ")"
 	end
 end
 
 class ErrorCode < InvalidPacket
 	def to_s
-		'The server responded with error: ' + 
+		'The server responded with error: ' +
 		self.get_error(self.error_code) +
 		" (Command=#{self.command} WordCount=#{self.word_count})"
 	end

data/lib/rex/proto/smb/simpleclient.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module SMB

data/lib/rex/proto/smb/simpleclient.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 

data/lib/rex/proto/smb/utils.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/text'
 require 'rex/proto/smb/constants'
 

data/lib/rex/proto/smb/utils.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -17,4 +18,4 @@ class Rex::Proto::SMB::Utils::UnitTest < Test::Unit::TestCase
 		assert_equal(Klass.nbname_encode(nbdecoded),  nbencoded )
 		assert_equal(Klass.nbname_decode(nbencoded),  nbdecoded )
 	end
-end
+end

data/lib/rex/proto/sunrpc.rb

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

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

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/socket'
 require 'rex/encoder/xdr'
 

data/lib/rex/proto/tftp.rb

@@ -1,4 +1,5 @@
-# $Id: tftp.rb 9962 2010-08-06 17:21:22Z jduck $
+# -*- coding: binary -*-
+# $Id: tftp.rb 15548 2012-06-29 06:08:20Z rapid7 $
 #
 # TFTP Server implementation according to:
 #
@@ -10,3 +11,4 @@
 
 require 'rex/proto/tftp/constants'
 require 'rex/proto/tftp/server'
+require 'rex/proto/tftp/client'

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

@@ -0,0 +1,344 @@
+# -*- coding: binary -*-
+require 'rex/socket'
+require 'rex/proto/tftp'
+require 'tempfile'
+
+module Rex
+module Proto
+module TFTP
+
+#
+# TFTP Client class
+#
+# Note that TFTP has blocks, and so does Ruby. Watch out with the variable names!
+#
+# The big gotcha right now is that setting the mode between octet, netascii, or
+# anything else doesn't actually do anything other than declare it to the
+# server.
+#
+# Also, since TFTP clients act as both clients and servers, we use two
+# threads to handle transfers, regardless of the direction. For this reason,
+# the transfer actions are nonblocking; if you need to see the
+# results of a transfer before doing something else, check the boolean complete
+# attribute and any return data in the :status attribute. It's a little
+# weird like that.
+#
+# Finally, most (all?) clients will alter the data in netascii mode in order
+# to try to conform to the RFC standard for what "netascii" means, but there are
+# ambiguities in implementations on things like if nulls are allowed, what
+# to do with Unicode, and all that. For this reason, "octet" is default, and
+# if you want to send "netascii" data, it's on you to fix up your source data
+# prior to sending it.
+#
+class Client
+
+	attr_accessor :local_host, :local_port, :peer_host, :peer_port
+	attr_accessor :threads, :context, :server_sock, :client_sock
+	attr_accessor :local_file, :remote_file, :mode, :action
+	attr_accessor :complete, :recv_tempfile, :status
+	attr_accessor :block_size # This definitely breaks spec, should only use for fuzz/sploit.
+
+	# Returns an array of [code, type, msg]. Data packets
+	# specifically will /not/ unpack, since that would drop any trailing spaces or nulls.
+	def parse_tftp_response(str)
+		return nil unless str.length >= 4
+		ret = str.unpack("nnA*")
+		ret[2] = str[4,str.size] if ret[0] == OpData
+		return ret
+	end
+
+	def initialize(params)
+		self.threads = []
+		self.local_host = params["LocalHost"] || "0.0.0.0"
+		self.local_port = params["LocalPort"] || (1025 + rand(0xffff-1025))
+		self.peer_host = params["PeerHost"] || (raise ArgumentError, "Need a peer host.")
+		self.peer_port = params["PeerPort"] || 69
+		self.context = params["Context"]
+		self.local_file = params["LocalFile"]
+		self.remote_file = params["RemoteFile"] || (::File.split(self.local_file).last if self.local_file)
+		self.mode = params["Mode"] || "octet"
+		self.action = params["Action"] || (raise ArgumentError, "Need an action.")
+		self.block_size = params["BlockSize"] || 512
+	end
+
+	#
+	# Methods for both upload and download
+	#
+	
+	def start_server_socket
+		self.server_sock = Rex::Socket::Udp.create(
+			'LocalHost' => local_host,
+			'LocalPort' => local_port,
+			'Context'   => context
+		)
+		if self.server_sock and block_given?
+			yield "Started TFTP client listener on #{local_host}:#{local_port}"
+		end
+		self.threads << Rex::ThreadFactory.spawn("TFTPServerMonitor", false) {
+			if block_given?
+				monitor_server_sock {|msg| yield msg}
+			else
+				monitor_server_sock
+			end
+		}
+	end
+
+	def monitor_server_sock
+		yield "Listening for incoming ACKs" if block_given?
+		res = self.server_sock.recvfrom(65535)
+		if res and res[0]
+			code, type, data = parse_tftp_response(res[0])
+			if code == OpAck and self.action == :upload
+				if block_given?
+					yield "WRQ accepted, sending the file." if type == 0
+					send_data(res[1], res[2]) {|msg| yield msg}
+				else
+					send_data(res[1], res[2])
+				end
+			elsif code == OpData and self.action == :download
+				if block_given?
+					recv_data(res[1], res[2], data) {|msg| yield msg}
+				else
+					recv_data(res[1], res[2], data)
+				end
+			elsif code == OpError
+				yield("Aborting, got error type:%d, message:'%s'" % [type, data]) if block_given?
+				self.status = {:error => [code, type, data]}
+			else
+				yield("Aborting, got code:%d, type:%d, message:'%s'" % [code, type, data]) if block_given?
+				self.status = {:error => [code, type, data]}
+			end
+		end
+		stop
+	end
+
+	def monitor_client_sock
+		res = self.client_sock.recvfrom(65535)
+		if res[1] # Got a response back, so that's never good; Acks come back on server_sock.
+			code, type, data = parse_tftp_response(res[0])
+			yield("Aborting, got code:%d, type:%d, message:'%s'" % [code, type, data]) if block_given?
+			self.status = {:error => [code, type, data]}
+			stop
+		end
+	end
+
+	def stop
+		self.complete = true
+		begin
+			self.server_sock.close
+			self.client_sock.close
+			self.server_sock = nil
+			self.client_sock = nil
+			self.threads.each {|t| t.kill}
+		rescue
+			nil
+		end
+	end
+
+	#
+	# Methods for download
+	#
+	
+	def rrq_packet
+		req = [OpRead, self.remote_file, self.mode]
+		packstr = "na#{self.remote_file.length+1}a#{self.mode.length+1}"
+		req.pack(packstr)
+	end
+
+	def ack_packet(blocknum=0)
+		req = [OpAck, blocknum].pack("nn")
+	end
+
+	def send_read_request(&block)
+		self.status = nil
+		self.complete = false
+		if block_given?
+			start_server_socket {|msg| yield msg}
+		else
+			start_server_socket
+		end
+		self.client_sock = Rex::Socket::Udp.create(
+			'PeerHost'  => peer_host,
+			'PeerPort'  => peer_port,
+			'LocalHost' => local_host,
+			'LocalPort' => local_port,
+			'Context'   => context
+		)
+		self.client_sock.sendto(rrq_packet, peer_host, peer_port)
+		self.threads << Rex::ThreadFactory.spawn("TFTPClientMonitor", false) {
+			if block_given?
+				monitor_client_sock {|msg| yield msg}
+			else
+				monitor_client_sock
+			end
+		}
+		until self.complete
+			return self.status
+		end
+	end
+
+	def recv_data(host, port, first_block)
+		self.recv_tempfile = Rex::Quickfile.new('msf-tftp')
+		recvd_blocks = 1
+		if block_given?
+			yield "Source file: #{self.remote_file}, destination file: #{self.local_file}"
+			yield "Received and acknowledged #{first_block.size} in block #{recvd_blocks}"
+		end
+		if block_given?
+			write_and_ack_data(first_block,1,host,port) {|msg| yield msg}
+		else
+			write_and_ack_data(first_block,1,host,port)
+		end
+		current_block = first_block
+		while current_block.size == 512
+			res = self.server_sock.recvfrom(65535)
+			if res and res[0]
+				code, block_num, current_block = parse_tftp_response(res[0])
+				if code == 3
+					if block_given?
+						write_and_ack_data(current_block,block_num,host,port) {|msg| yield msg}
+					else
+						write_and_ack_data(current_block,block_num,host,port)
+					end
+					recvd_blocks += 1
+				else
+					yield("Aborting, got code:%d, type:%d, message:'%s'" % [code, type, msg]) if block_given?
+					stop
+				end
+			end
+		end
+		if block_given?
+			yield("Transferred #{self.recv_tempfile.size} bytes in #{recvd_blocks} blocks, download complete!")
+		end
+		self.status = {:success => [
+			self.local_file,
+			self.remote_file,
+			self.recv_tempfile.size,
+			recvd_blocks.size]
+		}
+		self.recv_tempfile.close
+		stop
+	end
+
+	def write_and_ack_data(data,blocknum,host,port)
+		self.recv_tempfile.write(data)
+		self.recv_tempfile.flush
+		req = ack_packet(blocknum)
+		self.server_sock.sendto(req, host, port)
+		yield "Received and acknowledged #{data.size} in block #{blocknum}" if block_given?
+	end
+
+	#
+	# Methods for upload
+	#
+	
+	def wrq_packet
+		req = [OpWrite, self.remote_file, self.mode]
+		packstr = "na#{self.remote_file.length+1}a#{self.mode.length+1}"
+		req.pack(packstr)
+	end
+
+	# Note that the local filename for uploading need not be a real filename --
+	# if it begins with DATA: it can be any old string of bytes. If it's missing
+	# completely, then just quit.
+	def blockify_file_or_data
+		if self.local_file =~ /^DATA:(.*)/m
+			data = $1
+		elsif ::File.file?(self.local_file) and ::File.readable?(self.local_file)
+			data = ::File.open(self.local_file, "rb") {|f| f.read f.stat.size} rescue []
+		else
+			return []
+		end
+		data_blocks = data.scan(/.{1,#{block_size}}/m)
+		# Drop any trailing empty blocks
+		if data_blocks.size > 1 and data_blocks.last.empty?
+			data_blocks.pop
+		end
+		return data_blocks
+	end
+
+	def send_write_request(&block)
+		self.status = nil
+		self.complete = false
+		if block_given?
+			start_server_socket {|msg| yield msg}
+		else
+			start_server_socket
+		end
+		self.client_sock = Rex::Socket::Udp.create(
+			'PeerHost'  => peer_host,
+			'PeerPort'  => peer_port,
+			'LocalHost' => local_host,
+			'LocalPort' => local_port,
+			'Context'   => context
+		)
+		self.client_sock.sendto(wrq_packet, peer_host, peer_port)
+		self.threads << Rex::ThreadFactory.spawn("TFTPClientMonitor", false) {
+			if block_given?
+				monitor_client_sock {|msg| yield msg}
+			else
+				monitor_client_sock
+			end
+		}
+		until self.complete
+			return self.status
+		end
+	end
+
+	def send_data(host,port)
+		self.status = {:write_allowed => true}
+		data_blocks = blockify_file_or_data()
+		if data_blocks.empty?
+			yield "Closing down since there is no data to send." if block_given?
+			self.status = {:success => [self.local_file, self.local_file, 0, 0]}
+			return nil
+		end
+		sent_data = 0
+		sent_blocks = 0
+		expected_blocks = data_blocks.size
+		expected_size = data_blocks.join.size
+		if block_given?
+			yield "Source file: #{self.local_file =~ /^DATA:/ ? "(Data)" : self.remote_file}, destination file: #{self.remote_file}"
+			yield "Sending #{expected_size} bytes (#{expected_blocks} blocks)"
+		end
+		data_blocks.each_with_index do |data_block,idx|
+			req = [OpData, (idx + 1), data_block].pack("nnA*")
+			if self.server_sock.sendto(req, host, port) > 0
+				sent_data += data_block.size
+			end
+			res = self.server_sock.recvfrom(65535)
+			if res
+				code, type, msg = parse_tftp_response(res[0])
+				if code == 4
+					sent_blocks += 1
+					yield "Sent #{data_block.size} bytes in block #{sent_blocks}" if block_given?
+				else
+					if block_given?
+						yield "Got an unexpected response: Code:%d, Type:%d, Message:'%s'. Aborting." % [code, type, msg]
+					end
+					break
+				end
+			end
+		end
+		if block_given?
+			if(sent_data == expected_size)
+				yield("Transferred #{sent_data} bytes in #{sent_blocks} blocks, upload complete!")
+			else
+				yield "Upload complete, but with errors."
+			end
+		end
+		if sent_data == expected_size
+		self.status = {:success => [
+				self.local_file,
+				self.remote_file,
+				sent_data,
+				sent_blocks
+			] }
+		end
+	end
+
+end
+
+end
+end
+end