pio 0.15.2 → 0.16.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pio
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -439,6 +439,7 @@ files:
 - features/step_definitions/packet_data_steps.rb
 - features/step_definitions/pending_steps.rb
 - features/support/env.rb
+- features/udp_read.feature
 - lib/pio.rb
 - lib/pio/arp.rb
 - lib/pio/arp/format.rb
@@ -453,7 +454,6 @@ files:
 - lib/pio/dhcp/boot_request_options.rb
 - lib/pio/dhcp/client_id.rb
 - lib/pio/dhcp/common_options.rb
-- lib/pio/dhcp/csum_util.rb
 - lib/pio/dhcp/dhcp_field.rb
 - lib/pio/dhcp/dhcp_tlv_options.rb
 - lib/pio/dhcp/discover.rb
@@ -466,6 +466,7 @@ files:
 - lib/pio/dhcp/request.rb
 - lib/pio/echo.rb
 - lib/pio/enqueue.rb
+- lib/pio/ethernet_header.rb
 - lib/pio/exact_match.rb
 - lib/pio/features.rb
 - lib/pio/flow_mod.rb
@@ -477,6 +478,7 @@ files:
 - lib/pio/icmp/reply.rb
 - lib/pio/icmp/request.rb
 - lib/pio/ipv4_address.rb
+- lib/pio/ipv4_header.rb
 - lib/pio/lldp.rb
 - lib/pio/lldp/chassis_id_tlv.rb
 - lib/pio/lldp/end_of_lldpdu_value.rb
@@ -507,6 +509,7 @@ files:
 - lib/pio/packet_in.rb
 - lib/pio/packet_out.rb
 - lib/pio/parse_error.rb
+- lib/pio/payload.rb
 - lib/pio/pcap.rb
 - lib/pio/port_status.rb
 - lib/pio/send_out_port.rb
@@ -518,11 +521,10 @@ files:
 - lib/pio/set_vlan_priority.rb
 - lib/pio/set_vlan_vid.rb
 - lib/pio/strip_vlan_header.rb
-- lib/pio/type/ethernet_header.rb
 - lib/pio/type/ip_address.rb
-- lib/pio/type/ipv4_header.rb
 - lib/pio/type/mac_address.rb
-- lib/pio/type/udp_header.rb
+- lib/pio/udp.rb
+- lib/pio/udp_header.rb
 - lib/pio/version.rb
 - pio.gemspec
 - spec/pio/arp/reply/options_spec.rb
@@ -587,108 +589,109 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Packet parser and generator.
 test_files:
-- spec/pio/set_eth_src_addr_spec.rb
-- spec/pio/features/request_spec.rb
-- spec/pio/features/reply_spec.rb
-- spec/pio/set_vlan_vid_spec.rb
-- spec/pio/set_transport_dst_port_spec.rb
-- spec/pio/strip_vlan_header_spec.rb
-- spec/pio/ipv4_address_spec.rb
-- spec/pio/open_flow/type_spec.rb
-- spec/pio/open_flow/phy_port_spec.rb
-- spec/pio/enqueue_spec.rb
-- spec/pio/hello_spec.rb
-- spec/pio/set_ip_src_addr_spec.rb
-- spec/pio/dhcp/request_spec.rb
-- spec/pio/dhcp/offer_spec.rb
-- spec/pio/dhcp/ack_spec.rb
-- spec/pio/dhcp/discover_spec.rb
-- spec/pio/set_transport_src_port_spec.rb
-- spec/pio/arp/request_spec.rb
 - spec/pio/arp/reply/options_spec.rb
-- spec/pio/arp/request/options_spec.rb
 - spec/pio/arp/reply_spec.rb
+- spec/pio/arp/request/options_spec.rb
+- spec/pio/arp/request_spec.rb
+- spec/pio/arp_spec.rb
+- spec/pio/dhcp/ack_spec.rb
+- spec/pio/dhcp/discover_spec.rb
+- spec/pio/dhcp/offer_spec.rb
+- spec/pio/dhcp/request_spec.rb
+- spec/pio/dhcp_spec.rb
+- spec/pio/echo/reply_spec.rb
+- spec/pio/echo/request_spec.rb
+- spec/pio/enqueue_spec.rb
+- spec/pio/features/reply_spec.rb
+- spec/pio/features/request_spec.rb
 - spec/pio/flow_mod_spec.rb
