lib-dhcp 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d294d8dc521a8212ee9319d9f95d30a2f456afec63a35a276199526d761c774
-  data.tar.gz: b9e62cd800c55387539b3d8ef7261de549a03af98039af7c1fbbf4e7f2f4be95
+  metadata.gz: 43a9da83b7dd82429f766e5d142f0918a2f5bd823695d54583e04e8be6293bd4
+  data.tar.gz: 3b5b782fddf0c68f0949ebf02b3e5d5f5c7cc3b1c04a5a21cd8a4c248be42c24
 SHA512:
-  metadata.gz: 9c0e3b4991c7a66c0cd6baee5acf2a181a43de50178861366c27aa0acd0a121ea12e8ffb8ada0a1f651bb80a62835a6d801ee9a035c7191cd144d48e2c3cd56d
-  data.tar.gz: ce15d018af45026885db14e5cbc8a45b430bedfe69a76b30b6dad9102ddd946f2b6c15ac53e8ee045d7d532e4cf4c8d012f35ee73cc89675586ac1dccb3626ca
+  metadata.gz: 8c099424600a5bf373a0518ca8f5ad0687db9a42ee7f1f687664826bce04d193b38812238334e6a0ce11eec93a0d2eb4ea1996df657fd2989a9ed48830dd3edf
+  data.tar.gz: 99e3916d6e1a28792408f4885528ba1b00573aff88bef6336ed6033eb1818a83ea00d59cfbfd371811306100817c57b0c86dc98ee75be6a32925c46d57b9807b

data/.github/workflows/run-test.yml

