rgadu 0.1.1 → 0.2.0

data/lib/gg/dccserver.rb

@@ -28,6 +28,7 @@ class DCCServer
 			type=packet_raw.unpack('L')[0]
 			if type==0x03
 				if filename=@queue[client_uin]
+					@queue.delete(client_uin)
 					init_send(client_uin, session, filename)
 				end
 			elsif type==0x02
@@ -36,6 +37,7 @@ class DCCServer
 		elsif @queue[packet_raw]
 			code=packet_raw
 			direction, filename, filesize, offset = @queue[code]
+			@queue.delete(code)
 			if direction == :out
 				session.write(code)
 				begin
@@ -110,7 +112,7 @@ class DCCServer
 		if type==0x01
 			packet_raw = session.read(332) or return
 			packet_body = packet_raw.unpack('LLLLLLLLLLLLLLa262a14')
-			filename = packet_body[14].sub(/\x00+/, '')
+			filename = packet_body[14].sub(/\x00.*/m, '').sub(%r{.*/}, '')
 			filesize = packet_body[11]
 			if @prepare_recv and local_filename=@prepare_recv.call(client_uin, filename, filesize)
 				if local_filename.class == Array

data/lib/gg.rb

@@ -21,13 +21,15 @@ class GG
 		:invisible => 0x16,
 		:notavail => 0x15}
 	VERSION = {0x18 => '5.0', 0x19 => '5.0', 0x1b => '5.0', 0x1c => '5.7', 0x1e => '5.7',
-		0x20 => '6.0', 0x21 => '6.0', 0x22 => '6.0', 0x24 => '6.1',
-		0x25 => '7.0', 0x26 => '7.0', 0x27 => '7.0', 0x28 => '7.5', 0x29 => '7.6', 0x2a => '7.7'}
+		0x20 => '6.0', 0x21 => '6.0', 0x22 => '6.0',
+		0x24 => '7.0', 0x25 => '7.0', 0x26 => '7.0', 0x27 => '7.0', 0x28 => '7.5', 0x29 => '7.6', 0x2a => '7.7'}
 	TO_GENDER = {:male => '2', :female => '1'}
 	PATTERN = {0x02 => 'LLa*',
 		0x0f => 'LCLSCCCa*',
+		0x17 => 'LCLSCCCa*',
 		0x0c => 'LCLSLSa*',
 		0x11 => 'LCLSCCCCa*',
+		0x18 => 'LCLSCCCCa*',
 		0x0e => 'CLa*',
 		0x0a => 'LLLLa*',
 		0x23 => 'La8',
@@ -36,42 +38,64 @@ class GG
 		0x1f => 'LLa8a21a43'}
 
 =begin rdoc
-Tworzy nowy obiekt GG i loguje sie na serwerze. Opcjonalnie uruchamia serwer DCC na porcie *dccport* i przesy�a serwerowi tablic� z list� kontakt�w.
+Tworzy nowy obiekt GG i loguje sie na serwerze uzywajac numeru *uin* i hasla *password*. Dodatkowe parametry to: :server => serwer GG, :port => port na serwerze GG, :dccport => port dla polaczen bezposrednich, :contacts => tablica z lista kontaktow, :version => wersja protokolu.
 =end
-	def initialize(uin, password, dccport=0, contacts=nil, server='217.17.45.146', port=8074)
+	def initialize(uin, password, params={})
+		server = params[:server] || '217.17.45.146'
+		port = params[:port] || 8074
+		dccport = params[:dccport]
+		contacts = params[:contacts] || []
+		version = (params[:version] || 6.0).to_f
 		@uin=uin
 		@dccport=dccport
 		@socket=TCPSocket.new(server, port)
 		type, length = read_header
 		if type!=0x01
 			raise "Packet not recognized"
-		end	
+		end
 		seed=read_body(length, 'L')[0]
-		hash=gg_login_hash(password, seed)
-		if dccport>0
+		if dccport
 			@dcc = DCCServer.new(dccport, uin)
 			localip=@socket.addr[3].split('.').collect {|x| x.to_i }.pack('C4').unpack('L')[0]
 		else
 			localip=0
 		end
-		write(0x15, 'LLLLCLSLSCC', uin, hash, 0x02, 0x20, 0x00, localip, dccport, localip, dccport, 0x00, 0xbe)
+		if version >= 7.7
+			protocol = 0x2a
+		elsif version >= 7.6
+			protocol = 0x29
+		elsif version >= 7
+			protocol = 0x24
+		else
+			protocol = 0x20
+		end
+		if version >= 7
+			hash = Digest::SHA1.digest(password + [seed].pack('L'))
+			write(0x19, 'LCa64LLCLSLSCC', uin, 0x02, hash, 0x02, protocol, 0x00, localip, dccport, localip, dccport, 0x00, 0xbe)
+		else
+			hash = gg_login_hash(password, seed)
+			write(0x15, 'LLLLCLSLSCC', uin, hash, 0x02, 0x20, 0x00, localip, dccport, localip, dccport, 0x00, 0xbe)
+		end
 		type, length = read_header
 		read_body(length)
 		unless type==0x03 or type==0x14
 			raise "Authorization failed"
 		end
-		if contacts and contacts.length > 0
-			write(0x10, 'LC'*contacts.length, *(contacts.map {|contact| [contact, 0x03] }.flatten))
+		if contacts.length > 0
+			contactpacket = []
+			contacts.each {|contact| contactpacket.push(contact, 0x03) }
+			write(0x10, 'LC'*contacts.length, *contactpacket)
 		else
 			write(0x12, '')
 		end
 		@action, @status, @search_reply, @dcc_code, @dcc_action, @dcc_client_action = {}, {}, {}, [], {}, {}
+		contacts.each {|contact| @status[contact] = {:status => :notavail} }
 		@action_thread, @dcc_client, @dcc_client_thread = [], [], []
 		@action[0x0a] = lambda {|sender, seq, time, cl, message| msg_received(sender, seq, time, cl, message) }
 		@action[0x02] = lambda {|uin, status, description| status_changed(uin, status, description) }
-		@action[0x0f] = lambda {|uin, status, ip, port, version, x, y, description| status_changed(uin, status, description, ip, port, version) }
+		@action[0x0f] = @action[0x17] = lambda {|uin, status, ip, port, version, x, y, description| status_changed(uin, status, description, ip, port, version) }
 		@action[0x0c] = lambda {|uin, status, ip, port, version, x, description| status_changed(uin, status, description, ip, port, version) }
-		@action[0x11] = lambda {|uin, status, ip, port, version, imgsize, x, descsize, description| status_changed(uin, status, description, ip, port, version) }
+		@action[0x11] = @action[0x18] = lambda {|uin, status, ip, port, version, imgsize, x, descsize, description| status_changed(uin, status, description, ip, port, version) }
 		@action[0x0e] = lambda {|type, seq, response| @search_reply[seq] = response }
 		@action[0x23] = lambda {|type, code| @dcc_code << code }
 		@action[0x21] = lambda {|uin, code, offset, x| @dcc_action[code].call(offset) if @dcc_action[code] }
@@ -182,80 +206,59 @@ Wyszukiwanie w katalogu publicznym. *params* moze byc numerem GG lub tablica aso
 	end
 
 =begin rdoc
-Wysyla plik *filename* do *uin*. Mo�na poda� hash SHA1 pliku w postaci ci�gu bajt�w, w przeciwnym razie hash jest obliczany w razie potrzeby. Jesli dolaczono blok kodu, blok ten bedzie wywolywany podczas wysylania pliku. Blok przyjmuje jeden parametr - aktualn� pozycj� pliku w bajtach, symbol :rejected je�li po��czenie zosta�o odrzucone lub :aborted w przypadku przerwania transferu. Funkcja w zaleznosci od wersji protokolu DCC zwraca kod transferu lub numer GG odbiorcy.
+Wysyla plik *filename* do *uin*. Jesli dolaczono blok kodu, blok ten bedzie wywolywany podczas wysylania pliku. Blok przyjmuje jeden parametr - aktualn� pozycj� pliku w bajtach, symbol :rejected je�li po��czenie zosta�o odrzucone lub :aborted w przypadku przerwania transferu. Funkcja w zaleznosci od wersji protokolu DCC zwraca kod transferu lub numer GG odbiorcy.
 =end
 	def dcc_request(uin, filename, hash=nil, &callback)
-		raise "No DCC server" unless @dcc
-		if File.exist?(filename)
-			if @status[uin] and version=@status[uin][:version] and version.to_f >= 7.6
-				write(0x23, 'L', 0x04)
-				sleep 0.1 until code = @dcc_code.shift
-				filesize=File.size(filename)
-				unless hash
-					checksum = Digest::SHA1.new
-					file = File.open(filename, 'rb')
-					while chunk = file.read(1048576)
-						checksum << chunk
-					end
-					file.close
-					hash = checksum.digest
-				end
-				write(0x20, 'a8LLLa226a29LLa20', code, @uin, uin, 0x04, File.basename(filename), '', filesize, 0, hash)
-				@dcc_action[code] = lambda do |offset|
-					if offset == -1
-						callback.call(:rejected)
-					else
-						if callback
-							@dcc.add_send_code(code, filename, filesize, offset) {|pos| callback.call(pos) }
-						else
-							@dcc.add_send_code(code, filename, filesize, offset)
-						end
-						write(0x1f, 'LLa8a21a43', uin, 0x01, code, @socket.addr[3]+' '+@dccport.to_s, '')
-						if @socket.addr[3] =~ /^(10\.|172\.16\.|192\.168\.)/
-							@dcc_client_action[code] = lambda do |ip, port|
-								@dcc_client_thread << Thread.new(ip, port, @uin, uin, code, filename, filesize, offset, callback) do |ip, port, client_uin, server_uin, code, filename, filesize, offset, callback|
-									begin
-										client = DCCClient.new(ip, port, client_uin, server_uin, code)
-										@dcc_client << client
-										if callback
-											client.client_send7(filename, filesize, offset) {|pos| callback.call(pos) }
-										else
-											client.client_send7(filename, filesize, offset)
-										end
-									rescue
-										warn "Error: #{$!}"
-									end
+		raise "dcc_request: no DCC server" unless @dcc
+		raise "dcc_request: file #{filename} not found" unless File.exist?(filename)
+		raise "dcc_request: #{uin} is not on the contact list" unless contact?(uin)
+		warn "dcc_request: optional parameter 'hash' is ignored and will be removed" if hash
+		return nil if get_status(uin) == :notavail
+		if version = get_version(uin) and version.to_f >= 7.6
+			write(0x23, 'L', 0x04)
+			sleep 0.1 until code = @dcc_code.shift
+			filesize=File.size(filename)
+			hash = filehash(filename, version)
+			write(0x20, 'a8LLLa226a29LLa20', code, @uin, uin, 0x04, File.basename(filename), '', filesize, 0, hash)
+			@dcc_action[code] = lambda do |offset|
+				if offset == -1
+					callback.call(:rejected) if callback
+				else
+					@dcc.add_send_code(code, filename, filesize, offset, &callback)
+					write(0x1f, 'LLa8a21a43', uin, 0x01, code, @socket.addr[3]+' '+@dccport.to_s, '')
+					if @socket.addr[3] =~ /^(10\.|172\.16\.|192\.168\.)/
+						@dcc_client_action[code] = lambda do |ip, port|
+							@dcc_client_thread << Thread.new(ip, port, @uin, uin, code, filename, filesize, offset, callback) do |ip, port, client_uin, server_uin, code, filename, filesize, offset, callback|
+								begin
+									client = DCCClient.new(ip, port, client_uin, server_uin, code)
+									@dcc_client << client
+									client.client_send7(filename, filesize, offset, &callback)
+								rescue
+									warn "Error: #{$!}"
 								end
 							end
 						end
 					end
 				end
-				code
-			else
-				if @socket.addr[3] =~ /^(10\.|172\.16\.|192\.168\.)/ and ip = get_ip(uin) and port = get_port(uin) and port > 1
-					@dcc_client_thread << Thread.new(ip, port, @uin, uin, filename, callback) do |ip, port, client_uin, server_uin, filename, callback|
-						begin
-							client = DCCClient.new(ip, port, client_uin, server_uin)
-							@dcc_client << client
-							if callback
-								client.client_send(filename) {|pos| callback.call(pos) }
-							else
-								client.client_send(filename)
-							end
-						rescue
-							warn "Error: #{$!}"
-						end
-					end
-				else
-					if callback
-						@dcc.add_send(uin, filename) {|pos| callback.call(pos) }
-					else
-						@dcc.add_send(uin, filename)
+			end
+			code
+		else
+			return nil if get_port(uin) == 2 or get_port(uin) == 0
+			if @socket.addr[3] =~ /^(10\.|172\.16\.|192\.168\.)/ and ip = get_ip(uin) and port = get_port(uin) and port > 2
+				@dcc_client_thread << Thread.new(ip, port, @uin, uin, filename, callback) do |ip, port, client_uin, server_uin, filename, callback|
+					begin
+						client = DCCClient.new(ip, port, client_uin, server_uin)
+						@dcc_client << client
+						client.client_send(filename, &callback)
+					rescue
+						warn "Error: #{$!}"
 					end
-					write(0x0b, 'LLLa*C', uin, rand(2**32), 0x10, "\x02", 0)
 				end
-				uin
+			else
+				@dcc.add_send(uin, filename, &callback)
+				write(0x0b, 'LLLa*C', uin, rand(2**32), 0x10, "\x02", 0)
 			end
+			uin
 		end
 	end
 
@@ -279,12 +282,13 @@ Ustawia blok kodu jako zdarzenie wywolywane, gdy ktos zechce wyslac do nas plik.
 	def on_dcc_recv(&action)
 		raise "No DCC server" unless @dcc
 		@dcc_recv_action = action
-		@dcc.on_recv {|uin, filename, filesize| action.call(uin, filename, filesize) }
+		@dcc.on_recv(&action)
 		@action[0x20] = lambda do |code, sender_uin, recv_uin, type, filename, x, filesize, y, hash|
 			if type==0x04
 				filename.sub!(/\x00.*/m, '')
+				filename.sub!(%r{.*/}, '')
 				if local_filename=action.call(sender_uin, filename, filesize)
-					if local_filename.class == Array
+					if local_filename.respond_to?(:to_ary)
 						local_filename, callback = local_filename
 					end
 					if File.exist?(local_filename)
@@ -292,11 +296,7 @@ Ustawia blok kodu jako zdarzenie wywolywane, gdy ktos zechce wyslac do nas plik.
 					else
 						offset = 0
 					end
-					if callback
-						@dcc.add_recv_code(code, local_filename, filesize, offset) {|pos| callback.call(pos) }
-					else
-						@dcc.add_recv_code(code, local_filename, filesize, offset)
-					end
+					@dcc.add_recv_code(code, local_filename, filesize, offset, &callback)
 					write(0x21, 'La8LL', sender_uin, code, offset, 0)
 					write(0x1f, 'LLa8a21a43', sender_uin, 0x01, code, @socket.addr[3]+' '+@dccport.to_s, '')
 					@dcc_client_action[code] = lambda do |ip, port|
@@ -304,11 +304,7 @@ Ustawia blok kodu jako zdarzenie wywolywane, gdy ktos zechce wyslac do nas plik.
 							begin
 								client = DCCClient.new(ip, port, client_uin, server_uin, code)
 								@dcc_client << client
-								if callback
-									client.client_recv7(filename, filesize, offset) {|pos| callback.call(pos) }
-								else
-									client.client_recv7(filename, filesize, offset)
-								end
+								client.client_recv7(filename, filesize, offset, &callback)
 							rescue
 								warn "Error: #{$!}"
 							end
@@ -321,39 +317,46 @@ Ustawia blok kodu jako zdarzenie wywolywane, gdy ktos zechce wyslac do nas plik.
 		end
 	end
 
+=begin rdoc
+Sprawdza czy *uin* jest na liscie kontaktow. Zwraca true lub false.
+=end
+	def contact?(uin)
+		@status[uin] ? true : false
+	end
+
 =begin rdoc
 Zwraca status *uin* jesli jest on na liscie kontaktow. Status moze byc jednym z symboli: :avail, :busy, :notavail.
 =end
 	def get_status(uin)
-		@status[uin][:status]
+		@status[uin][:status] if @status[uin]
 	end
 
 =begin rdoc
 Zwraca opis *uin* jesli jest on na liscie kontaktow.
 =end
 	def get_description(uin)
-		@status[uin][:description]
+		@status[uin][:description] if @status[uin]
 	end
 
 =begin rdoc
 Zwraca adres IP *uin* jako lancuch znakow w postaci 4 liczb oddzielonych kropkami.
 =end
 	def get_ip(uin)
-		@status[uin][:ip]
+		@status[uin][:ip] if @status[uin]
 	end
 
 =begin rdoc
 Zwraca port, na ktorym *uin* ma serwer DCC.
 =end
 	def get_port(uin)
-		@status[uin][:port]
+		@status[uin][:port] if @status[uin]
 	end
 
 =begin rdoc
 Zwraca wersje klienta *uin* jako liczbe Float lub nil jesli nie rozpoznano wersji.
 =end
 	def get_version(uin)
-		@status[uin][:version]
+		@status[uin][:version] if @status[uin]
 	end
 
 =begin rdoc
@@ -380,6 +383,7 @@ Rozlacza sie z serwerem GG, wylacza serwer DCC i zamyka wszystkie polaczenia DCC
 		@socket.close
 		@dcc.close if @dcc
 		@dcc_client_thread.each {|t| t.exit }
+		nil
 	end
 
 	def write(type, pattern, *params)
@@ -419,6 +423,10 @@ Rozlacza sie z serwerem GG, wylacza serwer DCC i zamyka wszystkie polaczenia DCC
 		end
 	end
 
+	def set_action(type, &action)
+		@action[type] = action
+	end
+
 	def ping
 		write(0x08, '')
 	end
@@ -441,6 +449,29 @@ Rozlacza sie z serwerem GG, wylacza serwer DCC i zamyka wszystkie polaczenia DCC
 		y
 	end
 
+	def filehash(filename, version=7.7)
+		digest = Digest::SHA1.new
+		File.open(filename) do |f|
+			if File.size(filename) <= 10*1024*1024
+				while chunk = f.read(1024*1024)
+					digest << chunk
+				end
+			else
+				if version.to_s == '7.6'
+					chunksize = 0xfe000
+				else
+					chunksize = 0x100000
+				end
+				seekjump = (File.size(filename)-0x100000)/9
+				9.times do |i|
+					f.seek i*seekjump
+					digest << f.read(chunksize)
+				end
+			end
+		end
+		digest.digest
+	end
+
 	def msg_received(sender, seq, time, cl, message)
 		if cl == 0x10 and message.chomp(0.chr) == 2.chr
 			if @dcc_recv_action and ip = get_ip(sender) and port = get_port(sender) and port > 1

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rgadu
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-08-22 00:00:00 +02:00
+  version: 0.2.0
+date: 2007-09-23 00:00:00 +02:00
 summary: A simple pure-Ruby implementation of the Gadu-Gadu protocol.
 require_paths: 
 - lib