packetgen 2.4.0 → 2.5.0

data/lib/packetgen/types/enum.rb

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

data/lib/packetgen/types/fields.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 Types
 
@@ -71,7 +73,7 @@ module PacketGen
     #   # a size field
     #   define_field :body_size, PacketGen::Type::Int16
     #   # String field which length is taken from body_size field
-    #   define_field :body, PacketGen::Type::String, builder: ->(obj) { PacketGen::Type::String.new('', length_from: obj[:body_size]) }
+    #   define_field :body, PacketGen::Type::String, builder: ->(obj, type) { type.new('', length_from: obj[:body_size]) }
     #   # 16-bit enumeration type. As :default not specified, default to first value of enum
     #   define_field :type_class, PacketGen::Type::Int16Enum, enum: { 'class1' => 1, 'class2' => 2}
     #
@@ -120,7 +122,7 @@ module PacketGen
       #     # 16-bit value
       #     define_field :value2, Types::Int16
       #     # specific class, may use a specific constructor
-      #     define_field :value3, MyClass, builder: ->(obj) { Myclass.new(obj) }
+      #     define_field :value3, MyClass, builder: ->(obj, type) { type.new(obj) }
       #   end
       #
       #   bs = BinaryStruct.new
@@ -306,7 +308,9 @@ module PacketGen
                            end
 
           value = options[field] || default
-          if type < Types::Enum
+          if value.class <= type
+            @fields[field] = value
+          elsif type < Types::Enum
             case value
             when ::String
               @fields[field].value = value
@@ -423,7 +427,7 @@ module PacketGen
       # Return object as a hash
       # @return [Hash] keys: attributes, values: attribute values
       def to_h
-        Hash[fields.map { |f| [f, @fields[f]] }]
+        Hash[fields.map { |f| [f, @fields[f].to_human] }]
       end
 
       # Used to set body as value of body object.

data/lib/packetgen/types/int.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 Types
 
@@ -151,7 +153,7 @@ module PacketGen
       def to_s
         up8 = to_i >> 16
         down16 = to_i & 0xffff
-        if @endian == :little
+        if @endian == :big
           [up8, down16].pack('Cn')
         else
           [down16, up8].pack('vC')

data/lib/packetgen/types/int_string.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 Types
 

data/lib/packetgen/types/oui.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 Types
 

data/lib/packetgen/types/string.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 Types
 
@@ -44,6 +46,7 @@ module PacketGen
       end
 
       alias sz length
+      alias to_human to_s
     end
   end
 end

data/lib/packetgen/types/tlv.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 Types
 

data/lib/packetgen/utils.rb

@@ -2,6 +2,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_relative 'config'
 require_relative 'utils/arp_spoofer'
 
@@ -135,10 +137,10 @@ module PacketGen
       my_mac = Config.instance.hwaddr(options[:iface])
       my_ip = Config.instance.ipaddr(options[:iface])
       capture = Capture.new(iface: options[:iface],
-                            filter: "((ip src #{target1} and not ip dst #{my_ip}) or" +
-                                    " (ip src #{target2} and not ip dst #{my_ip}) or"+
-                                    " (ip dst #{target1} and not ip src #{my_ip}) or"+
-                                    " (ip dst #{target2} and not ip src #{my_ip}))"+
+                            filter: "((ip src #{target1} and not ip dst #{my_ip}) or" \
+                                    " (ip src #{target2} and not ip dst #{my_ip}) or" \
+                                    " (ip dst #{target1} and not ip src #{my_ip}) or" \
+                                    " (ip dst #{target2} and not ip src #{my_ip}))" \
                                     " and ether dst #{my_mac}")
 
       spoofer.start_all

data/lib/packetgen/utils/arp_spoofer.rb

@@ -2,6 +2,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 'thread'
 
 module PacketGen

data/lib/packetgen/version.rb

@@ -3,10 +3,12 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
+# frozen_string_literal: true
+
 # PacketGen is a network packet generator and analyzor.
 #
 # @author Sylvain Daubert
 module PacketGen
   # PacketGen version
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetgen
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pcaprub
@@ -155,6 +155,11 @@ files:
 - lib/packetgen/header/dhcp.rb
 - lib/packetgen/header/dhcp/option.rb
 - lib/packetgen/header/dhcp/options.rb
+- lib/packetgen/header/dhcpv6.rb
+- lib/packetgen/header/dhcpv6/duid.rb
+- lib/packetgen/header/dhcpv6/option.rb
+- lib/packetgen/header/dhcpv6/options.rb
+- lib/packetgen/header/dhcpv6/relay.rb
 - lib/packetgen/header/dns.rb
 - lib/packetgen/header/dns/name.rb
 - lib/packetgen/header/dns/opt.rb
@@ -217,6 +222,23 @@ files:
 - lib/packetgen/header/mldv2/mcast_address_record.rb
 - lib/packetgen/header/mldv2/mlq.rb
 - lib/packetgen/header/mldv2/mlr.rb
+- lib/packetgen/header/ospfv2.rb
+- lib/packetgen/header/ospfv2/db_description.rb
+- lib/packetgen/header/ospfv2/hello.rb
+- lib/packetgen/header/ospfv2/ls_ack.rb
+- lib/packetgen/header/ospfv2/ls_request.rb
+- lib/packetgen/header/ospfv2/ls_update.rb
+- lib/packetgen/header/ospfv2/lsa.rb
+- lib/packetgen/header/ospfv2/lsa_header.rb
+- lib/packetgen/header/ospfv3.rb
+- lib/packetgen/header/ospfv3/db_description.rb
+- lib/packetgen/header/ospfv3/hello.rb
+- lib/packetgen/header/ospfv3/ipv6_prefix.rb
+- lib/packetgen/header/ospfv3/ls_ack.rb
+- lib/packetgen/header/ospfv3/ls_request.rb
+- lib/packetgen/header/ospfv3/ls_update.rb
+- lib/packetgen/header/ospfv3/lsa.rb
+- lib/packetgen/header/ospfv3/lsa_header.rb
 - lib/packetgen/header/snmp.rb
 - lib/packetgen/header/tcp.rb
 - lib/packetgen/header/tcp/option.rb
@@ -268,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Network packet generator and analyzor