lib-dhcp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59b61676615cea1b59b8f92f5b1fa9ecc53d8895
-  data.tar.gz: dea9c87dc3501e3ed25e99868a3d26d15c3a91ed
+SHA256:
+  metadata.gz: 903661e700f93534c6a5901ec965da48261e5e97d399f812bff7aa8b9d990b9d
+  data.tar.gz: d2f9fb68a1171aa5812bfe5b7da0e9c4316ced431f24b33271d0704d61fda7d4
 SHA512:
-  metadata.gz: 40c382a59b8d03641246a822ea953ff7176e89df237d6d2477ea5cf138ca7549eed1813d12112e25ac6dfd1b0af658816b3f8d2c07aaa951fd1eb74bfb4fe5b6
-  data.tar.gz: f2c9e5b4692d13c53bd8a313a193d402cb0966b21dcc682d3e210c044beedcbe9819241335ae1fd3a74343f3c350d3357df7628bd0a3a566a4ec95f6b9566ff3
+  metadata.gz: 88a40896ce795cd16bea2836b2f9e3f8db1fd332b86c2a21ac34e72c0f2380cca86a112d6d369f9fd1b6e7ffdef50e0f64ce288289444a9691f39dda82e67582
+  data.tar.gz: ed34b5fdfd7f36dd3286765fcf10f89facedb02e5531fba4d15f26efffc1fbf4ed96a01d504c341a63f34656529f03ba713c855ca7bbdd40fb998a19e2dc3784

data/lib/lib/dhcp/options/option122.rb

@@ -19,34 +19,7 @@ module Lib
         oid = self.class.name.split('::').last.sub(/Option/, '').to_i
         sub_options = []
         sub_option.each do |sub|
-          if sub.is_a? Lib::DHCP::Option122::SubOption
-            opt = sub
-          elsif sub.is_a? Array
-            case sub[0].to_i
-              when 1
-                opt = Lib::DHCP::Option122::SubOption::Option1.new(sub[1])
-              when 2
-                opt = Lib::DHCP::Option122::SubOption::Option2.new(sub[1])
-              when 3
-                opt = Lib::DHCP::Option122::SubOption::Option3.new(sub[1])
-              when 4
-                opt = Lib::DHCP::Option122::SubOption::Option4.new(*sub[1])
-              when 5
-                opt = Lib::DHCP::Option122::SubOption::Option5.new(*sub[1])
-              when 6
-                opt = Lib::DHCP::Option122::SubOption::Option6.new(sub[1])
-              when 7
-                opt = Lib::DHCP::Option122::SubOption::Option7.new(sub[1])
-              when 8
-                opt = Lib::DHCP::Option122::SubOption::Option8.new(sub[1])
-              else
-                #raise ArgumentError, "Not implemented sub option #{sub[0]} for Option 122"
-                opt = Lib::DHCP::Option122::SubOption::Option.new(sub[0].to_i, sub[1])
-            end
-            #opt = Lib::DHCP::SubOption.new(sub[0], sub[1])
-          else
-            raise ArgumentError, 'Unknown SubOption parameter type'
-          end
+          opt = create_sub_option(sub)
           sub_options << opt
           define_singleton_method("option#{opt.oid.to_i}".to_sym) { opt }
           #define_singleton_method(:option1) {opt}
@@ -54,6 +27,10 @@ module Lib
         super oid, sub_options
       end
 
+      def add(sub_option)
+        @payload << create_sub_option(sub_option)
+      end
+
 
       def to_s
         #"Option #{@oid}, LEN #{self.len}, Value #{@payload.to_s}"
@@ -141,10 +118,10 @@ module Lib
                 @type = 1
                 @payload = tsp_server_address
               when String
-                if Net::Address::IPv4(tsp_server_address) == tsp_server_address.to_s
-                  @type = 1
+                begin
                   @payload = Net::Address::IPv4.new(tsp_server_address)
-                else
+                  @type = 1
+                rescue ArgumentError
                   @type = 0
                   @payload = tsp_server_address
                 end
@@ -161,16 +138,17 @@ module Lib
             if type == 1
               5
             else
