packet-protocols 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b0fb967c63926543adcf75b50b47530383258e4
-  data.tar.gz: eeef4792b002e62fab8cac751cfd8bb9c2f13b62
+  metadata.gz: 771b3be228c9d1a28e289cec47308b0df485616f
+  data.tar.gz: 3005168ed00e3d997c8deb73456621b57436dda0
 SHA512:
-  metadata.gz: bea53b197dbc675b690c121905cf3811caface576284bdd9d40a8375440b0796ccbb803856c75a339c52433a0e4fd3cc73b34cdaa755328477d73cba4d350b0c
-  data.tar.gz: c8ad9ea0388ce2b867e652ce53005fce67cd17376ca52f1aee68f4e36a301266be5c7e357acd9bb367282d265a6ab9d59db69111c0004e777be697d0c9f72631
+  metadata.gz: 15a4a29ea950cfbaa8c51639b3a50a9081d22daa5d684a1420d36d15ad90fe444789b5658dcf84168f440415d4664c55b242190e719cbae656799c2ad71e5934
+  data.tar.gz: d80ac44b8b31f551614a17b6471f57bcecf473cc0c2750cbc0b27e4dd31b1346326d63be3eda84e3dce880430a670fc8dae713b7184a5d403778f5f18c08f57d

data/lib/packet-protocols.rb

@@ -1 +1,2 @@
-require_relative 'ethernet'
+require 'packet-protocols/version'
+require 'packet-protocols/ethernet'

data/lib/packet-protocols/arp.rb

@@ -0,0 +1,32 @@
+require 'bindata-contrib'
+
+module PacketProtocols
+  class Arp < BinData::Record
+    HARDWARES = { ethernet: 1 }
+    PROTOCOLS = { ipv4: 0x0800 }
+    OPERATIONS = { request: 1, reply: 2 }
+
+    endian :big
+    enum16 :hardware, list: HARDWARES, initial_value: -> { :ethernet }
+    enum16 :protocol, list: PROTOCOLS, initial_value: -> { :ipv4 }
+    uint8 :hardware_length, initial_value: 6
+    uint8 :protocol_length, initial_value: 4
+    enum16 :operation, list: OPERATIONS, initial_value: -> { :request }
+    mac_address :mac_source, onlyif: :ipv4_in_ethernet?
+    ipv4_address :ip_source, onlyif: :ipv4_in_ethernet?
+    mac_address :mac_destination, onlyif: :ipv4_in_ethernet?
+    ipv4_address :ip_destination, onlyif: :ipv4_in_ethernet?
+
+    virtual assert: (proc do
+      !ipv4_in_ethernet? || (hardware_length == 6 && protocol_length == 4)
+    end)
+
+    def ipv4_in_ethernet?
+      hardware == :ethernet && protocol == :ipv4
+    end
+
+    def length
+      28
+    end
+  end
+end

data/lib/packet-protocols/ethernet.rb

@@ -0,0 +1,42 @@
+require 'packet-protocols/ipv4'
+require 'packet-protocols/arp'
+
+module PacketProtocols
+  class Ethernet < BinData::Record
+    PROTOCOLS = {
+      ipv4: 0x0800,
+      arp: 0x0806,
+      vlan: 0x8100
+    }
+
+    endian :big
+    mac_address 'mac_destination'
+    mac_address 'mac_source'
+    enum16 :protocol_internal, list: PROTOCOLS, initial_value: -> { :ipv4 }
+
+    struct :vlan, onlyif: :has_vlan? do
+      bit3 :pcp, initial_value: 0
+      bit1 :cfi, initial_value: 0
+      bit12 :id, initial_value: 0
+      enum16 :protocol, list: PROTOCOLS, initial_value: -> { :ipv4 }
+    end
+
+    choice :payload, selection: -> { protocol.to_s } do
+      ipv4 'ipv4'
+      arp 'arp'
+      rest :default
+    end
+
+    def has_vlan?
+      protocol_internal == :vlan
+    end
+
+    def protocol
+      has_vlan? ? vlan.protocol : protocol_internal
+    end
+
+    def length
+      14 + (has_vlan? ? 4 : 0) + payload.length
+    end
+  end
+end

data/lib/packet-protocols/icmp.rb

@@ -0,0 +1,24 @@
+require 'bindata-contrib'
+
+module PacketProtocols
+  class Icmp < BinData::Record
+    TYPES = { echo_reply: 0, echo_request: 8 }
+
+    endian :big
+    enum8 :type, list: TYPES, initial_value: -> { :echo_request }
+    uint8 :code, initial_value: 0
+    uint16 :checksum
+
+    uint16 :identifier, onlyif: :echo?
+    uint16 :sequence_number, onlyif: :echo?
+    rest :data, onlyif: :echo?
+
+    def echo?
+      type == :echo_request || type == :echo_reply
+    end
+
+    def length
+      4 + (echo? ? 4 + data.length : 0)
+    end
+  end
+end

data/lib/packet-protocols/ipv4.rb

@@ -0,0 +1,67 @@
+require 'bindata-contrib'
+require 'packet-protocols/icmp'
+require 'packet-protocols/tcp'
+require 'packet-protocols/udp'
+
+module PacketProtocols
+  class Ipv4 < BinData::Record
+    PROTOCOLS = { icmp: 1, tcp: 6, udp: 17 }
+
+    endian :big
+    bit4 :version, asserted_value: 4
+    bit4 :header_length, initial_value: 5
+    bit6 :dscp
+    bit2 :ecn
+    uint16 :total_length, initial_value: -> { header_length_in_bytes + payload.length }
+    uint16 :identifier
+    bit1 :reserved
+    bool :df
+    bool :mf
+    bit13 :fragment_offset
+    uint8 :time_to_live, initial_value: 64
+    enum8 :protocol, list: PROTOCOLS, initial_value: -> { :tcp }
+    uint16 :checksum#, initial_value: :compute_checksum
+    ipv4_address :ip_source
+    ipv4_address :ip_destination
+    string :options, read_length: :options_length_in_bytes
+    choice :payload, selection: -> { protocol.to_s } do
+      icmp 'icmp'
+      tcp 'tcp'
+      udp 'udp'
+      rest :default
+    end
+
+    # virtual assert: :checksum_valid?
+
+    def header_length_in_bytes
+      header_length * 4
+    end
+
+    def options_length_in_bytes
+      header_length_in_bytes - options.rel_offset
+    end
+
+    def length
+      total_length
+    end
+
+    # def compute_checksum
+    #   self.checksum = 0
+    #   self.checksum = checksum_function
+    # end
+    #
+    # def checksum_valid?
+    #   checksum_function == 0
+    # end
+
+    # private
+    #
+    # def checksum_function
+    #   bin = to_binary_s
+    #   dbytes = bin.unpack('S>*')
+    #   acc = dbytes.inject(:+)
+    #   acc = ((acc >> 16) & 0xffff) + (acc & 0xffff)
+    #   ~acc & 0xffff
+    # end
+  end
+end

data/lib/packet-protocols/tcp.rb

@@ -0,0 +1,62 @@
+require 'bindata-contrib'
+
+module PacketProtocols
+  class Tcp < BinData::Record
+    endian :big
+    uint16 :source_port
+    uint16 :destination_port
+    uint32 :sequence_number
+    uint32 :acknowledge_number
+    bit4 :data_offset, initial_value: -> { 5 + options.length / 4 }
+    bit3 :reserved
+    bool :ns
+    bool :cwr
+    bool :ece
+    bool :urg
+    bool :ack
+    bool :psh
+    bool :rst
+    bool :syn
+    bool :fin
+    uint16 :window_size
+    uint16 :checksum#, initial_value: :compute_checksum
+    uint16 :urgent_pointer
+    string :options, read_length: :options_length_in_bytes
+    rest :payload
+
+    # virtual assert: :checksum_valid?
+
+    def header_length_in_bytes
+      data_offset * 4
+    end
+
+    def options_length_in_bytes
+      header_length_in_bytes - options.rel_offset
+    end
+
+    def length
+      header_length_in_bytes + options_length_in_bytes + payload.length
+    end
+
+    # def compute_checksum
+    #   self.checksum = 0
+    #   self.checksum = checksum_function
+    # end
+    #
+    # def checksum_valid?
+    #   checksum_function == 0
+    # end
+    #
+    # private
+    #
+    # def checksum_function
+    #   bin = to_binary_s
+    #   dbytes = bin.unpack('S>*')
+    #   acc = dbytes.inject(:+)
+    #   acc = ((acc >> 16) & 0xffff) + (acc & 0xffff)
+    #   ~acc & 0xffff
+    # end
+
+    # TODO: need IP parent for checksum
+  end
+end

data/lib/packet-protocols/udp.rb

@@ -0,0 +1,16 @@
+require 'bindata'
+
+module PacketProtocols
+  class Udp < BinData::Record
+    endian :big
+    uint16 :source_port
+    uint16 :destination_port
+    uint16 :len, initial_value: -> { 8 + payload.length }
+    uint16 :checksum
+    rest :payload
+
+    def length
+      len
+    end
+  end
+end

data/lib/packet-protocols/version.rb

@@ -1,3 +1,3 @@
 module PacketProtocols
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/arp_spec.rb

@@ -1,6 +1,4 @@
-require_relative '../lib/arp'
-
-describe Arp do
+describe PacketProtocols::Arp do
   let(:binary) {
     [
       0, 1,             # hardware
@@ -16,7 +14,7 @@ describe Arp do
   }
 
   it 'must read binary data' do
-    arp = Arp.read(binary)
+    arp = PacketProtocols::Arp.read(binary)
     expect(arp.hardware).to eq(:ethernet)
     expect(arp.protocol).to eq(:ipv4)
     expect(arp.hardware_length).to eq(6)
@@ -30,7 +28,7 @@ describe Arp do
   end
 
   it 'must initialize with default values' do
-    arp = Arp.new
+    arp = PacketProtocols::Arp.new
     expect(arp.hardware).to eq(:ethernet)
     expect(arp.protocol).to eq(:ipv4)
     expect(arp.hardware_length).to eq(6)
@@ -43,7 +41,7 @@ describe Arp do
   end
 
   it 'must be able to change accessors' do
-    arp = Arp.new
+    arp = PacketProtocols::Arp.new
     arp.operation = :reply
     expect(arp.operation).to eq(:reply)
     arp.mac_source = '01:23:45:67:89:01'
@@ -53,7 +51,7 @@ describe Arp do
   end
 
   it 'must initialize with options' do
-    arp = Arp.new(operation: :reply, ip_source: '192.168.0.1')
+    arp = PacketProtocols::Arp.new(operation: :reply, ip_source: '192.168.0.1')
     expect(arp.operation).to eq(:reply)
     expect(arp.ip_source).to eq('192.168.0.1')
   end

data/spec/ethernet_spec.rb

@@ -1,6 +1,4 @@
-require_relative '../lib/ethernet'
-
-describe Ethernet do
+describe PacketProtocols::Ethernet do
   let(:binary) {
     [
       0, 0, 0, 0, 0, 2, # mac_destination
@@ -25,7 +23,7 @@ describe Ethernet do
   }
 
   it 'must read binary data' do
-    eth = Ethernet.read(binary)
+    eth = PacketProtocols::Ethernet.read(binary)
     expect(eth.mac_destination).to eq('00:00:00:00:00:02')
     expect(eth.mac_source).to eq('00:00:00:00:00:01')
     expect(eth.protocol).to eq(:arp)
@@ -36,7 +34,7 @@ describe Ethernet do
   end
 
   it 'must initialize with default values' do
-    eth = Ethernet.new
+    eth = PacketProtocols::Ethernet.new
     expect(eth.mac_destination).to eq('00:00:00:00:00:00')
     expect(eth.mac_source).to eq('00:00:00:00:00:00')
     expect(eth.protocol).to eq(:ipv4)
@@ -45,13 +43,13 @@ describe Ethernet do
   end
 
   it 'must be able to change accessors' do
-    eth = Ethernet.new
+    eth = PacketProtocols::Ethernet.new
     eth.mac_destination = '00:00:00:00:00:02'
     expect(eth.mac_destination).to eq('00:00:00:00:00:02')
   end
 
   it 'must initialize with options' do
-    eth = Ethernet.new(mac_destination: '00:00:00:00:00:02')
+    eth = PacketProtocols::Ethernet.new(mac_destination: '00:00:00:00:00:02')
     expect(eth.mac_destination).to eq('00:00:00:00:00:02')
   end
 end
@@ -59,9 +57,9 @@ end
 
 # require 'spec_helper'
 #
-# describe Ethernet do
+# describe PacketProtocols::Ethernet do
 #   it 'should read an unkown protocol' do
-#     packet = Ethernet.read [
+#     packet = PacketProtocols::Ethernet.read [
 #       0, 0, 0, 0, 0, 2, # mac_destination
 #       0, 0, 0, 0, 0, 1, # mac_source
 #       0, 0              # protocol
@@ -73,7 +71,7 @@ end
 #   end
 #
 #   it 'should read a VLAN packet' do
-#     packet = Ethernet.read [
+#     packet = PacketProtocols::Ethernet.read [
 #       0, 0, 0, 0, 0, 2, # mac_destination
 #       0, 0, 0, 0, 0, 1, # mac_source
 #       0x81, 0,          # protocol
@@ -93,7 +91,7 @@ end
 #
 #   describe 'with ARP' do
 #     it 'should read binary' do
-#       packet = Ethernet.read [
+#       packet = PacketProtocols::Ethernet.read [
 #         0, 0, 0, 0, 0, 2, # mac_destination
 #         0, 0, 0, 0, 0, 1, # mac_source
 #         8, 6,             # protocol
@@ -126,7 +124,7 @@ end
 #
 #   describe 'with IPv4/TCP' do
 #     it 'should read binary' do
-#       packet = Ethernet.read [
+#       packet = PacketProtocols::Ethernet.read [
 #         0, 0, 0, 0, 0, 2, # mac_destination
 #         0, 0, 0, 0, 0, 1, # mac_source
 #         8, 0,             # protocol
@@ -194,7 +192,7 @@ end
 #
 #   describe 'with IPv4/UDP' do
 #     it 'should read binary' do
-#       packet = Ethernet.read [
+#       packet = PacketProtocols::Ethernet.read [
 #         0, 0, 0, 0, 0, 2, # mac_destination
 #         0, 0, 0, 0, 0, 1, # mac_source
 #         8, 0,             # protocol
@@ -244,7 +242,7 @@ end
 #
 #   describe 'with IPv4/ICMP' do
 #     it 'should read binary' do
-#       packet = Ethernet.read [
+#       packet = PacketProtocols::Ethernet.read [
 #         0, 0, 0, 0, 0, 2, # mac_destination
 #         0, 0, 0, 0, 0, 1, # mac_source
 #         8, 0,             # protocol

data/spec/icmp_spec.rb

@@ -1,6 +1,4 @@
-require_relative '../lib/icmp'
-
-describe Icmp do
+describe PacketProtocols::Icmp do
   let(:binary) {
     [
       0,         # type
@@ -13,7 +11,7 @@ describe Icmp do
   }
 
   it 'must read binary data' do
-    icmp = Icmp.read(binary)
+    icmp = PacketProtocols::Icmp.read(binary)
     expect(icmp.type).to eq(:echo_reply)
     expect(icmp.code).to eq(0)
     expect(icmp.checksum).to eq(0)
@@ -24,7 +22,7 @@ describe Icmp do
   end
 
   it 'must initialize with default values' do
-    icmp = Icmp.new
+    icmp = PacketProtocols::Icmp.new
     expect(icmp.type).to eq(:echo_request)
     expect(icmp.code).to eq(0)
     expect(icmp.checksum).to eq(0)
@@ -34,7 +32,7 @@ describe Icmp do
   end
 
   it 'must be able to change accessors' do
-    icmp = Icmp.new
+    icmp = PacketProtocols::Icmp.new
     icmp.type = :echo_reply
     expect(icmp.type).to eq(:echo_reply)
     icmp.data = [1, 2, 3, 4].pack('C*')
@@ -42,7 +40,7 @@ describe Icmp do
   end
 
   it 'must initialize with options' do
-    icmp = Icmp.new(type: :echo_reply, sequence_number: 123)
+    icmp = PacketProtocols::Icmp.new(type: :echo_reply, sequence_number: 123)
     expect(icmp.type).to eq(:echo_reply)
     expect(icmp.sequence_number).to eq(123)
   end

data/spec/ipv4_spec.rb

@@ -1,6 +1,4 @@
-require_relative '../lib/ipv4'
-
-describe Ipv4 do
+describe PacketProtocols::Ipv4 do
   let(:binary) {
     [
       0x45,           # version & header_length
@@ -24,7 +22,7 @@ describe Ipv4 do
   }
 
   it 'must read binary data' do
-    ipv4 = Ipv4.read(binary)
+    ipv4 = PacketProtocols::Ipv4.read(binary)
     expect(ipv4.version).to eq(4)
     expect(ipv4.header_length).to eq(5)
     expect(ipv4.dscp).to eq(56)
@@ -45,7 +43,7 @@ describe Ipv4 do
   end
 
   it 'must initialize with default values' do
-    ipv4 = Ipv4.new
+    ipv4 = PacketProtocols::Ipv4.new
     expect(ipv4.version).to eq(4)
     expect(ipv4.header_length).to eq(5)
     expect(ipv4.dscp).to eq(0)
@@ -65,13 +63,13 @@ describe Ipv4 do
   end
 
   it 'must be able to change accessors' do
-    ipv4 = Ipv4.new
+    ipv4 = PacketProtocols::Ipv4.new
     ipv4.identifier = 10
     expect(ipv4.identifier).to eq(10)
   end
 
   it 'must initialize with options' do
-    ipv4 = Ipv4.new(identifier: 10)
+    ipv4 = PacketProtocols::Ipv4.new(identifier: 10)
     expect(ipv4.identifier).to eq(10)
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'packet-protocols'

data/spec/tcp_spec.rb

@@ -1,6 +1,4 @@
-require_relative '../lib/tcp'
-
-describe Tcp do
+describe PacketProtocols::Tcp do
   let(:binary) {
     [
       0, 10,      # source_port
@@ -16,7 +14,7 @@ describe Tcp do
   }
 
   it 'must read binary data' do
-    tcp = Tcp.read(binary)
+    tcp = PacketProtocols::Tcp.read(binary)
     expect(tcp.source_port).to eq(10)
     expect(tcp.destination_port).to eq(20)
     expect(tcp.sequence_number).to eq(1)
@@ -40,19 +38,19 @@ describe Tcp do
   end
 
   it 'must initialize with default values' do
-    tcp = Tcp.new
+    tcp = PacketProtocols::Tcp.new
     expect(tcp.source_port).to eq(0)
     expect(tcp.data_offset).to eq(5)
   end
 
   it 'must be able to change accessors' do
-    tcp = Tcp.new
+    tcp = PacketProtocols::Tcp.new
     tcp.source_port = 10
     expect(tcp.source_port).to eq(10)
   end
 
   it 'must initialize with options' do
-    tcp = Tcp.new(source_port: 10, options: [1, 2, 3, 4].pack('C*'))
+    tcp = PacketProtocols::Tcp.new(source_port: 10, options: [1, 2, 3, 4].pack('C*'))
     expect(tcp.source_port).to eq(10)
     expect(tcp.data_offset).to eq(6)
     expect(tcp.options).to eq([1, 2, 3, 4].pack('C*'))

data/spec/udp_spec.rb

@@ -1,6 +1,4 @@
-require_relative '../lib/udp'
-
-describe Udp do
+describe PacketProtocols::Udp do
   let(:binary) {
     [
       0, 10,     # source_port
@@ -12,7 +10,7 @@ describe Udp do
   }
 
   it 'must read binary data' do
-    udp = Udp.read(binary)
+    udp = PacketProtocols::Udp.read(binary)
     expect(udp.source_port).to eq(10)
     expect(udp.destination_port).to eq(20)
     expect(udp.length).to eq(12)
@@ -22,7 +20,7 @@ describe Udp do
   end
 
   it 'must initialize with default values' do
-    udp = Udp.new
+    udp = PacketProtocols::Udp.new
     expect(udp.source_port).to eq(0)
     expect(udp.destination_port).to eq(0)
     expect(udp.length).to eq(8)
@@ -31,13 +29,13 @@ describe Udp do
   end
 
   it 'must be able to change accessors' do
-    udp = Udp.new
+    udp = PacketProtocols::Udp.new
     udp.destination_port = 20
     expect(udp.destination_port).to eq(20)
   end
 
   it 'must initialize with options' do
-    udp = Udp.new(source_port: 10, payload: [1, 2].pack('C*'))
+    udp = PacketProtocols::Udp.new(source_port: 10, payload: [1, 2].pack('C*'))
     expect(udp.source_port).to eq(10)
     expect(udp.length).to eq(10)
     expect(udp.payload).to eq([1, 2].pack('C*'))

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: packet-protocols
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jérémy Pagé
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -45,18 +59,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/arp.rb
-- lib/ethernet.rb
-- lib/icmp.rb
-- lib/ipv4.rb
 - lib/packet-protocols.rb
+- lib/packet-protocols/arp.rb
+- lib/packet-protocols/ethernet.rb
+- lib/packet-protocols/icmp.rb
+- lib/packet-protocols/ipv4.rb
+- lib/packet-protocols/tcp.rb
+- lib/packet-protocols/udp.rb
 - lib/packet-protocols/version.rb
-- lib/tcp.rb
-- lib/udp.rb
 - spec/arp_spec.rb
 - spec/ethernet_spec.rb
 - spec/icmp_spec.rb
 - spec/ipv4_spec.rb
+- spec/spec_helper.rb
 - spec/tcp_spec.rb
 - spec/udp_spec.rb
 homepage: https://github.com/jejepage/packet-protocols
@@ -88,5 +103,6 @@ test_files:
 - spec/ethernet_spec.rb
 - spec/icmp_spec.rb
 - spec/ipv4_spec.rb
+- spec/spec_helper.rb
 - spec/tcp_spec.rb
 - spec/udp_spec.rb

data/lib/arp.rb

@@ -1,30 +0,0 @@
-require 'bindata-contrib'
-
-class Arp < BinData::Record
-  HARDWARES = { ethernet: 1 }
-  PROTOCOLS = { ipv4: 0x0800 }
-  OPERATIONS = { request: 1, reply: 2 }
-
-  endian :big
-  enum16 :hardware, list: HARDWARES, initial_value: -> { :ethernet }
-  enum16 :protocol, list: PROTOCOLS, initial_value: -> { :ipv4 }
-  uint8 :hardware_length, initial_value: 6
-  uint8 :protocol_length, initial_value: 4
-  enum16 :operation, list: OPERATIONS, initial_value: -> { :request }
-  mac_address :mac_source, onlyif: :ipv4_in_ethernet?
-  ipv4_address :ip_source, onlyif: :ipv4_in_ethernet?
-  mac_address :mac_destination, onlyif: :ipv4_in_ethernet?
-  ipv4_address :ip_destination, onlyif: :ipv4_in_ethernet?
-
-  virtual assert: (proc do
-    !ipv4_in_ethernet? || (hardware_length == 6 && protocol_length == 4)
-  end)
-
-  def ipv4_in_ethernet?
-    hardware == :ethernet && protocol == :ipv4
-  end
-
-  def length
-    28
-  end
-end

data/lib/ethernet.rb

@@ -1,40 +0,0 @@
-require_relative 'ipv4'
-require_relative 'arp'
-
-class Ethernet < BinData::Record
-  PROTOCOLS = {
-    ipv4: 0x0800,
-    arp: 0x0806,
-    vlan: 0x8100
-  }
-
-  endian :big
-  mac_address 'mac_destination'
-  mac_address 'mac_source'
-  enum16 :protocol_internal, list: PROTOCOLS, initial_value: -> { :ipv4 }
-
-  struct :vlan, onlyif: :has_vlan? do
-    bit3 :pcp, initial_value: 0
-    bit1 :cfi, initial_value: 0
-    bit12 :id, initial_value: 0
-    enum16 :protocol, list: PROTOCOLS, initial_value: -> { :ipv4 }
-  end
-
-  choice :payload, selection: -> { protocol.to_s } do
-    ipv4 'ipv4'
-    arp 'arp'
-    rest :default
-  end
-
-  def has_vlan?
-    protocol_internal == :vlan
-  end
-
-  def protocol
-    has_vlan? ? vlan.protocol : protocol_internal
-  end
-
-  def length
-    14 + (has_vlan? ? 4 : 0) + payload.length
-  end
-end

data/lib/icmp.rb

@@ -1,22 +0,0 @@
-require 'bindata-contrib'
-
-class Icmp < BinData::Record
-  TYPES = { echo_reply: 0, echo_request: 8 }
-
-  endian :big
-  enum8 :type, list: TYPES, initial_value: -> { :echo_request }
-  uint8 :code, initial_value: 0
-  uint16 :checksum
-
-  uint16 :identifier, onlyif: :echo?
-  uint16 :sequence_number, onlyif: :echo?
-  rest :data, onlyif: :echo?
-
-  def echo?
-    type == :echo_request || type == :echo_reply
-  end
-
-  def length
-    4 + (echo? ? 4 + data.length : 0)
-  end
-end

data/lib/ipv4.rb

@@ -1,65 +0,0 @@
-require 'bindata-contrib'
-require_relative 'icmp'
-require_relative 'tcp'
-require_relative 'udp'
-
-class Ipv4 < BinData::Record
-  PROTOCOLS = { icmp: 1, tcp: 6, udp: 17 }
-
-  endian :big
-  bit4 :version, asserted_value: 4
-  bit4 :header_length, initial_value: 5
-  bit6 :dscp
-  bit2 :ecn
-  uint16 :total_length, initial_value: -> { header_length_in_bytes + payload.length }
-  uint16 :identifier
-  bit1 :reserved
-  bool :df
-  bool :mf
-  bit13 :fragment_offset
-  uint8 :time_to_live, initial_value: 64
-  enum8 :protocol, list: PROTOCOLS, initial_value: -> { :tcp }
-  uint16 :checksum#, initial_value: :compute_checksum
-  ipv4_address :ip_source
-  ipv4_address :ip_destination
-  string :options, read_length: :options_length_in_bytes
-  choice :payload, selection: -> { protocol.to_s } do
-    icmp 'icmp'
-    tcp 'tcp'
-    udp 'udp'
-    rest :default
-  end
-
-  # virtual assert: :checksum_valid?
-
-  def header_length_in_bytes
-    header_length * 4
-  end
-
-  def options_length_in_bytes
-    header_length_in_bytes - options.rel_offset
-  end
-
-  def length
-    total_length
-  end
-
-  # def compute_checksum
-  #   self.checksum = 0
-  #   self.checksum = checksum_function
-  # end
-  #
-  # def checksum_valid?
-  #   checksum_function == 0
-  # end
-
-  # private
-  #
-  # def checksum_function
-  #   bin = to_binary_s
-  #   dbytes = bin.unpack('S>*')
-  #   acc = dbytes.inject(:+)
-  #   acc = ((acc >> 16) & 0xffff) + (acc & 0xffff)
-  #   ~acc & 0xffff
-  # end
-end

data/lib/tcp.rb

@@ -1,61 +0,0 @@
-require 'bindata'
-require 'bindata-contrib'
-
-class Tcp < BinData::Record
-  endian :big
-  uint16 :source_port
-  uint16 :destination_port
-  uint32 :sequence_number
-  uint32 :acknowledge_number
-  bit4 :data_offset, initial_value: -> { 5 + options.length / 4 }
-  bit3 :reserved
-  bool :ns
-  bool :cwr
-  bool :ece
-  bool :urg
-  bool :ack
-  bool :psh
-  bool :rst
-  bool :syn
-  bool :fin
-  uint16 :window_size
-  uint16 :checksum#, initial_value: :compute_checksum
-  uint16 :urgent_pointer
-  string :options, read_length: :options_length_in_bytes
-  rest :payload
-
-  # virtual assert: :checksum_valid?
-
-  def header_length_in_bytes
-    data_offset * 4
-  end
-
-  def options_length_in_bytes
-    header_length_in_bytes - options.rel_offset
-  end
-
-  def length
-    header_length_in_bytes + options_length_in_bytes + payload.length
-  end
-
-  # def compute_checksum
-  #   self.checksum = 0
-  #   self.checksum = checksum_function
-  # end
-  #
-  # def checksum_valid?
-  #   checksum_function == 0
-  # end
-  #
-  # private
-  #
-  # def checksum_function
-  #   bin = to_binary_s
-  #   dbytes = bin.unpack('S>*')
-  #   acc = dbytes.inject(:+)
-  #   acc = ((acc >> 16) & 0xffff) + (acc & 0xffff)
-  #   ~acc & 0xffff
-  # end
-
-  # TODO: need IP parent for checksum
-end

data/lib/udp.rb

@@ -1,14 +0,0 @@
-require 'bindata'
-
-class Udp < BinData::Record
-  endian :big
-  uint16 :source_port
-  uint16 :destination_port
-  uint16 :len, initial_value: -> { 8 + payload.length }
-  uint16 :checksum
-  rest :payload
-
-  def length
-    len
-  end
-end