packetgen 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fde6bab111f7f367b7811089be8b96a9845dad53b7205d25db0931303654189
-  data.tar.gz: 06c46f06148846640ccfd123a21198c003ef2763c9ff78797fe27d9df4d25555
+  metadata.gz: 1db3896f30ec86544f468386feb20fcc301e39d5451383543e2ccabb7ca33585
+  data.tar.gz: 21e62d53f3915d9d19fbcf2475e4c9fd60dfe58c1427b7bd65ead51a298141ac
 SHA512:
-  metadata.gz: 8b0283250922dcaa606652e96f6f159d4fa2a4ce895b5539234e01da155bb5e50aa6286aba7cbc33246650e6739ec98de65676423c5f4c36aa1050024966f6bf
-  data.tar.gz: 179e87a341e6ae7a95e0a9a408fbde3b82601e21c37d49bd64d6dee3bb4debf82f77898e6e9e93b3763b3695feec19eb87396b0c6adb956bcbac13a293df2aa3
+  metadata.gz: f5dbe26467d9000d411a810e3a4165e842064a1ad4550b407013ef0b6dee98903a840ad228831a3b292c43d1c5d78e7a418d419eea777d00cab4f411d7d1e5dc
+  data.tar.gz: 66986fab978377b8cf10a1b9a48b2f7d4d4344cec74339db371e690bcd0c98c931699c41812f24998cf403c775feae2b4f53a99082daaced371244de332d7ce4

data/.travis.yml

@@ -6,15 +6,6 @@ rvm:
   - 2.4
   - 2.5
 
-matrix:
-  # allow 2.5 to fail until Travis CI is fixed.
-  # See travis-ci/travis-ci#8969
-  allow_failures:
-  - rvm: 2.5
-
-before_install:
-  # work around https://github.com/travis-ci/travis-ci/issues/8969
-  - travis_retry gem update --system
 install:
   - sudo apt-get update -qq
   - sudo apt-get install libpcap-dev -qq

data/lib/packetgen/config.rb

@@ -6,7 +6,7 @@
 # frozen_string_literal: true
 require 'socket'
 require 'singleton'
-require 'network_interface'
+require 'interfacez'
 
 module PacketGen
 
@@ -23,47 +23,34 @@ module PacketGen
     attr_reader :default_iface
 
     def initialize
-      begin
-        default_iface = Pcap.lookupdev
-      rescue PCAPRUB::BindingError
-        default_iface = NetworkInterface.interfaces.select { |i| i =~ /lo/ }.first
-      end
-      @default_iface = default_iface
+      @default_iface = Interfacez.default || Interfacez.loopback
       @hwaddr = {}
       @ipaddr = {}
       @ip6addr = {}
 
-      NetworkInterface.interfaces.each do |iface|
-        addresses = NetworkInterface.addresses(iface)
-        @hwaddr[iface] = 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[iface] = addresses[Socket::AF_INET][0]['addr'] if addresses[Socket::AF_INET]
-        if addresses[Socket::AF_INET6]
-          @ip6addr[iface] = addresses[Socket::AF_INET6].map { |hsh| hsh['addr'] }
-        end
+      Interfacez.all do |iface_name|
+        @hwaddr[iface_name] = Interfacez.mac_address_of(iface_name)
+        @ipaddr[iface_name] = Interfacez.ipv4_address_of(iface_name)
+        @ip6addr[iface_name] = Interfacez.ipv6_addresses_of(iface_name)
       end
     end
 
     # Get MAC address for given network interface
-    # @param [String,nil] iface network interface. Il +nil+, use default one.
+    # @param [String,nil] iface network interface. If +nil+, use default one.
     # @return [String]
     def hwaddr(iface=nil)
       @hwaddr[iface || @default_iface]
     end
     
     # Get IP address for given network interface
-    # @param [String,nil] iface network interface. Il +nil+, use default one.
+    # @param [String,nil] iface network interface. If +nil+, use default one.
     # @return [String]
     def ipaddr(iface=nil)
       @ipaddr[iface || @default_iface]
     end
         
     # Get IPv6 addresses for given network interface
-    # @param [String,nil] iface network interface. Il +nil+, use default one.
+    # @param [String,nil] iface network interface. If +nil+, use default one.
     # @return [Array<String>]
     def ip6addr(iface=nil)
       @ip6addr[iface || @default_iface]

data/lib/packetgen/header.rb

@@ -112,3 +112,4 @@ require_relative 'header/mld'
 require_relative 'header/mldv2'
 require_relative 'header/ospfv2'
 require_relative 'header/ospfv3'
+require_relative 'header/netbios'

data/lib/packetgen/header/base.rb

@@ -151,7 +151,8 @@ module PacketGen
       #   Header1.bind_header Header3, field1: 43, field2: 43
       #   Header1.bind_header Header4, op: :and, field1: 43, field2: 43
       #   Header1.bind_header Header5, field1: ->(v) { v.nil? ? 128 : v > 127 }
-      #   Header1.bind_header Header6, proc: ->(pkt) { pkt.header1.field1 == 1 && pkt.header1.body[0..1] == "\x00\x00" }
+      #   Header1.bind_header Header6, procs: [->(hdr) { hdr.field1 = 1 }
+      #                                        ->(hdr) { hdr.field1 == 1 && hdr.body[0..1] == "\x00\x00" }]
       # @param [Class] header_klass header class to bind to current class
       # @param [Hash] args current class fields and their value when +header_klass+
       #  is embedded in current class. Given value may be a lambda, whose alone argument
@@ -162,6 +163,10 @@ module PacketGen
       #  operation on this binding. By default, +:op+ is +:or+ (at least one binding
       #  must match to parse it). It also may be set to +:and+ (all bindings must match
       #  to parse it).
+      #  
+      #  Special key +procs+ may be used to set 2 lambdas, the former to set
+      #  fields, the former to check bindings. This may be used when multiple and
+      #  non-trivial checks should be made.
       # @return [void]
       def self.bind_header(header_klass, args={})
         op = args.delete(:op) || :or

data/lib/packetgen/header/ike/auth.rb

@@ -138,7 +138,7 @@ module PacketGen
                Transform::PRF_HMAC_SHA2_256, Transform::PRF_HMAC_SHA2_384,
                Transform::PRF_HMAC_SHA2_512
             digestname = Transform.constants.grep(/PRF_/).
-                         select { |c| Transform.const_get(c) == type }.first.
+                         detect { |c| Transform.const_get(c) == type }.
                          to_s.sub(/^PRF_HMAC_/, '').sub(/2_/, '')
             digest = OpenSSL::Digest.const_get(digestname).new
           else

data/lib/packetgen/header/ike/notify.rb

@@ -149,8 +149,7 @@ module PacketGen
         # @return [String]
         def human_protocol
           name = IKE.constants.grep(/PROTO/).
-                 select { |c| IKE.const_get(c) == protocol }.
-                 first || "proto #{protocol}"
+                 detect { |c| IKE.const_get(c) == protocol } || "proto #{protocol}"
           name.to_s.sub(/PROTO_/, '')
         end
 

data/lib/packetgen/header/ike/sa.rb

@@ -83,8 +83,7 @@ module PacketGen
         # @return [String]
         def to_human
           name = self.class.constants.grep(/TYPE_/).
-                 select { |c| self.class.const_get(c) == (type & 0x7fff) }.
-                 first || "attr[#{type & 0x7fff}]"
+                  detect { |c| self.class.const_get(c) == (type & 0x7fff) } || "attr[#{type & 0x7fff}]"
           name = name.to_s.sub(/TYPE_/, '')
           "#{name}=#{value}"
         end
@@ -300,8 +299,7 @@ module PacketGen
         # @return [String]
         def human_id
           name = self.class.constants.grep(/#{human_type}_/).
-                 select { |c| self.class.const_get(c) == id }.
-                 first || "ID=#{id}"
+                 detect { |c| self.class.const_get(c) == id } || "ID=#{id}"
            name.to_s.sub(/#{human_type}_/, '')
         end
 
@@ -470,8 +468,7 @@ module PacketGen
         # @return [String]
         def human_protocol
           name = IKE.constants.grep(/PROTO/).
-                 select { |c| IKE.const_get(c) == protocol }.
-                 first || "proto #{protocol}"
+                 detect { |c| IKE.const_get(c) == protocol } || "proto #{protocol}"
           name.to_s.sub(/PROTO_/, '')
         end
 

data/lib/packetgen/header/netbios.rb

@@ -0,0 +1,51 @@
+# 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
+    # Module to group all NetBIOS headers
+    # @author Sylvain Daubert
+    module NetBIOS
+      # NetBIOS Session Service messages.
+      # @author Sylvain Daubert
+      class Session < Base
+        # Port number for NetBIOS Session Service over TCP
+        TCP_PORT = 139
+        
+        # Session packet types
+        TYPES = {
+          'message'           => 0,
+          'request'           => 0x81,
+          'positive_response' => 0x82,
+          'negative_response' => 0x83,
+          'retarget_response' => 0x84,
+          'keep_alive'        => 0x85,
+        }
+        
+        # @!attribute type
+        #  8-bit session packet type
+        #  @return [Integer]
+        define_field :type, Types::Int8Enum, enum: TYPES
+        # @!attribute length
+        #  17-bit session packet length
+        #  @return [Integer]
+        define_field :length, Types::Int24
+        # @!attribute body
+        #  @return [String]
+        define_field :body, Types::String
+        
+        # Compute and set {#length} field
+        # @return [Integer] calculated length
+        def calc_length
+          Base.calculate_and_set_length(self, header_in_size: false)
+        end
+      end
+    end
+    self.add_class NetBIOS::Session
+    TCP.bind_header NetBIOS::Session, sport: NetBIOS::Session::TCP_PORT, dport: NetBIOS::Session::TCP_PORT
+  end
+end

data/lib/packetgen/packet.rb

@@ -179,7 +179,7 @@ module PacketGen
     # Recalculate all packet checksums
     # @return [void]
     def calc_checksum
-      @headers.reverse.each do |header|
+      @headers.reverse_each do |header|
         header.calc_checksum if header.respond_to? :calc_checksum
       end
     end

data/lib/packetgen/version.rb

@@ -10,5 +10,5 @@
 # @author Sylvain Daubert
 module PacketGen
   # PacketGen version
-  VERSION = '2.5.0'
+  VERSION = '2.5.1'
 end

data/packetgen.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_dependency 'pcaprub', '~>0.12.4'
-  spec.add_dependency 'network_interface'
+  spec.add_dependency 'interfacez', '~>1.0'
   spec.add_dependency 'rasn1', '~>0.5', '>= 0.6.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetgen
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pcaprub
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.12.4
 - !ruby/object:Gem::Dependency
-  name: network_interface
+  name: interfacez
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rasn1
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - lib/packetgen/header/mldv2/mcast_address_record.rb
 - lib/packetgen/header/mldv2/mlq.rb
 - lib/packetgen/header/mldv2/mlr.rb
+- lib/packetgen/header/netbios.rb
 - lib/packetgen/header/ospfv2.rb
 - lib/packetgen/header/ospfv2/db_description.rb
 - lib/packetgen/header/ospfv2/hello.rb