net-dhcp 1.1.1 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 084b32f482d254159e2d66d8d5baa30ffb925fd9
+  data.tar.gz: 1d3a98623bd9bc5f9e45f460b25e3c476c56459f
+SHA512:
+  metadata.gz: d110ea9681c2cadb72948fe3178d1b6e270e6335c972139433e5460f3a9d368a47fab20bab591fb1c8f5db310f33c546afbec054e58d11735d96d2a0e734c467
+  data.tar.gz: fc80df66795f01a9e5c855a3fac7f20d43799b92c1a9120f8a3ea52dc45dc7417e617a56888f33a95a2cbed4099f0fea5020c9ca57c153d1c73ec5adae8179bc

data/CHANGELOG

@@ -1,3 +1,9 @@
+*1.2.0
+
+* Fix Array handling for message payloads [presto53]
+* Use a raise syntax that isn't archaic [presto53]
+* Depend on simplecov rather than rcov for Ruby 1.9+ compat [mjtko]
+
 *1.1.1
 
 * Replace incorrect equality check with assignment in Message#from_udp_payload to correct behaviour when an unrecognised option or message is encountered [mjtko]
@@ -20,4 +26,4 @@
 
 *1.0.0
 
-* Initial release to rubygems - originally authored by etd, migrated to github by syonbori, gemified by mjtko. [mjtko]
+* Initial release to rubygems - originally authored by etd, migrated to github by syonbori, gemified by mjtko. [mjtko]

data/lib/net-dhcp/version.rb

@@ -1,5 +1,5 @@
 module Net
   module Dhcp
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/lib/net/dhcp/core.rb

@@ -29,6 +29,7 @@ module DHCP
     attr_accessor :xid
     attr_accessor :secs, :flags
     attr_accessor :ciaddr, :yiaddr, :siaddr, :giaddr, :chaddr
+    attr_accessor :sname, :fname
     attr_accessor :options
 
     alias == eql?
@@ -50,11 +51,13 @@ module DHCP
         :yiaddr => values.shift,
         :siaddr => values.shift,
         :giaddr => values.shift,
-        :chaddr => values.slice!(0..15)
+        :chaddr => values.slice!(0..15),
+        :sname => values.slice!(0..63),
+        :fname => values.slice!(0..127),
       }
       
-      # sname and file
-      not_used = values.slice!(0..191)
+      # sname and file are now used
+      #not_used = values.slice!(0..191) 127+63 190
       
       return nil unless ($DHCP_MAGIC == values.shift)
       
@@ -64,7 +67,6 @@ module DHCP
       opt_class = Option
       
       params[:options] = []