-              @payload.to_s.split('.').map{|label| [label.length, label.unpack('C*')]}.flatten.size + 1
+              @payload.to_s.split('.').map{|label| [label.length, label.unpack('C*')]}.flatten.size + 2
+              #@payload.size + 1
             end
           end
 
           def pack
             if @type == 1
-              [2, self.len.to_i, @payload.to_i].pack('C2N')
+              [@oid.to_i, self.len.to_i, 1, @payload.to_i].pack('C3N')
             elsif @type == 0
               fqdn_encode = @payload.to_s.split('.').map{|label| [label.length, label.unpack('C*')]}.flatten
-              [2, fqdn_encode.size + 1,  *fqdn_encode,0].pack('C*')
+              [@oid.to_i, fqdn_encode.size + 2, 0, *fqdn_encode,0].pack('C*')
             else
               raise ArgumentError, 'Unknown TSP Provisioning Server Address type'
             end
@@ -336,6 +314,40 @@ module Lib
 
         end
       end
+
+      protected
+
+
+      def create_sub_option(option)
+        if option.is_a? Lib::DHCP::Option
+          option
+        elsif option.is_a? Array
+          case option[0].to_i
+            when 1
+              Lib::DHCP::Option122::SubOption::Option1.new(option[1])
+            when 2
+              Lib::DHCP::Option122::SubOption::Option2.new(option[1])
+            when 3
+              Lib::DHCP::Option122::SubOption::Option3.new(option[1])
+            when 4
+              Lib::DHCP::Option122::SubOption::Option4.new(*option[1])
+            when 5
+              Lib::DHCP::Option122::SubOption::Option5.new(*option[1])
+            when 6
+              Lib::DHCP::Option122::SubOption::Option6.new(option[1])
+            when 7
+              Lib::DHCP::Option122::SubOption::Option7.new(option[1])
+            when 8
+              Lib::DHCP::Option122::SubOption::Option8.new(option[1])
+            else
+              #raise ArgumentError, "Not implemented sub option #{sub[0]} for Option 122"
+              Lib::DHCP::Option122::SubOption::Option.new(option[0].to_i, option[1])
+          end
+        else
+          raise ArgumentError, 'Unknown SubOption for Option122'
+        end
+      end
+
     end
   end
 end

data/lib/lib/dhcp/options.rb

@@ -24,23 +24,23 @@ module Lib
       end
 
       def add(option)
-        if option.is_a? Array
-          @options << eval("Lib::DHCP::Option#{option[0]}").new(option[1])
-        elsif option.is_a? Option
-          @options << option
-        else
-          @options << Lib::DHCP::Option.unpack(option)
-        end
+        @options << create_option(option)
       end
 
       def []=(index, option)
-        if option.is_a? Array
-          @options[index] = eval("Lib::DHCP::Option#{option[0]}").new(option[1])
-        elsif option.is_a? Option
-          @options[index] = option
+        option = create_option(option)
+        if include?(option) and @options[index].oid != option.oid
+          @options[index] = option if option.oid == 0
         else
-          @options << Lib::DHCP::Option.unpack(option)
+          @options[index] = create_option(option)
         end
+
+      end
+
+      def include?(option)
+        return ! select(option.oid).empty? if option.is_a?(Option)
+        return ! select(option).empty? if option.is_a?(Integer)
+        false
       end
 
       def select(oid)
@@ -68,6 +68,20 @@ module Lib
         options
       end
 
+      protected
+
+      def create_option(option)
+        if option.is_a? Array
+          eval("Lib::DHCP::Option#{option[0].to_i}").new(option[1])
+        elsif option.is_a? Option
+          option
+        elsif option.is_a?(Integer) and (option == 0 or option == 255)
+          eval("Lib::DHCP::Option#{option.to_i}").new(option.to_i)
+        else
+          Lib::DHCP::Option.unpack(option)
+        end
+      end
+
     end
   end
 end

data/lib/lib/dhcp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lib-dhcp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Piotr Wojcieszonek
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-13 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.6.14
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: DHCP protocol library.