From 432f1676aa2b12f25099bbc8e86d893e48d522eb Mon Sep 17 00:00:00 2001
From: HD Moore <hd_moore@rapid7.com>
Date: Sat, 27 Mar 2010 15:44:33 +0000
Subject: [PATCH] Increase LocalRelay block size, return exploit_uuid in
 sessions

git-svn-id: file:///home/svn/framework3/trunk@8939 4d416f70-5f16-0410-b530-b9f4589650da
---
 lib/msf/core/rpc/session.rb     | 3 ++-
 lib/rex/io/stream.rb            | 2 +-
 lib/rex/services/local_relay.rb | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/msf/core/rpc/session.rb b/lib/msf/core/rpc/session.rb
index 18de485d0e..4af5577976 100644
--- a/lib/msf/core/rpc/session.rb
+++ b/lib/msf/core/rpc/session.rb
@@ -21,7 +21,8 @@ class Session < Base
 				'workspace'   => s.workspace.to_s,
 				'target_host' => s.target_host.to_s,
 				'username'    => s.username.to_s,
-				'uuid'        => s.uuid.to_s
+				'uuid'        => s.uuid.to_s,
+				'exploit_uuid' => s.exploit_uuid.to_s
 			}
 		end
 		res
diff --git a/lib/rex/io/stream.rb b/lib/rex/io/stream.rb
index 1d128e54ea..73c74daa0b 100644
--- a/lib/rex/io/stream.rb
+++ b/lib/rex/io/stream.rb
@@ -94,7 +94,7 @@ module Stream
 	#
 	def fd
 		self
-  end
+	end
 
 	##
 	#
diff --git a/lib/rex/services/local_relay.rb b/lib/rex/services/local_relay.rb
index dda76a08d0..d094accab3 100644
--- a/lib/rex/services/local_relay.rb
+++ b/lib/rex/services/local_relay.rb
@@ -401,9 +401,8 @@ protected
 				# and write it to the other
 				else
 					begin
-						# Read from the read fd 32k at a time (helps with big downloads)
-						data = rfd.sysread(32768)
 						# Pass the data onto the other fd, most likely writing it.
+						data = rfd.sysread(65536)
 						rfd.other_stream.on_other_data(data)
 					# If we catch an error, close the connection
 					rescue ::Exception