-      
       next_opt = values.shift
       while(next_opt != $DHCP_END)
         p = {
@@ -106,7 +108,7 @@ module DHCP
       # message operation and options. We need at least an operation and a 
       # MessageTypeOption to create a DHCP message!!
       if (([:op, :options]  & params.keys).size != 2)
-        raise ArgumentError('you need to specify at least values for :op and :options') 
+        raise ArgumentError, 'you need to specify at least values for :op and :options'
       end
       
       self.op = params[:op]
@@ -117,7 +119,7 @@ module DHCP
         next unless opt.class == MessageTypeOption
         found = true
       end
-      raise ArgumentError(':options must include a MessageTypeOption') unless found
+      raise ArgumentError, ':options must include a MessageTypeOption' unless found
     
       #hardware type and length of the hardware address
       self.htype = params.fetch(:htype, $DHCP_HTYPE_ETHERNET)
@@ -148,7 +150,34 @@ module DHCP
         self.chaddr = [mac].pack('H*').unpack('CCCCCC')
         self.chaddr += [0x00]*(16-self.chaddr.size)
       end
-    
+
+      if (params.key?(:sname))
+        sname = params[:sname]
+        case 
+        when sname.size == 64
+          self.sname = sname
+        when sname.size < 64 && sname.class == String
+          self.sname = sname.unpack('C64').map {|x| x ? x : 0}
+        else
+          raise 'sname field should be of 64 bytes or a string of less'
+        end
+      else
+        self.sname = [0x00]*64
+      end
+
+      if (params.key?(:fname))
+        fname = params[:fname]
+        case 
+        when fname.size == 128
+          self.fname = fname
+        when fname.size < 128 && fname.class == String
+          self.fname = fname.unpack('C128').map {|x| x ? x : 0}
+        else
+          raise 'fname field should be of 128 bytes or a string of less'
+        end
+      else
+        self.fname = [0x00]*128
+      end
       
     end
   
@@ -168,9 +197,12 @@ module DHCP
       else
         out << (self.chaddr + [0x00]*(16-self.chaddr.size)).pack('C16')
       end
-      
+      # file_name/server_name for pxe
+      out << self.sname.pack('C64')
+      out << self.fname.pack('C128')
+    
       # sname and file
-      out << ([0x00]*192).pack('C192')
+      # out << ([0x00]*192).pack('C192')
     
       out << [$DHCP_MAGIC].pack('N')
       self.options.each do |option|
@@ -217,6 +249,8 @@ module DHCP
       out << "\t\tNext server IP address = #{[self.siaddr].pack('N').unpack('C4').join('.')}\r\n"
       out << "\t\tRelay agent IP address = #{[self.giaddr].pack('N').unpack('C4').join('.')}\r\n"      
       out << "\t\tHardware address = #{self.chaddr.slice(0..(self.hlen-1)).collect do |b| b.to_s(16).upcase.rjust(2,'0') end.join(':')}\r\n"
+      out << "\t\tServer Name = #{self.sname.pack('n*').unpack('A*')}\r\n"
+      out << "\t\tFile Name = #{self.fname.pack('n*').unpack('A*')}\r\n"
       out << "\tOPT:\r\n"
       self.options.each do |opt|
         out << "\t\t #{opt.to_s}\r\n"
@@ -244,7 +278,7 @@ module DHCP
     def initialize(params={})
       params[:op] = $DHCP_OP_REPLY
       params[:options] = params.fetch(:options, [
-      MessageTypeOption.new({:payload=>$DHCP_MSG_OFFER}), 
+      MessageTypeOption.new({:payload=>[$DHCP_MSG_OFFER]}), 
       ServerIdentifierOption.new,
       DomainNameOption.new
       ])
@@ -259,7 +293,7 @@ module DHCP
   class Request < Message
     def initialize(params={})
       params[:op] = $DHCP_OP_REQUEST
-      params[:options] = params.fetch(:options, [MessageTypeOption.new({:payload=>$DHCP_MSG_REQUEST}), ParameterRequestListOption.new])
+      params[:options] = params.fetch(:options, [MessageTypeOption.new({:payload=>[$DHCP_MSG_REQUEST]}), ParameterRequestListOption.new])
       super(params)
     end
   end
@@ -277,7 +311,7 @@ module DHCP
     def initialize(params={})
       params[:op] = $DHCP_OP_REPLY
       params[:options] = params.fetch(:options, [
-      MessageTypeOption.new({:payload=>$DHCP_MSG_ACK}), 
+      MessageTypeOption.new({:payload=>[$DHCP_MSG_ACK]}), 
       ServerIdentifierOption.new,
       DomainNameOption.new
       ])
@@ -297,7 +331,7 @@ module DHCP
     def initialize(params={})
       params[:op] = $DHCP_OP_REQUEST
       params[:options] = params.fetch(:options, [
-      MessageTypeOption.new({:payload=>$DHCP_MSG_RELEASE}), 
+      MessageTypeOption.new({:payload=>[$DHCP_MSG_RELEASE]}), 
       ServerIdentifierOption.new
       ])
       super(params)
@@ -309,7 +343,7 @@ module DHCP
   class Inform < Message
     def initialize(params={})
       params[:op] = $DHCP_OP_REQUEST
-      params[:options] = params.fetch(:options, [MessageTypeOption.new({:payload=>$DHCP_MSG_INFORM}), ParameterRequestListOption.new])
+      params[:options] = params.fetch(:options, [MessageTypeOption.new({:payload=>[$DHCP_MSG_INFORM]}), ParameterRequestListOption.new])
       super(params)
     end
   end

data/lib/net/dhcp/options.rb

@@ -33,7 +33,7 @@ module DHCP
     def initialize(params = {})
       # We need a type, and a payload
       if (([:type, :payload] & params.keys).size != 2)
-        raise ArgumentError('you need to specify values for :type and :payload')
+        raise ArgumentError, 'you need to specify values for :type and :payload'
       end
 
       self.type = params[:type]
@@ -252,6 +252,7 @@ module DHCP
   #
   # The default value is 1 (DHCPDISCOVER)
   class MessageTypeOption < Option
+    #DEBUG
     def initialize(params={})
       params[:type] = $DHCP_MESSAGETYPE
       params[:payload] = params.fetch(:payload, [$DHCP_MSG_DISCOVER])
@@ -509,7 +510,7 @@ module DHCP
     end
 
     def to_s
-      "UserClassInformation = #{self.payload}"
+      "UserClassInformation = #{self.payload.pack('C*')}"
     end
   end
 

data/net-dhcp.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name = 'net-dhcp'
   s.version = Net::Dhcp::VERSION
   s.platform = Gem::Platform::RUBY
-  s.date = "2012-01-21"
+  s.date = "2014-01-02"
   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-ruby'
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'bueller'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rcov'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'rdoc'
 end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-dhcp
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - daniel martin gomez (etd)
@@ -11,63 +10,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70354871060620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354871060620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70354871060140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354871060140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &70354871059700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354871059700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70354871059240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354871059240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70354871058740 !ruby/object:Gem::Requirement
-    none: false
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354871058740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 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.
@@ -80,8 +108,8 @@ extra_rdoc_files:
 - README
 - CHANGELOG
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -102,28 +130,24 @@ files:
 - test/test_dhcp.rb
 homepage: http://github.com/mjtko/net-dhcp-ruby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2659112004771839654
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 3
 summary: set of classes to low level handle the DHCP protocol