-- spec/pio/lldp/options_spec.rb
-- spec/pio/set_vlan_priority_spec.rb
-- spec/pio/set_ip_dst_addr_spec.rb
-- spec/pio/mac_spec.rb
-- spec/pio/icmp/request_spec.rb
+- spec/pio/hello_spec.rb
 - spec/pio/icmp/reply_spec.rb
+- spec/pio/icmp/request_spec.rb
 - spec/pio/icmp_spec.rb
-- spec/pio/wildcards_spec.rb
-- spec/pio/dhcp_spec.rb
-- spec/pio/set_ip_tos_spec.rb
-- spec/pio/send_out_port_spec.rb
-- spec/pio/packet_in_spec.rb
+- spec/pio/ipv4_address_spec.rb
+- spec/pio/lldp/options_spec.rb
 - spec/pio/lldp_spec.rb
-- spec/pio/arp_spec.rb
-- spec/pio/echo/request_spec.rb
-- spec/pio/echo/reply_spec.rb
-- spec/pio/set_eth_dst_addr_spec.rb
+- spec/pio/mac_spec.rb
 - spec/pio/match_spec.rb
+- spec/pio/open_flow/phy_port_spec.rb
+- spec/pio/open_flow/type_spec.rb
+- spec/pio/packet_in_spec.rb
 - spec/pio/packet_out_spec.rb
+- spec/pio/send_out_port_spec.rb
+- spec/pio/set_eth_dst_addr_spec.rb
+- spec/pio/set_eth_src_addr_spec.rb
+- spec/pio/set_ip_dst_addr_spec.rb
+- spec/pio/set_ip_src_addr_spec.rb
+- spec/pio/set_ip_tos_spec.rb
+- spec/pio/set_transport_dst_port_spec.rb
+- spec/pio/set_transport_src_port_spec.rb
+- spec/pio/set_vlan_priority_spec.rb
+- spec/pio/set_vlan_vid_spec.rb
+- spec/pio/strip_vlan_header_spec.rb
+- spec/pio/wildcards_spec.rb
 - spec/spec_helper.rb
+- features/arp_read.feature
+- features/dhcp_read.feature
+- features/echo_read.feature
+- features/exact_match.feature
+- features/features_read.feature
+- features/flow_mod_read.feature
 - features/hello_read.feature
-- features/support/env.rb
+- features/icmp_read.feature
+- features/lldp_read.feature
+- features/packet_data/aggregate_stats_reply.raw
+- features/packet_data/aggregate_stats_request.raw
+- features/packet_data/arp-storm.pcap
+- features/packet_data/arp.pcap
+- features/packet_data/barrier_reply.raw
+- features/packet_data/barrier_request.raw
 - features/packet_data/desc_stats_reply.raw
+- features/packet_data/desc_stats_request.raw
 - features/packet_data/dhcp.pcap
 - features/packet_data/echo_reply.raw
-- features/packet_data/flow_mod_modify_strict.raw
-- features/packet_data/flow_mod_add.raw
+- features/packet_data/echo_request.raw
+- features/packet_data/error.raw
 - features/packet_data/features_reply.raw
-- features/packet_data/aggregate_stats_reply.raw
-- features/packet_data/queue_get_config_reply.raw
-- features/packet_data/arp.pcap
 - features/packet_data/features_request.raw
-- features/packet_data/flow_stats_request.raw
-- features/packet_data/packet_in_arp_request.raw
-- features/packet_data/port_stats_request.raw
+- features/packet_data/flow_mod_add.raw
+- features/packet_data/flow_mod_delete.raw
 - features/packet_data/flow_mod_delete_strict.raw
