packetgen 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d79b3046c42fa081a32cbb80633d26115aa8d8a
-  data.tar.gz: 554c95accb7cba2eb8fd1199962b76c914d479dd
+  metadata.gz: 89bdf542e873de9589a6c7e70b3823ccc306ad02
+  data.tar.gz: 82fd50fd41475f7471954dde56174853e24dfd1d
 SHA512:
-  metadata.gz: 4543ec99fea03226b5a0acaf712f49e2683910953d852dcdff5ec1d71e3ec7e908efb32ee7a5e9707ed0bfe8ec33fba757922a7c0ae4a99e84401e8454e934f0
-  data.tar.gz: e4c77821a111d8d0b921c87067d3a890c2efd23d2127b0655863ca7b062ac1546746a9d2e0690b3622cc73e355b7592fbe34bbb2b75c3e7770d6ee82e2065a6a
+  metadata.gz: b64e2a6f45b6a35c085c819567f9c08ccb2a62502c74861634408b1e1f69fc4c6ac706ad5223f57095fa2f670b2b4d46b920a5f44ecb7fa49381386a7865b736
+  data.tar.gz: 733c4d48b547aef34bef53c196da7f7d29558286f9791542c316f22e939c2a8c8f75a8b9d372b518b0588723b48c5a84606943b271c41d81d84bd4a985714cb7

data/lib/packetgen/header.rb

@@ -16,6 +16,8 @@ require_relative 'header/header_class_methods'
 require_relative 'header/header_methods'
 require_relative 'header/eth'
 require_relative 'header/ip'
+require_relative 'header/icmp'
 require_relative 'header/arp'
 require_relative 'header/ipv6'
+require_relative 'header/icmpv6'
 require_relative 'header/udp'

data/lib/packetgen/header/icmp.rb

@@ -0,0 +1,97 @@
+module PacketGen
+  module Header
+
+    # ICMP header class
+    # @author Sylvain Daubert
+    class ICMP < Struct.new(:type, :code, :sum, :body)
+      include StructFu
+      include HeaderMethods
+      extend HeaderClassMethods
+
+      # ICMP internet protocol number
+      IP_PROTOCOL = 1
+
+      # @param [Hash] options
+      # @option options [Integer] :type
+      # @option options [Integer] :code
+      # @option options [Integer] :sum
+      # @option options [String] :body
+      def initialize(options={})
+        super Int8.new(options[:type]),
+              Int8.new(options[:code]),
+              Int16.new(options[:sum]),
+              StructFu::String.new.read(options[:body])
+      end
+
+      # Read a ICMP header from a string
+      # @param [String] str binary string
+      # @return [self]
+      def read(str)
+        return self if str.nil?
+        raise ParseError, 'string too short for Eth' if str.size < self.sz
+        force_binary str
+        self[:type].read str[0, 1]
+        self[:code].read str[1, 1]
+        self[:sum].read str[2, 2]
+        self[:body].read str[4..-1]
+      end
+
+      # Compute checksum and set +sum+ field
+      # @return [Integer]
+      def calc_sum
+        sum = (type << 8) | code
+
+        payload = body.to_s
+        payload << "\x00" unless payload.size % 2 == 0
+        payload.unpack('n*').each { |x| sum += x }
+
+        while sum > 0xffff do
+          sum = (sum & 0xffff) + (sum >> 16)
+        end
+        sum = ~sum & 0xffff
+        self[:sum].value = (sum == 0) ? 0xffff : sum
+      end
+
+      # Getter for type attribute
+      # @return [Integer]
+      def type
+        self[:type].to_i
+      end
+
+      # Setter for type attribute
+      # @param [Integer] type
+      # @return [Integer]
+      def type=(type)
+        self[:type].value = type
+      end
+
+      # Getter for code attribute
+      # @return [Integer]
+      def code
+        self[:code].to_i
+      end
+
+      # Setter for code attribute
+      # @param [Integer] code
+      # @return [Integer]
+      def code=(code)
+        self[:code].value = code
+      end
+
+      # Getter for sum attribute
+      # @return [Integer]
+      def sum
+        self[:sum].to_i
+      end
+
+      # Setter for sum attribute
+      # @param [Integer] sum
+      # @return [Integer]
+      def sum=(sum)
+        self[:sum].value = sum
+      end
+    end
+
+    IP.bind_header ICMP, proto: ICMP::IP_PROTOCOL
+  end
+end

data/lib/packetgen/header/icmpv6.rb

@@ -0,0 +1,33 @@
+module PacketGen
+  module Header
+
+    # ICMPv6 header class
+    # @author Sylvain Daubert
+    class ICMPv6 < ICMP
+
+      # ICMPv6 internet protocol number
+      IP_PROTOCOL = 58
+
+      # Compute checksum and set +sum+ field
+      # @return [Integer]
+      def calc_sum
+        sum = ip_header(self).pseudo_header_sum
+        sum += self.sz
+        sum += IP_PROTOCOL
+        sum +=(type << 8) | code
+
+        payload = body.to_s
+        payload << "\x00" unless payload.size % 2 == 0
+        payload.unpack('n*').each { |x| sum += x }
+
+        while sum > 0xffff do
+          sum = (sum & 0xffff) + (sum >> 16)
+        end
+        sum = ~sum & 0xffff
+        self[:sum].value = (sum == 0) ? 0xffff : sum
+      end
+    end
+
+    IPv6.bind_header ICMPv6, next: ICMPv6::IP_PROTOCOL
+  end
+end

data/lib/packetgen/header/ipv6.rb

@@ -130,7 +130,7 @@ module PacketGen
       # Compute length and set +len+ field
       # @return [Integer]
       def calc_length
-        self.length = body.length
+        self.length = body.sz
       end
 
       # Getter for length attribute

data/lib/packetgen/structfu.rb

@@ -239,6 +239,10 @@ module PacketGen
         self.replace str
         self
       end
+
+      # @author Sylvain Daubert
+      # Added for consistency with Struct classes
+      alias :sz :length
     end
 
     # Provides a primitive for creating strings, preceeded by

data/lib/packetgen/version.rb

@@ -3,5 +3,5 @@
 # @author Sylvain Daubert
 module PacketGen
   # PacketGen version
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packetgen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sylvain Daubert
@@ -114,6 +114,8 @@ files:
 - lib/packetgen/header/eth.rb
 - lib/packetgen/header/header_class_methods.rb
 - lib/packetgen/header/header_methods.rb
+- lib/packetgen/header/icmp.rb
+- lib/packetgen/header/icmpv6.rb
 - lib/packetgen/header/ip.rb
 - lib/packetgen/header/ipv6.rb
 - lib/packetgen/header/udp.rb