lib/pio/packet_in.rb in pio-0.15.2 vs lib/pio/packet_in.rb in pio-0.16.0

@@ -1,10 +1,10 @@
 require 'bindata'
+require 'pio/ethernet_header'
+require 'pio/ipv4_header'
 require 'pio/open_flow'
 require 'pio/parse_error'
-require 'pio/type/ethernet_header'
-require 'pio/type/ipv4_header'
 
 # Base module.
 module Pio
   # OpenFlow 1.0 Packet-In message
   class PacketIn
@@ -47,21 +47,21 @@
 
     # Pio::PacketIn#data parser
     class DataParser
       # Ethernet header parser
       class EthernetHeaderParser < BinData::Record
-        extend Pio::Type::EthernetHeader
+        include EthernetHeader
 
         endian :big
 
         ethernet_header
         rest :payload
       end
 
       # IPv4 packet parser
       class IPv4Packet < BinData::Record
-        extend Pio::Type::EthernetHeader
-        extend Type::IPv4Header
+        include EthernetHeader
+        include IPv4Header
 
         endian :big
 
         ethernet_header
         ipv4_header