Fix IPv4Header#to_ruby

trema · Jul 8, 2016 · c00240a · c00240a
1 parent 0c7870e
commit c00240a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/features/ipv4_header.feature b/features/ipv4_header.feature
@@ -45,7 +45,6 @@ Feature: IPv4Header
       | destination_ip_address |         4.3.2.1 |
       | ip_option              |                 |
 
-  @wip
   Scenario: convert IPv4 header to Ruby code
     When I eval the following Ruby code:
       """ruby

diff --git a/lib/pio/ruby_dumper.rb b/lib/pio/ruby_dumper.rb
@@ -13,10 +13,12 @@ def to_ruby
       bytes = ''
       bit = false
       bit_names = []
+      total_bit_length = 0
       field_names.each do |each|
         next unless __send__("#{each}?")
         if /Bit(\d+)$/ =~ __send__(each).class.to_s
-          bit_length = Regexp.last_match(1)
+          bit_length = Regexp.last_match(1).to_i
+          total_bit_length += bit_length
           if bit
             bit_names << each
             bytes << format("_%0#{bit_length}b", __send__(each))
@@ -28,11 +30,19 @@ def to_ruby
         else
           if bit
             bytes << ", # #{bit_names.join(', ')}\n"
-            pack_template << 'n'
+            if total_bit_length == 8
+              pack_template << 'C'
+            elsif total_bit_length == 16
+              pack_template << 'n'
+            else
+              raise
+            end
+            total_bit_length = 0
             bit_names = []
             bit = false
           end
           list = __send__(each).to_hex
+          next if list.empty?
           bytes << "  #{list}, # #{each}\n"
           pack_template << 'C' * (list.count(',') + 1)
         end