net-dhcp 1.0.2 → 1.1.0

data/.document

@@ -9,3 +9,5 @@ bin/*
 - 
 features/**/*.feature
 LICENSE
+README
+CHANGELOG

data/CHANGELOG

@@ -1,3 +1,7 @@
+*1.1.0
+
+* Added BroadcastAddressOption and cleaned up the output for some options to make them more readable [rakshasa]
+
 *1.0.2
 
 * Ensure chaddr is packed to the correct size (https://github.com/mjtko/net-dhcp-ruby/pull/1) [rakshasa]

data/lib/net-dhcp/version.rb

@@ -1,5 +1,5 @@
 module Net
   module Dhcp
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

data/lib/net/dhcp/core.rb

@@ -205,7 +205,7 @@ module DHCP
     def to_s
       out = "DHCP Message\r\n"
       out << "\tFIELDS:\r\n"
-      out << "\t\tTransaction ID = #{self.xid}\r\n"
+      out << "\t\tTransaction ID = 0x#{self.xid.to_s(16)}\r\n"
       out << "\t\tClient IP address = #{[self.ciaddr].pack('N').unpack('C4').join('.')}\r\n"
       out << "\t\tYour IP address = #{[self.yiaddr].pack('N').unpack('C4').join('.')}\r\n"      
       out << "\t\tNext server IP address = #{[self.siaddr].pack('N').unpack('C4').join('.')}\r\n"

data/lib/net/dhcp/options.rb

@@ -172,6 +172,25 @@ module DHCP
     end
   end
 
+  # This option specifies the broadcast address in use on the client's
+  # subnet.  Legal values for broadcast addresses are specified in
+  # section 3.2.1.3 of [4].
+  #
+  # The code for this option is 28, and its length is 4.
+  #
+  # The default value for this option is 255.255.255.255
+  class BroadcastAddressOption < Option
+    def initialize(params={})
+      params[:type] = $DHCP_BROADCASTADDR
+      params[:payload] = params.fetch(:payload, [255, 255, 255, 255])
+      super(params)
+    end
+
+    def to_s()
+      "Broadcast Adress = #{self.payload.join('.')}"
+    end
+  end
+
   # This option is used in a client request (DHCPDISCOVER) to allow the
   # client to request that a particular IP address be assigned.
   #
@@ -209,7 +228,10 @@ module DHCP
     end
 
     def to_s()
-      "IP Address Lease Time = #{self.payload.pack('C*').unpack('N').first} seg"
+      value = self.payload.pack('C*').unpack('N').first
+      value = "infinite" if value == 0xffffffff
+
+      "IP Address Lease Time = #{value} seg"
     end
   end
 
@@ -289,7 +311,7 @@ module DHCP
     end
 
     def to_s
-      "Parameter Request List = #{self.payload}"
+      "Parameter Request List = #{self.payload.join(',')}"
     end
   end
 
@@ -561,7 +583,7 @@ module DHCP
     $DHCP_MTUTABLE => Option,
     $DHCP_MTUSIZE => Option,
     $DHCP_LOCALSUBNETS => Option,
-    $DHCP_BROADCASTADDR => Option,
+    $DHCP_BROADCASTADDR => BroadcastAddressOption,
     $DHCP_DOMASKDISCOV => Option,
     $DHCP_MASKSUPPLY => Option,
     $DHCP_DOROUTEDISC => Option,

data/net-dhcp.gemspec

@@ -5,15 +5,16 @@ Gem::Specification.new do |s|
   s.name = 'net-dhcp'
   s.version = Net::Dhcp::VERSION
   s.platform = Gem::Platform::RUBY
-  s.date = "2011-12-06"
+  s.date = "2011-12-08"
   s.authors = ['daniel martin gomez (etd)', 'syonbori', 'Mark J. Titorenko']
   s.email = 'mark.titorenko@alces-software.com'
-  s.homepage = 'http://github.com/mjtko/net-dhcp'
+  s.homepage = 'http://github.com/mjtko/net-dhcp-ruby'
   s.summary = %Q{set of classes to low level handle the DHCP protocol}
   s.description = %Q{The aim of Net::DHCP is to provide a set of classes to low level handle the DHCP protocol (rfc2131, rfc2132, etc.). With Net::DHCP you will be able to craft custom DHCP packages and have access to all the fields defined for the protocol.}
   s.extra_rdoc_files = [
     'LICENSE',
     'README',
+    'CHANGELOG'
   ]
 
   s.required_rubygems_version = Gem::Requirement.new('>= 1.3.7')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-dhcp
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000 Z
+date: 2011-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70120488772720 !ruby/object:Gem::Requirement
+  requirement: &70241335055920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120488772720
+  version_requirements: *70241335055920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70120488772220 !ruby/object:Gem::Requirement
+  requirement: &70241335055440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120488772220
+  version_requirements: *70241335055440
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &70120488771700 !ruby/object:Gem::Requirement
+  requirement: &70241335054900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120488771700
+  version_requirements: *70241335054900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70120488771220 !ruby/object:Gem::Requirement
+  requirement: &70241335054440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120488771220
+  version_requirements: *70241335054440
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70120488770760 !ruby/object:Gem::Requirement
+  requirement: &70241335054000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120488770760
+  version_requirements: *70241335054000
 description: The aim of Net::DHCP is to provide a set of classes to low level handle
   the DHCP protocol (rfc2131, rfc2132, etc.). With Net::DHCP you will be able to craft
   custom DHCP packages and have access to all the fields defined for the protocol.
@@ -78,6 +78,7 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 - README
+- CHANGELOG
 files:
 - .document
 - .gitignore
@@ -99,7 +100,7 @@ files:
 - spec/net-dhcp_spec.rb
 - spec/spec_helper.rb
 - test/dhcp_test.rb
-homepage: http://github.com/mjtko/net-dhcp
+homepage: http://github.com/mjtko/net-dhcp-ruby
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -113,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3355116122344638198
+      hash: 2925178242952011714
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: