lib-dhcp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 903661e700f93534c6a5901ec965da48261e5e97d399f812bff7aa8b9d990b9d
-  data.tar.gz: d2f9fb68a1171aa5812bfe5b7da0e9c4316ced431f24b33271d0704d61fda7d4
+SHA1:
+  metadata.gz: 53121146f58779b496d7c7c9e77e958c63acc29c
+  data.tar.gz: 52f05fc29b2759d0436b4585d96c5c9c96bccc23
 SHA512:
-  metadata.gz: 88a40896ce795cd16bea2836b2f9e3f8db1fd332b86c2a21ac34e72c0f2380cca86a112d6d369f9fd1b6e7ffdef50e0f64ce288289444a9691f39dda82e67582
-  data.tar.gz: ed34b5fdfd7f36dd3286765fcf10f89facedb02e5531fba4d15f26efffc1fbf4ed96a01d504c341a63f34656529f03ba713c855ca7bbdd40fb998a19e2dc3784
+  metadata.gz: 44aa6bc04389a95fd3ef79ca190bf6fa8bc383dc6dc8179792f7af91e3de0d8bf1c9be8744003323a8e227404f9e8d295b84aba9914dea57b1e4265ab8e0852c
+  data.tar.gz: '091386845addca0b7380db9aaed49921c23e9406ae77252f7e597ea719e05cc62addc15798b4beefc33ec27de8926831d8ee871e11dc19b86afe5ad60ae4f086'

data/.gitignore

@@ -7,4 +7,6 @@
 /spec/reports/
 /tmp/
 .idea/
-Gemfile.lock
+Gemfile.lock
+.DS_store
+*.gem

data/lib/lib/dhcp/messages/lease_query.rb

@@ -34,6 +34,7 @@ module Lib
             raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
           end
           self.options.add Lib::DHCP::Option53.new(LEASE_QUERY)
+
         end
 
         def pack
@@ -50,13 +51,42 @@ module Lib
           res
         end
 
+        def query_by_ip?
+          (ciaddr != 0) ? true : false
+        end
+
+        def query_by_mac?
+          (htype != 0 and hlen != 0 and chaddr != 0) ? true : false
+        end
+
+        def query_by_client_id?
+          option61.nil? ? false : true
+        end
+
         protected :op=
         # noinspection RubyResolve
         protected :option53=
 
         protected
         def sanity_check
-          #TODO LeaseQuery Sanity Check
+          if query_by_ip?
+            raise Lib::DHCP::SanityCheck::LeaseQuery, 'The values of htype, hlen, and chaddr MUST be set to zero '+
+                'in the query by IP' unless self.htype == 0 and self.hlen == 0  and self.chaddr == 0
+            raise Lib::DHCP::SanityCheck::LeaseQuery, 'The Client-identifier option (option 61) MUST NOT appear in the ' +
+                'query by IP'  unless self.option61.nil?
+          elsif query_by_mac?
+            raise Lib::DHCP::SanityCheck::LeaseQuery, 'The "ciaddr" field MUST be set to zero in the query ' +
+                'by MAC address' unless self.ciaddr == 0
+            raise Lib::DHCP::SanityCheck::LeaseQuery, 'The Client-identifier option (option 61) MUST NOT appear in the ' +
+                'query by MAC'  if self.option61
+          elsif query_by_client_id?
+            raise Lib::DHCP::SanityCheck::LeaseQuery, 'The "ciaddr" field MUST be set to zero in the query ' +
+                'by Client identifier' unless self.ciaddr == 0
+            raise Lib::DHCP::SanityCheck::LeaseQuery, 'The values of htype, hlen, and chaddr MUST be set to zero in ' +
+                'the query by Client identifier' unless self.htype == 0 or self.hlen == 0  and self.chaddr != 0
+          else
+            raise Lib::DHCP::SanityCheck::LeaseQuery, 'Unknown query type'
+          end
         end
       end
     end

data/lib/lib/dhcp/options/option.rb

@@ -140,6 +140,8 @@ module Lib
       STREET_TALK_DIRECTORY_SERVER= 0x4c
       USER_CLASS= 0x4d
       RELAY_AGENT = 0x52
+      CLIENT_LAST_TRANSACTION_TIME= 0x5b
+      ASSOCIATED_IP = 0x5c
       PRIVATE= 0xaf
       END_OPTION = 0xff
 
@@ -235,8 +237,8 @@ module Lib
           88 => 'BCMCS Controller Domain Name list',
           89 => 'BCMCS Controller IPv4 address list.',
           90 => 'Authentication',
-          91 => 'client-last-transaction-time',
-          92 => 'associated-ip',
+          91 => 'Client last transaction time',
+          92 => 'Associated IP',
           93 => 'Client System Architecture Type',
           119 => 'Domain Search',
           121 => 'Classless Static Route Option',

data/lib/lib/dhcp/options/option91.rb

@@ -10,8 +10,44 @@ require_relative 'type/raw'
 module Lib
   module DHCP
     class Option91 < Option
-      #TODO Option91
-      include Lib::DHCP::Option::Type::Raw
+      # This option allows the receiver to determine the time of the
+      # most recent access of the client.  It is particularly useful
+      # when DHCPLEASEACTIVE messages from two different DHCP servers
+      # need to be compared, although it can be useful in other
+      # situations.  The value is a duration in seconds from the
+      # current time into the past when this IP address was most
+      # recently the subject of communication between the client and
+      #     the DHCP server.
+      # The code for the this option is 91.  The length of the this option is 4 octets.
+
+      def_delegators :@payload, :to_s
+
+      def initialize(time)
+        super CLIENT_LAST_TRANSACTION_TIME, time.to_i
+      end
+
+      def payload=(time)
+        @payload = time.to_i
+      end
+
+      def pack
+        [@oid, 4, @payload].pack('C2N')
+      end
+
+      def len
+        4
+      end
+
+      alias_method :time, :payload
+      alias_method :time=, :payload=
+
+      private
+
+      def self.unpack(oid, len, payload)
+        raise ArgumentError, "OID Mismatch for #{NAME[oid]} - #{oid}" unless oid.to_i == CLIENT_LAST_TRANSACTION_TIME
+        raise ArgumentError, "Wrong #{NAME[oid]} length - #{len}" unless len == 4
+        self.new payload.unpack('N').first.to_i
+      end
     end
   end
 end

data/lib/lib/dhcp/options/option92.rb

@@ -5,13 +5,21 @@
 
 
 require_relative 'option'
-require_relative 'type/raw'
+require 'lib/dhcp/options/type/ip_array'
 
 module Lib
   module DHCP
     class Option92 < Option
-      #TODO Option92
-      include Lib::DHCP::Option::Type::Raw
+
+      # This option is used to return all of the IP addresses
+      # associated with the DHCP client specified in a particular DHCPLEASEQUERY message.
+      # The code for this option is 92.  The minimum length for this option is 4 octets,
+      # and the length MUST always be a multiple of 4.
+
+      include Type::IPArray
+
+      alias_method :associated_ip, :payload
+      alias_method :associated_ip=, :payload=
     end
   end
 end

data/lib/lib/dhcp/version.rb

@@ -1,5 +1,5 @@
 module Lib
   module DHCP
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lib-dhcp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Piotr Wojcieszonek
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -402,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: DHCP protocol library.