@@ -0,0 +1,20 @@
+name: Run Tests
+
+on: [ push, pull_request ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+
+      - name: Install dependencies
+        run: bundle install
+
+      - name: Run tests
+        run: bundle exec rake test

data/.ruby-version

@@ -1 +1 @@
-ruby-3.1.1
+truffleruby-22.3.1

data/lib/lib/dhcp/messages/ack.rb

@@ -4,13 +4,17 @@
 
 
 require 'lib/dhcp'
+require 'json'
 
 module Lib
   module DHCP
     class Message
       class ACK < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op     => BOOTREPLY,
               :htype  => htype,
               :hlen   => hlen,
@@ -25,13 +29,14 @@ module Lib
               :chaddr => chaddr,
               :sname  => sname,
               :file   => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
 
           self.options.add Lib::DHCP::Option53.new(ACKNOWLEDGE)

data/lib/lib/dhcp/messages/decline.rb

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class Decline < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op => BOOTREQUEST,
               :htype => htype,
               :hlen => hlen,
@@ -25,14 +28,16 @@ module Lib
               :chaddr => chaddr,
               :sname => sname,
               :file => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
+
           self.options.add Lib::DHCP::Option53.new(DECLINE)
         end
 

data/lib/lib/dhcp/messages/discover.rb

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class Discover < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options:nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op     => BOOTREQUEST,
               :htype  => htype,
               :hlen   => hlen,
@@ -25,13 +28,14 @@ module Lib
               :chaddr => chaddr,
               :sname  => sname,
               :file   => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
           self.options.add Lib::DHCP::Option53.new(DISCOVER)
         end

data/lib/lib/dhcp/messages/inform.rb

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class Inform < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op => BOOTREQUEST,
               :htype => htype,
               :hlen => hlen,
@@ -25,13 +28,14 @@ module Lib
               :chaddr => chaddr,
               :sname => sname,
               :file => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
           self.options.add Lib::DHCP::Option53.new(INFORM)
         end

data/lib/lib/dhcp/messages/lease_active.rb

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class LeaseActive < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op => BOOTREPLY,
               :htype => htype,
               :hlen => hlen,
@@ -25,13 +28,14 @@ module Lib
               :chaddr => chaddr,
               :sname => sname,
               :file => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
 
           self.options.add Lib::DHCP::Option53.new(LEASE_ACTIVE)

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

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class LeaseQuery < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op => BOOTREQUEST,
               :htype => htype,
               :hlen => hlen,
@@ -25,16 +28,16 @@ module Lib
               :chaddr => chaddr,
               :sname => sname,
               :file => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
           self.options.add Lib::DHCP::Option53.new(LEASE_QUERY)
-
         end
 
         def pack

data/lib/lib/dhcp/messages/lease_unassigned.rb

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class LeaseUnassigned < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op => BOOTREPLY,
               :htype => htype,
               :hlen => hlen,
@@ -25,13 +28,14 @@ module Lib
               :chaddr => chaddr,
               :sname => sname,
               :file => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
           self.options.add Lib::DHCP::Option53.new(LEASE_UNASSIGNED)
         end

data/lib/lib/dhcp/messages/lease_unknown.rb

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class LeaseUnknown < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op => BOOTREPLY,
               :htype => htype,
               :hlen => hlen,
@@ -25,13 +28,14 @@ module Lib
               :chaddr => chaddr,
               :sname => sname,
               :file => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
           self.options.add Lib::DHCP::Option53.new(LEASE_UNKNOWN)
         end

data/lib/lib/dhcp/messages/message.rb

@@ -270,11 +270,6 @@ module Lib
         super
       end
 
-      # protected :op=
-      # # noinspection RubyResolve
-      # protected :option53=
-
-
       protected
 
       def sanity_check

data/lib/lib/dhcp/messages/nack.rb

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class NACK < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op => BOOTREPLY,
               :htype => htype,
               :hlen => hlen,
@@ -25,13 +28,14 @@ module Lib
               :chaddr => chaddr,
               :sname => sname,
               :file => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
           self.options.add Lib::DHCP::Option53.new(NOT_ACKNOWLEDGE)
         end

data/lib/lib/dhcp/messages/offer.rb

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class Offer < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op => BOOTREPLY,
               :htype => htype,
               :hlen => hlen,
@@ -25,13 +28,14 @@ module Lib
               :chaddr => chaddr,
               :sname => sname,
               :file => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
           self.options.add Lib::DHCP::Option53.new(OFFER)
         end

data/lib/lib/dhcp/messages/release.rb

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class Release < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op     => BOOTREQUEST,
               :htype  => htype,
               :hlen   => hlen,
@@ -25,13 +28,14 @@ module Lib
               :chaddr => chaddr,
               :sname  => sname,
               :file   => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
           self.options.add Lib::DHCP::Option53.new(RELEASE)
         end

data/lib/lib/dhcp/messages/request.rb

@@ -9,8 +9,11 @@ module Lib
   module DHCP
     class Message
       class Request < Message
-        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: , sname: '.', file: '.', options: nil)
-          super(
+        def initialize(htype: 1, hlen: 6, hops: 0, xid: nil, secs: 0, flags: 0, ciaddr: 0, yiaddr: 0, siaddr: 0, giaddr: 0, chaddr: 0, sname: '.', file: '.', options: nil)
+          if block_given?
+            yield self
+          else
+            super(
               :op => BOOTREQUEST,
               :htype => htype,
               :hlen => hlen,
@@ -25,13 +28,14 @@ module Lib
               :chaddr => chaddr,
               :sname => sname,
               :file => file
-          )
-          if options.is_a? Array or options.is_a? Lib::DHCP::Options
-            options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
-          elsif options.is_a? Lib::DHCP::Option
-            self.options.add options
-          elsif !options.nil?
-            raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            )
+            if options.is_a? Array or options.is_a? Lib::DHCP::Options
+              options.each { |option| self.options.add option unless option.oid.to_i == Option::MESSAGE_TYPE }
+            elsif options.is_a? Lib::DHCP::Option
+              self.options.add options
+            elsif !options.nil?
+              raise TypeError, "Can't convert #{options.class.name} to Lib::DHCP::Option"
+            end
           end
           self.options.add Lib::DHCP::Option53.new(REQUEST)
         end

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

@@ -45,6 +45,24 @@ module Lib
         NAME[@oid.to_i]
       end
 
+      def to_json(*params)
+        self.to_h.to_json
+      end
+
+      def to_h
+        {
+          name: self.name,
+          oid: self.oid.to_i,
+          len: self.len,
+          value: self.value.respond_to?(:map) ? self.value.map { |v| v.respond_to?(:to_h) ? v.to_h : v } : self.value
+        }
+      end
+
+      def self.from_json(json)
+        json = json.is_a?(Hash) ? json : JSON.parse(json)
+        self.new(json.transform_keys(&:to_sym)[:oid], json.transform_keys(&:to_sym)[:value])
+      end
+
       def self.unpack(packet)
         oid, len = packet.unpack('C2')
         payload = nil

