rubydns 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 186a24b0ad316d50292be0da61686018bd44aab2
-  data.tar.gz: 3fe7719aa57dd9fb577f52a59363e7f4b9227198
+  metadata.gz: f4fda39223a95e55c2076290f606afad961a2329
+  data.tar.gz: 68c313608b3dfff428024fded19fc4ca09031417
 SHA512:
-  metadata.gz: 8248f29e70c4e4e0a0a5bbc91d313a47acb66d764be5b26f939e5f5191d3c14424d60933ad1f49b5c6974347a4a37ed6e625431399ee7e94aee279429395cc4d
-  data.tar.gz: dbd1cecbb5295763311a7724774c0d5065a28602e816385907961777635020f407f2596c0e0e73a62a48dc0da127c8971f6e01b511c54c8b381ad0e241be89d4
+  metadata.gz: 446b2658fd2a6438881ca805f0a202ca34f3d3e7b56480751ee230d5dfa3ac93757dac0f51f69edbad6fbc9afc925b8fd11efd774696b63439b1d8b6bfa5c044
+  data.tar.gz: 40fa8b55fc9351c2c7afba9791ea58632290f3c21871005729498e1058b01219cc45c3d638076599a203c453ffd2190a4facaeff7d495afbbea397964fd9603b

data/lib/rubydns/handler.rb

@@ -23,7 +23,7 @@ require 'rubydns/message'
 module RubyDNS
 	
 	def self.get_peer_details(connection)
-		Socket.unpack_sockaddr_in(connection.get_peername)[1]
+		Socket.unpack_sockaddr_in(connection.get_peername)
 	end
 	
 	module UDPHandler
@@ -61,7 +61,8 @@ module RubyDNS
 		end
 		
 		def receive_data(data)
-			options = {:peer => RubyDNS::get_peer_details(self)}
+			peer_port, peer_ip = RubyDNS::get_peer_details(self)
+			options = {:peer => peer_ip}
 			
 			UDPHandler.process(@server, data, options) do |answer|
 				data = answer.encode
@@ -78,7 +79,8 @@ module RubyDNS
 					data = truncation_error.encode
 				end
 				
-				self.send_data(data)
+				# We explicitly use the ip and port given, because we found that send_data was unreliable in a callback.
+				self.send_datagram(data, peer_ip, peer_port)
 			end
 		end
 	end

data/lib/rubydns/resolver.rb

@@ -40,7 +40,8 @@ module RubyDNS
 
 		# Provides the next sequence identification number which is used to keep track of DNS messages.
 		def next_id!
-			return (@sequence += 1)
+			# Sequence IDs are 16-bit integers.
+			return (@sequence += 1) % (2**16)
 		end
 
 		# Look up a named resource of the given resource_class.
@@ -115,6 +116,8 @@ module RubyDNS
 			end
 			
 			def process_response!(response)
+				finish_request!
+				
 				if Exception === response
 					@logger.warn "[#{@message.id}] Failure while processing response #{exception}!" if @logger
 					RubyDNS.log_exception(@logger, response) if @logger
@@ -129,7 +132,7 @@ module RubyDNS
 					
 					try_next_server!
 				else
-					@logger.warn "[#{@message.id}] Received valid response #{response.inspect}" if @logger
+					@logger.debug "[#{@message.id}] Received valid response #{response.inspect}" if @logger
 					
 					succeed response
 				end
@@ -137,12 +140,17 @@ module RubyDNS
 			
 			private
 			
-			def try_next_server!
+			def finish_request!
+				cancel_timeout
+				
+				# Cancel an existing request if it is in flight:
 				if @request
 					@request.close_connection
 					@request = nil
 				end
-				
+			end
+			
+			def try_next_server!
 				if @servers.size > 0
 					@server = @servers.shift
 					
@@ -159,9 +167,11 @@ module RubyDNS
 					end
 					
 					# Setting up the timeout...
-					EventMachine::Timer.new(@timeout) do
+					timeout(@timeout) do
 						@logger.debug "[#{@message.id}] Request timed out!" if @logger
 						
+						finish_request!
+						
 						try_next_server!
 					end
 				else
@@ -189,7 +199,7 @@ module RubyDNS
 				def receive_data(data)
 					# Receiving response from remote DNS server...
 					message = RubyDNS::decode_message(data)
-						
+					
 					# The message id must match, and it can't be truncated:
 					@request.process_response!(message)
 				rescue Resolv::DNS::DecodeError => error

data/lib/rubydns/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module RubyDNS
-	VERSION = "0.6.5"
+	VERSION = "0.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexec