mdns 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e2638bae0d324a550c85d5c5b8519dd5527b2f0
-  data.tar.gz: aa01339a607bf1302048356f3ab046d955e3c683
+  metadata.gz: 12ad2e36655336efcfa1c4f71458e14ccbd56c88
+  data.tar.gz: 8edc276f5c5810161799a3488aaa16a75f57bd6a
 SHA512:
-  metadata.gz: 62ac49d8125a15e71e729ee7d2408d06dddad23084b9c4771993948380ba6409a159f7244635dae54052c5d8ceab067cd65139dc20b34d1446aed4649adff533
-  data.tar.gz: e959144ac34d8893f79c85e44512fcbb83c88d33e6530e089e4413f78d08c280056d5ffc5be77ebdb961c5144b4ae806e4099030535870c2ad5a3a5ca82bf4c9
+  metadata.gz: 7dfd3297ca2dc3de61fecdf447570082dd9612edacc53d2746309c7f50ef7c8815fb399f18bf7da9d6f4e647fa12d65be4d34c22935df1ef78c260ee9be64891
+  data.tar.gz: 1c5bd92cbacd952eb440a40a761a2e7c852435c8ee90e38106e2737d6c2760d8acb812d6d93c88f4fc99ea5de0ec7b014d68b70222d881d2569d287431d789ff

data/README.md

@@ -30,17 +30,19 @@ Or install it yourself as:
 
 ```ruby
 require "mdns"
-MDNS.add_record(Net::DNS::RR.new("leet.local. 60 A 10.0.13.37")) # Add a record for leet.local to resolve to 10.0.13.37 with a TTL of 60 seconds
-MDNS.add_record("leet.local. 60 A 10.0.13.37"))                  # Can pass in a string too
-
+MDNS.add_record("leet.local", 60, "10.0.13.37") # Add a record for leet.local to resolve to 10.0.13.37 with a TTL of 60 seconds
 MDNS.start                                                       # Start listening
 ```
 
 ## Caveats
 
-* Does not "unpublish" a record when stopping. Couldn't seem to find an example response.
+* Does not "unpublish" a record when stopping.
 * Only supports A records
 
+## Contributing
+
+Contributions greatly appreciated! Fork and send a pull request.
+
 ## License
 
 The MIT License (MIT)

data/lib/mdns.rb

@@ -1,10 +1,13 @@
 require "mdns/version"
-require "net/dns"
+require "resolv"
+require "ipaddr"
 
 class MDNS
   MULTICAST_IP = '224.0.0.251'
   MDNS_PORT = 5353
 
+  class Record < Struct.new(:host, :ttl, :ip); end
+
   class << self
     def start
       @socket = UDPSocket.new
@@ -19,21 +22,24 @@ class MDNS
       @thr = Thread.new do
         loop do
           data = @socket.recv(1024)
-          next unless data[0...4] == "\x00\x00\x00\x00" # Filter out non-queries
           packet = begin
-            Net::DNS::Packet::parse(data)
-          rescue => e
-            # Net::DNS::Packet doesn't handle a bunch of mDNS packets
+            Resolv::DNS::Message.decode(data)
+          rescue Resolv::DNS::DecodeError
           end
           next if packet.nil?
-          if packet.header.query? && packet.question.any? { |q| hosts.include?(q.qName.downcase) && q.qType.to_s == 'A' }
-            respond_to(packet)
+          if packet.qr == 0
+            hosts = packet.question.map(&:first).map(&:to_s)
+            matches = self.hosts & hosts
+            matches.each do |host|
+              respond(records[host])
+            end
           end
         end
       end
 
+      # Broadcast records
       records.values.each do |record|
-        respond_with(record)
+        respond(record)
       end
 
       at_exit do
@@ -41,28 +47,23 @@ class MDNS
       end
     end
 
-    def respond_to(query)
-      record = records[query.question.first.qName.downcase]
-      respond_with(record)
-    end
-
-    def respond_with(record)
+    def respond(record)
+      return if !@socket || @socket.closed?
       # I have no idea what I'm doing
-      response = Net::DNS::Packet.new(record.name)
-      response.header.qr = true
-      response.header.aa = true
-      response.header.anCount = 1
-      response.header.arCount = 1
-      response.answer = record
-      @socket.send(response.data, 0, MULTICAST_IP, MDNS_PORT)
+      response        = Resolv::DNS::Message.new
+      response.qr     = 1
+      response.opcode = 0
+      response.aa     = 1
+      response.rd     = 0
+      response.ra     = 0
+      response.rcode  = 0
+      response.add_answer(record.host, record.ttl, Resolv::DNS::Resource::IN::A.new(record.ip))
+      @socket.send(response.encode, 0, MULTICAST_IP, MDNS_PORT)
     end
 
-    def add_record(record)
-      if record.is_a?(String)
-        record = Net::DNS::RR.new(record)
-      end
-      records[record.name.downcase] = record
-      respond_with(record) if @socket && !@socket.closed?
+    def add_record(host, ttl, ip)
+      records[host] = Record.new(host, ttl, ip)
+      respond(records[host])
     end
 
     def records
@@ -88,4 +89,4 @@ class MDNS
       end
     end
   end
-end
+end

data/lib/mdns/version.rb

@@ -1,3 +1,3 @@
 class MDNS
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/mdns.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "net-dns", "~> 0.8"
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/spec/mdns_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'resolv'
 
 describe MDNS do
-  let(:domain) { "foo-bar-#{rand(1000)}.local." }
+  let(:host) { "foo-bar-#{rand(1000)}.local." }
   let(:ip) { "10.10.10.10" }
 
   before do
@@ -14,35 +14,20 @@ describe MDNS do
     context "MDNS not running" do
       it "does not resolve" do
         expect do
-          Socket.gethostbyname(domain)
+          Socket.gethostbyname(host)
         end.to raise_error(SocketError)
       end
     end
 
     context "MDNS is running" do
       before do
-        MDNS.add_record(Net::DNS::RR.new("#{domain} 60 A #{ip}"))
+        MDNS.add_record(host, 120, ip)
         MDNS.start
       end
 
       it "does resolve" do
-        expect(Socket.gethostbyname(domain)).to be_a(Array)
+        expect(IPSocket.getaddress(host)).to eq(ip)
       end
     end
   end
-
-  describe '.add_record' do
-    it "takes a string" do
-      MDNS.add_record("#{domain} 60 A #{ip}")
-      expect(MDNS.records.keys).to eq([domain])
-      expect(MDNS.records.values.first).to be_a(Net::DNS::RR)
-    end
-
-    it "takes a Net::DNS::RR" do
-      MDNS.add_record(Net::DNS::RR.new("#{domain} 60 A #{ip}"))
-      expect(MDNS.records.keys).to eq([domain])
-      expect(MDNS.records.values.first).to be_a(Net::DNS::RR)
-    end
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdns
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Jack Chen (chendo)
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: net-dns
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement