smart_proxy_dhcp_dnsmasq 0.2 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca81d88bfc01f5d32e9f9d7f66eb08733398bcff
-  data.tar.gz: c4e8267c5565bbe70cb4b14fa823b834483ba9ad
+  metadata.gz: 97a5371cbd074b39c66bd23b907b1b31730beb0b
+  data.tar.gz: 47b63b6d25aca90f3dcf03d442efca03493084d8
 SHA512:
-  metadata.gz: 4bd06c6fc2e740ac185060fcf078c29b6b84268c082e105bc52d9b9d59d1cb78e4f03e190f2ac721330e82a292ca9d35f44feb7a45023caada9751dfa9b253a5
-  data.tar.gz: c60668a13949627062e03c5b5848522035f59fa0bda7df80d021ed5f33667ae6d756dc0b62d006e0afac751423fe3ebfa20bc581b25a53854880be9d13054213
+  metadata.gz: 5495631faaeaa74b84b6123fe2fb33f7f6bee3ec3f8b1a26e6901f70eee55bd31050b68ca50eb4afb94a46b5729ac8b636923a55c85365928280327ad8f9cf4d
+  data.tar.gz: 54d43f53f1a2d9d6bc1026d71dd5521060161da1d4d3ed13b27c365c8d0dbad0f019e179d377a241878aecee473fc28cb77c25b14d37328639a3a9abb7cd1793

data/lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_main.rb

@@ -4,12 +4,13 @@ require 'dhcp_common/server'
 
 module Proxy::DHCP::Dnsmasq
   class Record < ::Proxy::DHCP::Server
-    attr_reader :config_files, :write_config_file, :reload_cmd
+    attr_reader :config_files, :write_config_file, :reload_cmd, :subnet_service
 
     def initialize(config_files, write_config_file, reload_cmd, subnet_service)
       @config_files = config_files
       @write_config_file = write_config_file
       @reload_cmd = reload_cmd
+      @subnet_service = subnet_service
 
       subnet_service.load!
 
@@ -25,15 +26,21 @@ module Proxy::DHCP::Dnsmasq
         file.puts "dhcp-boot=tag:#{record.mac},#{options[:filename]},#{options[:nextServer]}" if\
           options[:filename] && options[:nextServer]
       end
+
+      subnet_service.add_host(record)
+
       raise Proxy::DHCP::Error, 'Failed to reload configuration' unless system(@reload_cmd)
 
       record
     end
 
     def del_record(record)
+      # TODO: Removal of leases, to prevent DHCP record collisions
+      return record if record.is_a? ::Proxy::DHCP::Lease
+
       found = false
       tmppath = nil
-      tmp = Tempfile.open('reservations') do |output|
+      Tempfile.open('reservations') do |output|
         tmppath = output.path.freeze
         open(@write_config_file, 'r').each_line do |line|
           output.puts line unless line.start_with?("dhcp-host=#{record.mac}") || \
@@ -44,13 +51,15 @@ module Proxy::DHCP::Dnsmasq
                           line.start_with?("dhcp-host=set:#{record.mac}")
         end
       end
-      FileUtils.mv(tmp, @write_config_file) if found
+      FileUtils.mv(tmppath, @write_config_file) if found
+
+      subnet_service.delete_host(record)
 
       raise Proxy::DHCP::Error, 'Failed to reload configuration' unless system(@reload_cmd)
 
       record
     ensure
-      File.unlink(tmppath) if File.exists?(tmppath)
+      File.unlink(tmppath) if tmppath && File.exists?(tmppath)
     end
   end
 end

data/lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_subnet_service.rb

@@ -1,5 +1,5 @@
 require 'ipaddr'
-require 'rb-inotify'
+#require 'rb-inotify'
 require 'dhcp_common/dhcp_common'
 require 'dhcp_common/subnet_service'
 
@@ -19,7 +19,7 @@ module Proxy::DHCP::Dnsmasq
     def load!
       add_subnet(parse_config_for_subnet)
       load_subnet_data
-      add_watch
+      #add_watch # TODO
 
       true
     end
@@ -31,7 +31,7 @@ module Proxy::DHCP::Dnsmasq
         next unless ev.absolute_name == lease_file
 
         leases = load_leases(subnet_service)
-        
+
         # FIXME: Proper method for this
         m.synchronize do
           leases_by_ip.clear
@@ -56,7 +56,7 @@ module Proxy::DHCP::Dnsmasq
             @lease_file = value
           when 'dhcp-range'
             data = value.split(',')
-            
+
             ttl = data.pop
             mask = data.pop
             range_to = data.pop
@@ -100,7 +100,7 @@ module Proxy::DHCP::Dnsmasq
 
     # Expects subnet_service to have subnet data
     def parse_config_for_dhcp_reservations(files = @config_files)
-      to_ret = []
+      to_ret = {}
       files.each do |file|
         open(file, 'r').each_line do |line|
           line.strip!
@@ -112,21 +112,35 @@ module Proxy::DHCP::Dnsmasq
             data = value.split(',')
             data.shift while data.first.start_with? 'set:'
 
-            mac, ip, hostname = data
+            mac, ip, hostname = data[0,3]
+
+            # TODO: Possible ttl on end
 
             subnet = find_subnet(ip)
-            to_ret << ::Proxy::DHCP::Reservation.new(
+            to_ret[mac] = ::Proxy::DHCP::Reservation.new(
               hostname,
               ip,
               mac,
               subnet,
-              :hostname => hostname,
-              :source_file => file
+#             :source_file => file # TODO: Needs to overload the comparison
             )
+          when 'dhcp-boot'
+            data = value.split(',')
+            if data.first.start_with? 'tag:'
+              mac = data.first[4..-1]
+              data.shift
+
+              next unless to_ret.key? mac
+
+              file, server = data
+
+              to_ret[mac].options[:nextServer] = file
+              to_ret[mac].options[:filename] = server
+            end
           end
         end
       end
-      to_ret
+      to_ret.values
     rescue Exception => e
       logger.error msg = "Unable to parse reservations: #{e}"
       raise Proxy::DHCP::Error, msg
@@ -134,10 +148,25 @@ module Proxy::DHCP::Dnsmasq
 
     def load_subnet_data
       reservations = parse_config_for_dhcp_reservations
-      reservations.each { |record| add_host(record.subnet_address, record) }
-      puts "Resevations:\n-  " + reservations.join("\n-  ")
-      leases = load_leases
-      leases.each { |lease| add_lease(lease.subnet_address, lease) }
+      reservations.each do |record|
+        if dupe = find_host_by_mac(record.subnet_address, record.mac)
+          delete_host(dupe)
+        end
+
+        add_host(record.subnet_address, record)
+      end
+
+      leases = [] # load_leases # FIXME: Will cause collisions if added
+      leases.each do |lease|
+        if dupe = find_lease_by_mac(lease.subnet_address, lease.mac)
+          delete_lease(dupe)
+        end
+        if dupe = find_lease_by_ip(lease.subnet_address, lease.ip)
+          delete_lease(dupe)
+        end
+
+        add_lease(lease.subnet_address, lease)
+      end
     end
 
     # Expects subnet_service to have subnet data
@@ -150,13 +179,15 @@ module Proxy::DHCP::Dnsmasq
 
         subnet = find_subnet(ip)
         leases << ::Proxy::DHCP::Lease.new(
-          client_id,
+          hostname,
           ip,
           mac,
           subnet,
           timestamp - (@ttl or 24*60*60),
           timestamp,
-          'active')
+          'active',
+          deleteable: false,
+        )
       end
       leases
     end

data/lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module DHCP
     module Dnsmasq
-      VERSION = '0.2'
+      VERSION = '0.4'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_dnsmasq
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.4'
 platform: ruby
 authors:
 - Alexander Olofsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake