packetgen 2.4.0 → 2.5.0

data/lib/packetgen/header/dns.rb

@@ -1,3 +1,11 @@
+# coding: utf-8
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 
@@ -243,7 +251,7 @@ module PacketGen
       # @return [String]
       def inspect
         str = Inspect.dashed_line(self.class, 2)
-        to_h.each do |attr, value|
+        fields.each do |attr|
           if attr == :u16
             flags = [:qr, :aa, :tc, :rd, :ra].select! { |attr| send "#{attr}?" }.
                     map(&:to_s).join(',')
@@ -256,7 +264,7 @@ module PacketGen
             str << Inspect.shift_level(2)
             str << Inspect::FMT_ATTR % ['Integer', 'rcode', rcode]
           else
-            str << Inspect.inspect_attribute(attr, value, 2)
+            str << Inspect.inspect_attribute(attr, self[attr], 2)
           end
         end
         str

data/lib/packetgen/header/dns/name.rb

@@ -1,3 +1,10 @@
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class DNS

data/lib/packetgen/header/dns/opt.rb

@@ -1,3 +1,9 @@
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
 require_relative 'option'
 
 module PacketGen

data/lib/packetgen/header/dns/option.rb

@@ -1,3 +1,10 @@
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class DNS

data/lib/packetgen/header/dns/qdsection.rb

@@ -1,3 +1,10 @@
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class DNS
@@ -36,4 +43,3 @@ module PacketGen
     end
   end
 end
-

data/lib/packetgen/header/dns/question.rb

@@ -1,3 +1,10 @@
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class DNS

data/lib/packetgen/header/dns/rr.rb

@@ -1,3 +1,10 @@
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class DNS

data/lib/packetgen/header/dns/rrsection.rb

@@ -1,3 +1,10 @@
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class DNS

data/lib/packetgen/header/dot11.rb

@@ -3,6 +3,8 @@
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
+
+# frozen_string_literal: true
 require 'zlib'
 
 module PacketGen
@@ -53,7 +55,7 @@ module PacketGen
         version == 0 and length >= 8
       end
 
-      # Calculate length field
+      # Calculate header length
       # @return [Integer] calculated length
       # @since 2.1.3
       def calc_length
@@ -114,7 +116,7 @@ module PacketGen
         version == 0 and length >= 8
       end
       
-      # Calculate length field
+      # Calculate header length
       # @return [Integer] calculated length
       # @since 2.1.3
       def calc_length

data/lib/packetgen/header/dot11/control.rb

@@ -4,6 +4,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class Dot11

data/lib/packetgen/header/dot11/data.rb

@@ -4,6 +4,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class Dot11

data/lib/packetgen/header/dot11/element.rb

@@ -4,6 +4,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class Dot11

data/lib/packetgen/header/dot11/management.rb

@@ -4,6 +4,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class Dot11

data/lib/packetgen/header/dot11/sub_mngt.rb

@@ -4,6 +4,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class Dot11

data/lib/packetgen/header/dot1q.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 

data/lib/packetgen/header/dot1x.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 
@@ -68,7 +70,7 @@ module PacketGen
       # @return [Integer]
       # @since 2.1.4
       def calc_length
-        self.length = body.sz
+        Base.calculate_and_set_length self, header_in_size: false
       end
     end
 

data/lib/packetgen/header/eap.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 
@@ -207,7 +209,7 @@ module PacketGen
       # Calculate length field from content
       # @return [Integer]
       def calc_length
-        self.length = sz
+        Base.calculate_and_set_length self
       end
 
       # Say is this EAP header has {#type} field

data/lib/packetgen/header/eap/fast.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class EAP

data/lib/packetgen/header/eap/md5.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class EAP

data/lib/packetgen/header/eap/tls.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class EAP

data/lib/packetgen/header/eap/ttls.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     class EAP

data/lib/packetgen/header/esp.rb

@@ -1,3 +1,10 @@
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 

data/lib/packetgen/header/eth.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 

data/lib/packetgen/header/gre.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 
@@ -68,15 +70,8 @@ module PacketGen
       # Compute checksum and set +checksum+ field
       # @return [Integer]
       def calc_checksum
-        str = to_s
-        str << "\x00" if str.length % 2 == 1
-        sum = str.unpack('n*').reduce(:+)
-
-        while sum > 0xffff do
-          sum = (sum & 0xffff) + (sum >> 16)
-        end
-        sum = ~sum & 0xffff
-        self[:checksum].value = (sum == 0) ? 0xffff : sum
+        sum = IP.sum16(self)
+        self.checksum = IP.reduce_checksum(sum)
       end
     end
 

data/lib/packetgen/header/http/headers.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 

data/lib/packetgen/header/http/request.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     module HTTP
@@ -76,7 +78,7 @@ module PacketGen
           raise FormatError, "Missing #method."  if self.method.empty?
           raise FormatError, "Missing #path."    if self.path.empty?
           raise FormatError, "Missing #version." if self.version.empty?
-          str = "" # build 'dat string
+          str = "".dup # build 'dat string
           str << self[:method] << " " << self[:path] << " " << self[:version] << "\r\n" << self[:headers].to_s
         end
       end

data/lib/packetgen/header/http/response.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
     module HTTP
@@ -100,7 +102,7 @@ module PacketGen
           raise FormatError, "Missing #status_code." if self.status_code.empty?
           raise FormatError, "Missing #status_mesg." if self.status_mesg.empty?
           raise FormatError, "Missing #version."     if self.version.empty? 
-          str = "" # build 'dat string
+          str = "".dup # build 'dat string
           str << self[:version] << " " << self[:status_code] << " " << self[:status_mesg] << "\r\n" 
           if self[:headers].given?
             str << self[:headers].to_s 

data/lib/packetgen/header/icmp.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 
@@ -50,17 +52,8 @@ module PacketGen
       # Compute checksum and set +checksum+ field
       # @return [Integer]
       def calc_checksum
-        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[:checksum].value = (sum == 0) ? 0xffff : sum
+        sum = IP.sum16(self)
+        self.checksum = IP.reduce_checksum(sum)
       end
     end
 

data/lib/packetgen/header/icmpv6.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 
@@ -37,17 +39,8 @@ module PacketGen
         sum = ip_header(self).pseudo_header_checksum
         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[:checksum].value = (sum == 0) ? 0xffff : sum
+        sum += IP.sum16(self)
+        self.checksum = IP.reduce_checksum(sum)
       end
     end
 

data/lib/packetgen/header/igmp.rb

@@ -3,6 +3,8 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 module PacketGen
   module Header
 
@@ -88,17 +90,8 @@ module PacketGen
       # Compute checksum and set +checksum+ field
       # @return [Integer]
       def calc_checksum
-        sum = (type << 8) | max_resp_time
-
-        payload = self[:group_addr].to_s + 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[:checksum].value = (sum == 0) ? 0xffff : sum
+        sum = IP.sum16(self)
+        self.checksum = IP.reduce_checksum(sum)
       end
 
       # Fixup IP header according to RFC 2236: