rubydns 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 204ba4e799634855d87e3a5b0d4969e17b7aafcf
-  data.tar.gz: 55f9a962495018de41eeb37656b61d2e9580e519
+  metadata.gz: 579892157e10443cf4e2959ff42da5f6d312a59b
+  data.tar.gz: eadc76b6e5c1bbc199aaecc6beae5ea6836ece29
 SHA512:
-  metadata.gz: 9a08e54d3e38cb82e735a65750dae55452c94115d28a1ea115452069afacb6ac978645de0dd25a547c65168703249df4a6f5bbb75254e8a4d5b1e368db58229d
-  data.tar.gz: 18220b387aec7b2b145f1af7760947b08aee115ab87a8e04fdbc34d0d230c0d49a3396c0252b3e87bf94d956982bba1aa905106f368059db6c286fbb42c03924
+  metadata.gz: 2dab4ccffd9bfc4d2ee23be3cee574f1925e152999e754ded886d80b9b45c427815ae7e02bafed735a454706ea76436f91f44f604fe2162198e2ea7a34e5dfbe
+  data.tar.gz: d4d47c5ed9316a1177d42a8cc403d690031c343e10bf0ab0a5b387d02ed8bcfaa91e5bb78c620134d65a18d7bf10233bff9e4269bd4be9dac53f0434b1ef3210

data/README.md

@@ -33,8 +33,8 @@ This is copied from `test/examples/test-dns-2.rb`. It has been simplified slight
 	require 'rubydns'
 
 	INTERFACES = [
-		[:udp, "0.0.0.0", 53],
-		[:tcp, "0.0.0.0", 53]
+		[:udp, "0.0.0.0", 5300],
+		[:tcp, "0.0.0.0", 5300]
 	]
 	Name = Resolv::DNS::Name
 	IN = Resolv::DNS::Resource::IN
@@ -42,26 +42,22 @@ This is copied from `test/examples/test-dns-2.rb`. It has been simplified slight
 	# Use upstream DNS for name resolution.
 	UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
 
-	def startup
-	    # Start the RubyDNS server
-	    RubyDNS::run_server(:listen => INTERFACES) do
-	        match(/test.mydomain.org/, IN::A) do |transaction|
-	            transaction.respond!("10.0.0.80")
-	        end
-
-	        # Default DNS handler
-	        otherwise do |transaction|
-	            transaction.passthrough!(UPSTREAM)
-	        end
-	    end
+	# Start the RubyDNS server
+	RubyDNS::run_server(:listen => INTERFACES) do
+		match(/test.mydomain.org/, IN::A) do |transaction|
+			transaction.respond!("10.0.0.80")
+		end
+
+		# Default DNS handler
+		otherwise do |transaction|
+			transaction.passthrough!(UPSTREAM)
+		end
 	end
-	run
 
-Start the server using `rvmsudo ./test.rb`. You can then test it using dig:
+Start the server using `./test.rb`. You can then test it using dig:
 
-	$ dig @localhost test1.mydomain.org
-	$ dig @localhost dev.mydomain.org
-	$ dig @localhost google.com
+	$ dig @localhost -p 5300 test.mydomain.org
+	$ dig @localhost -p 5300 google.com
 
 ### File Handle Limitations
 
@@ -127,7 +123,7 @@ The asynchronous deferred processing became the default and only method for proc
 
 	RubyDNS::run_server(:listen => SERVER_PORTS) do
 		match(/\.*.com/, IN::A) do |transaction|
-			# Won't block and won't continue until handle.resume is called.
+			# Won't block and won't continue until fiber.resume is called.
 			defer do |fiber|
 				# No domain exists, after 5 seconds:
 				EventMachine::Timer.new(5) do

data/lib/rubydns/handler.rb

@@ -96,9 +96,6 @@ module RubyDNS
 		end
 	end
 	
-	class LengthError < StandardError
-	end
-	
 	module TCPHandler
 		include Peername
 		
@@ -118,8 +115,9 @@ module RubyDNS
 			
 			# Message includes a 16-bit length field.. we need to see if we have received it yet:
 			if @length == nil
+				# Not enough data received yet...
 				if (@buffer.size - @processed) < 2
-					raise LengthError.new("Malformed message smaller than two bytes received")
+					return
 				end
 				
 				# Grab the length field:
@@ -149,7 +147,7 @@ module RubyDNS
 		# Check that all data received was processed.
 		def unbind
 			if @processed != @buffer.size
-				raise LengthError.new("Unprocessed data remaining (#{@buffer.size - @processed} bytes unprocessed)")
+				@server.logger.debug "Unprocessed data remaining (#{@buffer.size - @processed} bytes unprocessed) on incoming TCP connection."
 			end
 		end
 	end

data/lib/rubydns/server.rb

@@ -122,11 +122,29 @@ module RubyDNS
 		
 			# Setup server sockets
 			interfaces.each do |spec|
-				@logger.info "Listening on #{spec.join(':')}"
-				if spec[0] == :udp
-					EventMachine.open_datagram_socket(spec[1], spec[2], UDPHandler, self)
-				elsif spec[0] == :tcp
-					EventMachine.start_server(spec[1], spec[2], TCPHandler, self)
+				if spec.is_a?(BasicSocket)
+					spec.do_not_reverse_lookup
+					optval = spec.getsockopt(Socket::SOL_SOCKET, Socket::SO_TYPE)
+					protocol = optval.unpack("i")[0]
+					ip = spec.local_address.ip_address
+					port = spec.local_address.ip_port
+					case protocol
+					when Socket::SOCK_DGRAM
+						@logger.info "Attaching to pre-existing UDP socket #{ip}:#{port}"
+						EventMachine.attach(spec, UDPHandler, self)
+					when Socket::SOCK_STREAM
+						@logger.info "Attaching to pre-existing TCP socket #{ip}:#{port}"
+						EventMachine.attach(spec, TCPHandler, self)
+					else
+						@logger.error "Ignoring unknown socket protocol: #{protocol}"
+					end
+				else
+					@logger.info "Listening on #{spec.join(':')}"
+					if spec[0] == :udp
+						EventMachine.open_datagram_socket(spec[1], spec[2], UDPHandler, self)
+					elsif spec[0] == :tcp
+						EventMachine.start_server(spec[1], spec[2], TCPHandler, self)
+					end
 				end
 			end
 		

data/lib/rubydns/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine