Rename Arp::Request#to_hex -> Arp::Request#to_ruby

trema · Jul 6, 2016 · 0b63478 · 0b63478
1 parent d39a712
commit 0b63478
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 40 deletions.
diff --git a/features/.nav b/features/.nav
@@ -1,5 +1,6 @@
 - icmp.feature
-- arp.feature
+- arp_request.feature
+- arp_reply.feature
 - lldp.feature
 - dhcp.feature
 - udp.feature

diff --git a/features/arp_reply.feature b/features/arp_reply.feature
@@ -3,8 +3,8 @@ Feature: Arp Reply
     When I create a packet with:
       """
       Pio::Arp::Reply.new(
-        source_mac: '00:16:9d:1d:9c:c4',
         destination_mac: '00:26:82:eb:ea:d1',
+        source_mac: '00:16:9d:1d:9c:c4',
         sender_protocol_address: '192.168.83.254',
         target_protocol_address: '192.168.83.3'
       )
@@ -25,6 +25,34 @@ Feature: Arp Reply
       | target_hardware_address | 00:26:82:eb:ea:d1 |
       | target_protocol_address |      192.168.83.3 |
 
+  Scenario: convert to Ruby code
+    When I eval the following Ruby code:
+      """ruby
+      Pio::Arp::Reply.new(
+        destination_mac: '00:26:82:eb:ea:d1',
+        source_mac: '00:16:9d:1d:9c:c4',
+        sender_protocol_address: '192.168.83.254',
+        target_protocol_address: '192.168.83.3'
+      ).to_ruby
+      """
+    Then the result of eval should be:
+      """ruby
+      [
+        0x00, 0x26, 0x82, 0xeb, 0xea, 0xd1, # destination_mac
+        0x00, 0x16, 0x9d, 0x1d, 0x9c, 0xc4, # source_mac
+        0x08, 0x06, # ether_type
+        0x00, 0x01, # hardware_type
+        0x08, 0x00, # protocol_type
+        0x06, # hardware_length
+        0x04, # protocol_length
+        0x00, 0x02, # operation
+        0x00, 0x16, 0x9d, 0x1d, 0x9c, 0xc4, # sender_hardware_address
+        0xc0, 0xa8, 0x53, 0xfe, # sender_protocol_address
+        0x00, 0x26, 0x82, 0xeb, 0xea, 0xd1, # target_hardware_address
+        0xc0, 0xa8, 0x53, 0x03, # target_protocol_address
+      ].pack('C*')
+      """
+
   Scenario: parse arp.pcap
     Then I parse a file named "arp.pcap" with "Pio::Arp" class
 

diff --git a/features/arp_request.feature b/features/arp_request.feature
@@ -24,27 +24,29 @@ Feature: Arp Request
       | target_hardware_address | 00:00:00:00:00:00 |
       | target_protocol_address |    192.168.83.254 |
 
-  Scenario: convert to hex string
+  Scenario: convert to Ruby code
     When I eval the following Ruby code:
       """ruby
       Pio::Arp::Request.new(
         source_mac: '00:26:82:eb:ea:d1',
         sender_protocol_address: '192.168.83.3',
         target_protocol_address: '192.168.83.254'
-      ).to_hex
+      ).to_ruby
       """
     Then the result of eval should be:
-      """
-      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, # destination_mac
-      0x00, 0x26, 0x82, 0xeb, 0xea, 0xd1, # source_mac
-      0x08, 0x06, # ether_type
-      0x00, 0x01, # hardware_type
-      0x08, 0x00, # protocol_type
-      0x06, # hardware_length
-      0x04, # protocol_length
-      0x00, 0x01, # operation
-      0x00, 0x26, 0x82, 0xeb, 0xea, 0xd1, # sender_hardware_address
-      0xc0, 0xa8, 0x53, 0x03, # sender_protocol_address
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # target_hardware_address
-      0xc0, 0xa8, 0x53, 0xfe, # target_protocol_address
+      """ruby
+      [
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, # destination_mac
+        0x00, 0x26, 0x82, 0xeb, 0xea, 0xd1, # source_mac
+        0x08, 0x06, # ether_type
+        0x00, 0x01, # hardware_type
+        0x08, 0x00, # protocol_type
+        0x06, # hardware_length
+        0x04, # protocol_length
+        0x00, 0x01, # operation
+        0x00, 0x26, 0x82, 0xeb, 0xea, 0xd1, # sender_hardware_address
+        0xc0, 0xa8, 0x53, 0x03, # sender_protocol_address
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # target_hardware_address
+        0xc0, 0xa8, 0x53, 0xfe, # target_protocol_address
+      ].pack('C*')
       """
diff --git a/lib/pio/arp/message.rb b/lib/pio/arp/message.rb
@@ -15,22 +15,14 @@ def method_missing(method, *args)
         @format.__send__ method, *args
       end
 
-      # rubocop:disable MethodLength
-      def to_hex
-        ethernet_header.to_hex + "\n" +
-          [:hardware_type,
-           :protocol_type,
-           :hardware_length,
-           :protocol_length,
-           :operation,
-           :sender_hardware_address,
-           :sender_protocol_address,
-           :target_hardware_address,
-           :target_protocol_address].map do |each|
-            __send__(each).to_hex + ", # #{each}"
-          end.join("\n")
+      # Returns a Ruby code representation of this packet, such that
+      # it can be eval'ed and sent later.
+      def to_ruby
+        hexes = @format.field_names.map do |each|
+          '  ' + __send__(each).to_hex + ", # #{each}" if __send__("#{each}?")
+        end.compact
+        ['[', *hexes, "].pack('C*')"].join("\n")
       end
-      # rubocop:enable MethodLength
     end
   end
 end
diff --git a/lib/pio/ethernet_header.rb b/lib/pio/ethernet_header.rb
@@ -22,14 +22,6 @@ class Parser < BinData::Record
       bit1 :vlan_cfi, onlyif: :vlan?
       bit12 :vlan_vid_internal, onlyif: :vlan?
       uint16 :ether_type_vlan, value: :ether_type, onlyif: :vlan?
-
-      def to_hex
-        [:destination_mac,
-         :source_mac,
-         :ether_type].map do |each|
-          __send__(each).to_hex + ", # #{each}"
-        end.join("\n")
-      end
     end
 
     # This method smells of :reek:TooManyStatements