openflow-protocol 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fc576ecfced9806622867b9ec63625e0547bd50
-  data.tar.gz: ed90aa37d49475ab047c38ae85863ba1f3b8d850
+  metadata.gz: cd2320d8d023f99591849dcddf65d34d027d456a
+  data.tar.gz: 6308d93b14a0dc921a31cd2f95ddb077648bf675
 SHA512:
-  metadata.gz: 679d1d48ba8ee8f06b36d03a2bc0b626b38f8d203c22bdcadc38c34964171011c734427caab89e71d3dfdeaa63d75cda72cfa623b2b22a9ec418183664d7b97c
-  data.tar.gz: 942c5502894b36f8de79c5b5866d129e25587657dbf6102337616dc242534e78432199323ad5df1249ff56c0aea28dba7489a8f7039e77847cb49c91ce069fc2
+  metadata.gz: 4a9d598eb11bdbbb763b4e10f9e33c43f6ec05f39f703f27df273783966cd08f2de81bde050e51b54d04a9d7cb6f5ba4dc13b00b38d9316982b1e22476c69f14
+  data.tar.gz: e01191ffec81b3c5913e28eee27f9f5abc9188f7d331a9717b41e24dd5c074e1abed87e467272c79c2e84e06a322a65ee356392f275cec6130e72db85c207497

data/lib/actions/action_set_ip_source.rb

@@ -1,7 +1,7 @@
 require_relative 'action'
 
 class OFActionSetIpSource < OFAction
-  ip_address :ip_address
+  ipv4_address :ip_address
 
   def body_length
     4

data/lib/helpers/superclass_base.rb

@@ -1,4 +1,5 @@
 require 'bindata'
+require 'bindata-contrib'
 
 class SuperclassBase < BinData::Record
   attr_reader :type_str

data/lib/openflow-protocol.rb

@@ -1,3 +1,3 @@
 Dir[File.expand_path 'messages/**/*.rb', __dir__].each do |file|
-  require file
+  require_relative file
 end

data/lib/statistics/table_statistics.rb

@@ -1,5 +1,4 @@
 require_relative '../structs/match'
-require_relative '../helpers/flags'
 
 class OFTableStatistics < BinData::Record
   TABLE_IDS = {emergency: 0xfe, all: 0xff}

data/lib/structs/match.rb

@@ -1,7 +1,5 @@
 require 'English'
-require_relative '../helpers/enum'
-require_relative '../helpers/mac_address'
-require_relative '../helpers/ip_address'
+require 'bindata-contrib'
 require_relative 'port_number'
 
 class OFMatch < BinData::Record
@@ -84,8 +82,8 @@ class OFMatch < BinData::Record
   }, initial_value: 0
   uint16 :padding2
   hide :padding2
-  ip_address :ip_source
-  ip_address :ip_destination
+  ipv4_address :ip_source
+  ipv4_address :ip_destination
   uint16 :source_port, initial_value: 0
   uint16 :destination_port, initial_value: 0
 end

data/lib/structs/physical_port.rb

@@ -1,5 +1,5 @@
+require 'bindata-contrib'
 require_relative 'port_number'
-require_relative '../helpers/mac_address'
 
 class OFPhysicalPort < BinData::Record
   CONFIG = [

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: openflow-protocol
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
-- Jeremy Page
+- Jérémy Pagé
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies: []
 description: An OpenFlow Parser/Serializer.
 email:
-- jeremy@jeremypage.me
+- contact@jeremypage.me
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -32,10 +32,6 @@ files:
 - lib/actions/action_strip_vlan.rb
 - lib/actions/action_vendor.rb
 - lib/actions/actions.rb
-- lib/helpers/enum.rb
-- lib/helpers/flags.rb
-- lib/helpers/ip_address.rb
-- lib/helpers/mac_address.rb
 - lib/helpers/superclass_base.rb
 - lib/messages/barrier_reply.rb
 - lib/messages/barrier_request.rb
@@ -93,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: OpenFlow Protocol

data/lib/helpers/enum.rb

@@ -1,45 +0,0 @@
-require 'bindata'
-
-def _def_enum(size)
-  eval %(
-    class Enum#{size} < BinData::Primitive
-      mandatory_parameter :list
-
-      endian :big
-      uint#{size} :enum, initial_value: 0
-
-      def get
-        list.invert.fetch(enum)
-      rescue KeyError
-        enum
-      end
-
-      def set(value)
-        self.enum = list.fetch(value)
-      rescue KeyError
-        self.enum = value
-      end
-
-      private
-
-      def list
-        list = eval_parameter(:list)
-        case list
-        when Array
-          shift = 0
-          list.each_with_object({}) do |each, result|
-            result[each] = shift
-            shift += 1
-            result
-          end
-        when Hash
-          list
-        end
-      end
-    end
-  )
-end
-
-_def_enum 8
-_def_enum 16
-_def_enum 32

data/lib/helpers/flags.rb

@@ -1,49 +0,0 @@
-require 'bindata'
-
-def _def_flags(size)
-  eval %(
-    class Flags#{size} < BinData::Primitive
-      mandatory_parameter :list
-
-      endian :big
-      uint#{size} :flags, initial_value: 0
-
-      def get
-        list.each_with_object([]) do |(key, value), result|
-          result << key if (flags & value != 0) || (flags == value)
-          result
-        end
-      end
-
-      def set(value)
-        value.each do |each|
-          fail "Invalid flag: \#{value}" unless list.keys.include?(each)
-        end
-        self.flags = value.empty? ?
-                     0 :
-                     value.map { |each| list[each] }.inject(:|)
-      end
-
-      private
-
-      def list
-        list = eval_parameter(:list)
-        case list
-        when Array
-          shift = 0
-          list.each_with_object({}) do |each, result|
-            result[each] = 1 << shift
-            shift += 1
-            result
-          end
-        when Hash
-          list
-        end
-      end
-    end
-  )
-end
-
-_def_flags 8
-_def_flags 16
-_def_flags 32

data/lib/helpers/ip_address.rb

@@ -1,14 +0,0 @@
-require 'bindata'
-
-class IpAddress < BinData::Primitive
-  endian :big
-  array :octets, type: :uint8, initial_length: 4
-
-  def get
-    octets.map(&:to_s).join('.')
-  end
-
-  def set(value)
-    self.octets = value.split('.').map(&:to_i)
-  end
-end

data/lib/helpers/mac_address.rb

@@ -1,14 +0,0 @@
-require 'bindata'
-
-class MacAddress < BinData::Primitive
-  endian :big
-  array :octets, type: :uint8, initial_length: 6
-
-  def get
-    octets.map { |octet| format('%02x', octet) }.join(':')
-  end
-
-  def set(value)
-    self.octets = value.split(':').map(&:hex)
-  end
-end