Enhance analyzer and header classes to include packet count in analysis and output formatting

Author: ydah

lib/redhound/analyzer.rb

@@ -2,17 +2,17 @@
 
 module Redhound
   class Analyzer
-    def self.analyze(msg:)
-      new(msg: msg).analyze
+    def self.analyze(msg:, count:)
+      new(msg:, count:).analyze
     end
 
-    def initialize(msg:)
+    def initialize(msg:, count:)
       @msg = msg
+      @count = count
     end
 
     def analyze
-      puts 'Analyzing...'
-      ether = Header::Ether.generate(bytes: @msg.bytes[0..13])
+      ether = Header::Ether.generate(bytes: @msg.bytes[0..13], count: @count)
       ether.dump
       return unless ether.ipv4?
 
@@ -25,7 +25,6 @@ def analyze
         icmp = Header::Icmp.generate(bytes: @msg.bytes[34..])
         icmp.dump
       end
-      puts
     end
   end
 end

lib/redhound/header/ether.rb

@@ -6,15 +6,16 @@ class Ether
       ETH_P_IP = 0x0800
 
       class << self
-        def generate(bytes:)
-          new(bytes:).generate
+        def generate(bytes:, count:)
+          new(bytes:, count:).generate
         end
       end
 
-      def initialize(bytes:)
+      def initialize(bytes:, count:)
         raise ArgumentError, 'bytes must be 14 bytes' unless bytes.size == 14
 
         @bytes = bytes
+        @count = count
       end
 
       def generate
@@ -29,16 +30,11 @@ def ipv4?
       end
 
       def dump
-        puts 'ETHERNET HEADER----------------'
         puts self
       end
 
       def to_s
-        <<~ETHER
-          Destination MAC: #{dhost}
-          Source MAC: #{shost}
-          Type: #{type}
-        ETHER
+        "[#{@count}] Ethernet Dst: #{dhost} Src: #{shost} Type: #{type}"
       end
 
       def dhost

lib/redhound/header/icmp.rb

@@ -31,26 +31,19 @@ def generate
       end
 
       def dump
-        puts 'ICMP HEADER----------------'
         puts self
       end
 
       def to_s
         if @type.zero? || @type == 8
-          <<~ICMP
-            Type: #{@type}
-            Code: #{@code}
-            Checksum: #{check}
-            ID: #{id}
-            Sequence: #{seq}
-            Data: #{data}
+          <<-ICMP.chomp
+    └─ ICMP Type: #{@type} Code: #{@code} Checksum: #{check} ID: #{id} Sequence: #{seq}
+        └─ Payload: #{data}
           ICMP
         else
-          <<~ICMP
-            Type: #{@type}
-            Code: #{@code}
-            Checksum: #{check}
-            Data: #{data}
+          <<-ICMP.chomp
+    └─ ICMP Type: #{@type} Code: #{@code} Checksum: #{check}
+        └─ Payload: #{data}
           ICMP
         end
       end
@@ -70,7 +63,7 @@ def seq
       end
 
       def data
-        @data.map(&:chr).join
+        @data.map(&:chr).join.force_encoding("UTF-8")
       end
     end
   end

lib/redhound/header/ipv4.rb

@@ -43,24 +43,11 @@ def udp?
       end
 
       def dump
-        puts 'IPv4 HEADER----------------'
         puts self
       end
 
       def to_s
-        <<~IPV4
-          Version: #{@version}
-          IHL: #{@ihl}
-          TOS: #{@tos}
-          Total Length: #{tot_len}
-          ID: #{id}
-          Fragment Offset: #{frag_off}
-          TTL: #{@ttl}
-          Protocol: #{protocol}
-          Checksum: #{check}
-          Source IP: #{saddr}
-          Destination IP: #{daddr}
-        IPV4
+        " └─ IPv4 Ver: #{version} IHL: #{ihl} TOS: #{@tos} Total Length: #{tot_len} ID: #{id} Offset: #{frag_off} TTL: #{@ttl} Protocol: #{protocol} Checksum: #{check} Src: #{saddr} Dst: #{daddr}"
       end
 
       private

lib/redhound/header/udp.rb

@@ -25,17 +25,13 @@ def generate
       end
 
       def dump
-        puts 'UDP HEADER----------------'
         puts self
       end
 
       def to_s
-        <<~UDP
-          Source Port: #{sport}
-          Destination Port: #{dport}
-          Length: #{len}
-          Checksum: #{check}
-          Data: #{data}
+        <<-UDP
+    └─ UDP Src: #{sport} Dst: #{dport} Len: #{len} Checksum: #{check}
+        └─ Payload: #{data}
         UDP
       end
 

lib/redhound/receiver.rb

@@ -17,17 +17,24 @@ def initialize(ifname:, filename:)
         @writer = Writer.new(filename:)
         @writer.start
       end
+      @count = 0
     end
 
     def run
       loop do
         msg, = @source.next_packet
-        Analyzer.analyze(msg:)
+        Analyzer.analyze(msg:, count: increment)
         @writer&.write(msg)
       rescue Interrupt
         @writer&.stop
         break
       end
     end
+
+    private
+
+    def increment
+      @count.tap { @count += 1 }
+    end
   end
 end