data/lib/lib/dhcp/options/option53.rb

@@ -11,8 +11,6 @@ module Lib
       # DHCP MESSAGE TYPE - This option is used to convey the type of the DHCP message.
       # The code for this option is 53, and its length is 1.
 
-      def_delegators :@payload, :to_s
-
       def initialize(message_type)
         raise ArgumentError, "Illegal value for DHCP Message Type = #{message_type}" unless (1..255).include? message_type.to_i
         super MESSAGE_TYPE, message_type.to_i

data/lib/lib/dhcp/options.rb

@@ -3,6 +3,7 @@
 # Copyright 22.12.2017 by Piotr Wojcieszonek
 
 require 'forwardable'
+require 'json'
 
 module Lib
   module DHCP
@@ -24,7 +25,15 @@ module Lib
       end
 
       def add(option)
-        @options << create_option(option)
+        option = begin
+                   JSON.parse(option)
+                 rescue JSON::ParserError
+                   option
+                 rescue TypeError
+                   option
+                 end
+        option = create_option(option)
+        @options << option unless self.include? option
       end
 
       def []=(index, option)
@@ -63,7 +72,6 @@ module Lib
           options << option
           break if option.oid == Lib::DHCP::Option::END_OPTION
           offset += (option.len.to_i + 2)
-          #(option.oid == 0 or option.oid == 255) ? offset += (option.len.to_i + 1) : offset += (option.len.to_i + 2)
         end
         options
       end
@@ -72,11 +80,13 @@ module Lib
 
       def create_option(option)
         if option.is_a? Array
-          eval("Lib::DHCP::Option#{option[0].to_i}").new(option[1])
+          Lib::DHCP.const_get("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)
+          Lib::DHCP.const_get("Option#{option.to_i}").new
+        elsif option.is_a? Hash
+          Lib::DHCP.const_get("Option#{option.transform_keys(&:to_sym)[:oid].to_i}").new(option.transform_keys(&:to_sym)[:value])
         else
           Lib::DHCP::Option.unpack(option)
         end

data/lib/lib/dhcp/packet.rb

@@ -29,6 +29,10 @@ module Lib
 
       end
 
+      def to_h
+        super.merge({ options: self.options.map(&:to_h) })
+      end
+
       def option0
         self.options.select 0
       end
@@ -57,6 +61,16 @@ module Lib
         @options ||= Lib::DHCP::Options.new
       end
 
+      def options=(opt)
+        if opt.respond_to? :each
+          opt.each do |option|
+            self.options.add(option)
+          end
+        else
+          self.options.add opt
+        end
+      end
+
       def self.unpack(packet)
         bootp, cookie, options = packet.unpack('a236Na*')
         raise RuntimeError, "Magick-Cookie mismatch #{cookie.to_i.to_s(16)}" unless cookie.to_i == MAGICK_COOKIE.to_i
@@ -65,6 +79,12 @@ module Lib
         dhcp
       end
 
+      # def self.from_json(json)
+      #   #json = json.is_a?(Hash) ? json : JSON.parse(json)
+      #   super
+      #   #self.options = json['options']
+      # end
+
       def pack
         # TODO Max Message Size support
         dhcp_message = super # BOOTP Header

data/lib/lib/dhcp/version.rb

@@ -1,5 +1,5 @@
 module Lib
   module DHCP
-    VERSION = '0.1.8'
+    VERSION = '0.2.0'
   end
 end

data/lib-dhcp.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'
 
-  spec.add_dependency 'lib-bootp', '~> 0.1'
-  spec.add_dependency 'net-address', '~> 0.1'
+  spec.add_dependency 'lib-bootp', '~> 0.2.5'
+  spec.add_dependency 'net-address', '~> 0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lib-dhcp
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Piotr Wojcieszonek
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-13 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: net-address
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.2
 description: Set of classes to low level handle the BOOTP protocol.
 email:
 - piotr@wojcieszonek.pl
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/gem-push.yml"
+- ".github/workflows/run-test.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
@@ -388,7 +389,7 @@ homepage: https://github.com/pwojcieszonek/lib-dhcp
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -403,8 +404,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: DHCP protocol library.
 test_files: []