packetgen 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba692327da7837d4de41a002ca756a778692c74b
-  data.tar.gz: 38fca26934167acbd7d92981f160071c7fd1387f
+  metadata.gz: eee53816de9d4f92c8e4eaef9d0e7e366fccdae2
+  data.tar.gz: a02bf2781972588fadd2f9bf2a94603b81353563
 SHA512:
-  metadata.gz: 80d8155ad93876fcb14c5d1d85b3a374a1eb865784b914aed802dbb0ab07e97364d10e5affc2a094f4041f695774a41dd60a65e8da2fbdd92e27ca873ad60ddd
-  data.tar.gz: ac325e1dae38151f1f73ca05b6604a7373060aaee4a814e9d87c98b4de4e8e8aa64ba11f39930693d9cc8f9e4abb028918237d37e99f5a1becabdf93227effe9
+  metadata.gz: cf215ff8ebb85469fc383a77a4a92f63cb7b384afa7aabec96b1d69efb2fe41dde5f5b44cefacde92c9af0d3c7c4244c6a1f29ed39d45ac3221b2cd9fe485345
+  data.tar.gz: c0a6cd54c3fb4813bd31e56c718057ad985e8f54d0ae25766d2c445fa0144af2831e34ec7fdc38fe26bb8eedc4be79dbd89a7e99b956463c2a8ef77a5e6a5abd

data/lib/packetgen/config.rb

@@ -5,6 +5,7 @@ module PacketGen
 
   # Config class to provide +config+ object to pgconsole
   # @author Sylvain Daubert
+  # @author Kent 'picat' Gruber 
   class Config
 
     # Default network interface
@@ -20,18 +21,27 @@ module PacketGen
     # @return [String] 
     attr_reader :ip6addr
 
-    # Create a configuration object. If +iface+ is not set, get first network interface.
-    # If non exists, use loopback one.
+    # Create a configuration object. If +iface+ is not set,
+    # attempt to find it automatically or default to the 
+    # first available loopback interface.
     # @param [String,nil] iface
     def initialize(iface=nil)
       if iface.nil?
-        iface = NetworkInterface.interfaces.select { |iface| iface != 'lo' }.first
-        iface = NetworkInterface.interfaces.first if iface.nil?
+        begin
+          iface = Pcap.lookupdev
+        rescue PCAPRUB::BindingError
+          iface = NetworkInterface.interfaces.select { |iface| iface =~ /lo/ }.first
+        end
       end
       @iface = iface
 
       addresses = NetworkInterface.addresses(iface)
-      @hwaddr = addresses[Socket::AF_PACKET][0]['addr'] if addresses[Socket::AF_PACKET]
+      @hwaddr = case RbConfig::CONFIG['target_os']
+                when /darwin/
+                  addresses[Socket::AF_LINK][0]['addr'] if addresses[Socket::AF_LINK]
+                else
+                  addresses[Socket::AF_PACKET][0]['addr'] if addresses[Socket::AF_PACKET]
+                end
       @ipaddr = addresses[Socket::AF_INET][0]['addr'] if addresses[Socket::AF_INET]
       @ip6addr = addresses[Socket::AF_INET6][0]['addr'] if addresses[Socket::AF_INET6]
     end

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

@@ -30,24 +30,6 @@ module PacketGen
           self
         end
 
-        # Add a ressource record to this section. Increment associated counter
-        # @param [RR,Hash] rr
-        # @return [RRSection] self
-        def <<(rr)
-          push rr
-          @counter.read(@counter.to_i + 1)
-          self
-        end
-
-        # Delete a ressource
-        # @param [RR] rr
-        # @return [RR]
-        def delete(rr)
-          obj = super
-          @counter.read(@counter.to_i - 1) if obj
-          obj
-        end
-
         private
 
         def record_from_hash(hsh)

data/lib/packetgen/types/array.rb

@@ -6,11 +6,50 @@
 module PacketGen
   module Types
 
-    # @abstract
-    # Array supporting some fields methods
+    # @abstract Base class to define set of {Fields} subclasses.
+    # == #record_from_hash
+    # Subclasses should define private method +#record_from_hash+. This method
+    # is called by {#push} to add an object to the set.
+    #
+    # A default method is defined by {Array}: it calls constructor of class defined
+    # by {.set_of}.
     # @author Sylvain Daubert
     class Array < ::Array
 
+      # Separator used in {#to_human}.
+      # May be ovverriden by subclasses
+      HUMAN_SEPARATOR = ','
+
+      # Define type of objects in set. Used by {#read} and {#push}.
+      # @param [Class] klass
+      # @return [void]
+      def self.set_of(klass)
+        @klass = klass
+      end
+
+      # @param [Hash] options
+      # @option options [Int] counter Int object used as a counter for this set
+      def initialize(options={})
+        super()
+        @counter = options[:counter]
+      end
+
+      # Populate object from a string
+      # @param [String] str
+      # @return [self]
+      def read(str)
+        clear
+        return self if str.nil?
+        force_binary str
+        klass = self.class.class_eval { @klass }
+        while str.length > 0
+          obj = klass.new.read(str)
+          self.push obj
+          str.slice!(0, obj.sz)
+        end
+        self
+      end
+
       # @abstract depend on private method +#record_from_hash+ which should be
       #   declared by subclasses.
       # Add an object to this array
@@ -25,7 +64,26 @@ module PacketGen
               end
         super(obj)
       end
-      alias :<< :push
+
+      # @abstract depend on private method +#record_from_hash+ which should be
+      #   declared by subclasses.
+      # Add an object to this array, and increment associated counter, if any
+      # @param [Object] obj type depends on subclass
+      # @return [Array] self
+      def <<(obj)
+        push obj
+        @counter.read(@counter.to_i + 1) if @counter
+        self
+      end
+
+      # Delete an object from this array. Update associated counter if any
+      # @param [Object] obj
+      # @return [Object] deleted object
+      def delete(obj)
+        deleted = super
+        @counter.read(@counter.to_i - 1) if @counter && deleted
+        deleted
+      end
 
       # Get binary string
       # @return [String]
@@ -36,7 +94,7 @@ module PacketGen
       # Get a human readable string
       # @return [String]
       def to_human
-        map(&:to_human).join(',')
+        map(&:to_human).join(self.class::HUMAN_SEPARATOR)
       end
 
       # Get size in bytes
@@ -51,6 +109,17 @@ module PacketGen
       def force_binary(str)
         PacketGen.force_binary str
       end
+
+      private
+
+      def record_from_hash(obj)
+        obj_klass = self.class.class_eval { @klass }
+        if obj_klass
+          obj_klass.new(obj)
+        else
+          raise NotImplementedError, 'class should define #record_from_hash or declare type of elements in set with .set_of'
+        end
+      end
     end
   end
 end

data/lib/packetgen/types/int.rb

@@ -55,13 +55,23 @@ module PacketGen
         [to_i].pack(@packstr[@endian])
       end
 
+      # Convert Int to Integer
+      # @return [Integer]
       def to_i
         @value || @default
       end
 
+      # Convert Int to Float
+      # @return [Float]
       def to_f
         to_i.to_f
       end
+
+      # Give size in bytes of self
+      # @return [Integer]
+      def sz
+        to_s.size
+      end
     end
 
     # One byte integer

data/lib/packetgen/version.rb

@@ -8,5 +8,5 @@
 # @author Sylvain Daubert
 module PacketGen
   # PacketGen version
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetgen
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pcaprub