-- features/packet_data/barrier_reply.raw
-- features/packet_data/get_config_request.raw
-- features/packet_data/vendor.raw
-- features/packet_data/port_mod.raw
+- features/packet_data/flow_mod_modify.raw
+- features/packet_data/flow_mod_modify_strict.raw
+- features/packet_data/flow_removed.raw
+- features/packet_data/flow_stats_reply.raw
+- features/packet_data/flow_stats_request.raw
 - features/packet_data/get_config_reply.raw
-- features/packet_data/lldp.minimal.pcap
+- features/packet_data/get_config_request.raw
 - features/packet_data/hello.raw
-- features/packet_data/flow_removed.raw
-- features/packet_data/set_config.raw
-- features/packet_data/port_stats_reply.raw
-- features/packet_data/packet_out.raw
-- features/packet_data/table_stats_reply.raw
+- features/packet_data/icmp.pcap
+- features/packet_data/lldp.detailed.pcap
+- features/packet_data/lldp.minimal.pcap
+- features/packet_data/packet_in_arp_request.raw
 - features/packet_data/packet_in_cbench.raw
+- features/packet_data/packet_out.raw
+- features/packet_data/port_mod.raw
+- features/packet_data/port_stats_reply.raw
+- features/packet_data/port_stats_request.raw
+- features/packet_data/port_status.raw
+- features/packet_data/queue_get_config_reply.raw
 - features/packet_data/queue_get_config_request.raw
-- features/packet_data/error.raw
-- features/packet_data/vendor_stats_request.raw
-- features/packet_data/icmp.pcap
-- features/packet_data/arp-storm.pcap
-- features/packet_data/flow_stats_reply.raw
-- features/packet_data/desc_stats_request.raw
-- features/packet_data/barrier_request.raw
+- features/packet_data/set_config.raw
+- features/packet_data/table_stats_reply.raw
 - features/packet_data/table_stats_request.raw
-- features/packet_data/port_status.raw
-- features/packet_data/flow_mod_modify.raw
-- features/packet_data/flow_mod_delete.raw
-- features/packet_data/lldp.detailed.pcap
-- features/packet_data/aggregate_stats_request.raw
-- features/packet_data/echo_request.raw
-- features/exact_match.feature
-- features/icmp_read.feature
+- features/packet_data/vendor.raw
+- features/packet_data/vendor_stats_request.raw
+- features/packet_in_read.feature
+- features/packet_out_read.feature
 - features/port_status_read.feature
-- features/arp_read.feature
-- features/step_definitions/pending_steps.rb
 - features/step_definitions/packet_data_steps.rb
-- features/flow_mod_read.feature
-- features/lldp_read.feature
-- features/dhcp_read.feature
-- features/features_read.feature
-- features/packet_out_read.feature
-- features/packet_in_read.feature
-- features/echo_read.feature
+- features/step_definitions/pending_steps.rb
+- features/support/env.rb
+- features/udp_read.feature
 has_rdoc: 

data/lib/pio/dhcp/csum_util.rb

@@ -1,81 +0,0 @@
-module Pio
-  class Dhcp
-    # Checksum Calculate Utility.
-    module CsumUtil
-      private
-
-      def ip_csum
-        ipv4_header_2bytewise_slices.reduce(:+)
-      end
-
-      def udp_csum
-        udp_header_2bytewise_slices.reduce(:+)
-      end
-
-      def ipv4_header_2bytewise_slices
-        [
-          ipversion_ipheaderlength_iptypeofservice, ip_total_length,
-          ip_identifier, ipflag_ipfragment,
-          ipttl_ipproto,
-          ip_source_address_upper,
-          ip_source_address_lower,
-          ip_destination_address_upper,
-          ip_destination_address_lower
-        ]
-      end
-
-      def ip_source_address_upper
-        ip_source_address.get.to_i >> 16
-      end
-
-      def ip_source_address_lower
-        ip_source_address.get.to_i & 0xffff
-      end
-
-      def ip_destination_address_upper
-        ip_destination_address.get.to_i >> 16
-      end
-
-      def ip_destination_address_lower
-        ip_destination_address.get.to_i & 0xffff
-      end
-
-      def ipversion_ipheaderlength_iptypeofservice
-        ip_version << 12 | ip_header_length << 8 | ip_type_of_service
-      end
-
-      def ipflag_ipfragment
-        ip_flag << 13 | ip_fragment
-      end
-
-      def ipttl_ipproto
-        ip_ttl << 8 | ip_protocol
-      end
-
-      def udp_header_2bytewise_slices
-        [
-          pseudo_header_2bytewise_slices,
-          udp_src_port,
-          udp_dst_port,
-          udp_len,
-          payload_2bytewise_slices
-        ]
-      end
-
-      def payload_2bytewise_slices
-        (dhcp.to_binary_s + trail_data).unpack('n*').reduce(:+)
-      end
-
-      def pseudo_header_2bytewise_slices
-        [
-          ip_source_address_upper,
-          ip_source_address_lower,
-          ip_destination_address_upper,
-          ip_destination_address_lower,
-          ip_protocol,
-          udp_len
-        ].pack('n*').unpack('n*').reduce(:+)
-      end
-    end
-  end
-end

data/lib/pio/type/ethernet_header.rb

@@ -1,43 +0,0 @@
-require 'pio/type/mac_address'
-
-module Pio
-  module Type
-    # Adds ethernet_header macro.
-    module EthernetHeader
-      # rubocop:disable MethodLength
-      # rubocop:disable AbcSize
-      def ethernet_header(options = { ether_type: 0x0800 })
-        class_eval do
-          mac_address :destination_mac
-          mac_address :source_mac
-          uint16 :ether_type_internal, initial_value: options[:ether_type]
-
-          bit3 :vlan_pcp_internal, onlyif: -> { vlan? }
-          bit1 :vlan_cfi, onlyif: -> { vlan? }
-          bit12 :vlan_vid_internal, onlyif: -> { vlan? }
-
-          uint16 :ether_type_vlan, onlyif: -> { vlan? },
-                                   initial_value: options[:ether_type]
-
-          def ether_type
-            ether_type_internal
-          end
-
-          def vlan_vid
-            vlan? ? vlan_vid_internal : 0xffff
-          end
-
-          def vlan_pcp
-            vlan? ? vlan_pcp_internal : 0
-          end
-
-          def vlan?
-            ether_type == 0x8100
-          end
-        end
-      end
-      # rubocop:enable MethodLength
-      # rubocop:enable AbcSize
-    end
-  end
-end

data/lib/pio/type/ipv4_header.rb

@@ -1,33 +0,0 @@
-require 'pio/type/ip_address'
-
-module Pio
-  module Type
-    # IP Version 4 Header Format
-    module IPv4Header
-      # This method smells of :reek:TooManyStatements
-      # rubocop:disable MethodLength
-      # rubocop:disable AbcSize
-      def ipv4_header(options = {})
-        class_eval do
-          bit4 :ip_version, initial_value: 0x4
-          bit4 :ip_header_length, initial_value: 0x5
-          uint8 :ip_type_of_service, initial_value: 0
-          uint16be :ip_total_length,
-                   initial_value: options[:ip_total_length] || 0
-          uint16be :ip_identifier, initial_value: 0
-          bit3 :ip_flag, initial_value: 0
-          bit13 :ip_fragment, initial_value: 0
-          uint8 :ip_ttl, initial_value: 128
-          uint8 :ip_protocol, initial_value: options[:ip_protocol] || 0
-          uint16be :ip_header_checksum,
-                   initial_value: options[:ip_header_checksum] || 0
-          ip_address :ip_source_address
-          ip_address :ip_destination_address
-          string :option, read_length: -> { 20 - ip_header_length * 4 }
-        end
-      end
-      # rubocop:enable AbcSize
-      # rubocop:enable MethodLength
-    end
-  end
-end

data/lib/pio/type/udp_header.rb

@@ -1,15 +0,0 @@
-module Pio
-  module Type
-    # UDP Header Format.
-    module UdpHeader
-      def udp_header(options)
-        class_eval do
-          uint16be :udp_src_port
-          uint16be :udp_dst_port
-          uint16be :udp_length, initial_value: options[:udp_length]
-          uint16be :udp_checksum, initial_value: options[:udp_checksum]
-        end
-      end
-    end
-  end
-end