packetgen 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eee53816de9d4f92c8e4eaef9d0e7e366fccdae2
-  data.tar.gz: a02bf2781972588fadd2f9bf2a94603b81353563
+  metadata.gz: 4b5b7c4c6b94e7e5e2323d99a06f687109495539
+  data.tar.gz: 363abe5a21f82d8f0fe8f791912109c55d795218
 SHA512:
-  metadata.gz: cf215ff8ebb85469fc383a77a4a92f63cb7b384afa7aabec96b1d69efb2fe41dde5f5b44cefacde92c9af0d3c7c4244c6a1f29ed39d45ac3221b2cd9fe485345
-  data.tar.gz: c0a6cd54c3fb4813bd31e56c718057ad985e8f54d0ae25766d2c445fa0144af2831e34ec7fdc38fe26bb8eedc4be79dbd89a7e99b956463c2a8ef77a5e6a5abd
+  metadata.gz: 7782f886a780d71bd9e976bb9185742979f8a5d0a4818a07a9b8c249d4628616db690a4620e80a346ec19357df288c4d2b598804095b648e1373cf9f99c15a73
+  data.tar.gz: e8838e0e6ba458472090661066cdd90ac4358f02e4eea53adf4c2c09867ee83c0e4c318241a30f0cb255d91cf393319002b378c174161744596b2bd2f84e2e2d

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

@@ -59,6 +59,7 @@ module PacketGen
       end
 
       # IEEE 802.11 Association Request frame
+      # @author Sylvain Daubert
       class AssoReq < SubMngt
         # @!attribute cap
         #  @return [Integer] 16-bit capabillities word
@@ -71,6 +72,7 @@ module PacketGen
       Management.bind_header AssoReq, op: :and, type: 0, subtype: 0
 
       # IEEE 802.11 Association Response frame
+      # @author Sylvain Daubert
       class AssoResp < SubMngt
         # @!attribute cap
         #  @return [Integer] 16-bit capabillities word
@@ -86,6 +88,7 @@ module PacketGen
       Management.bind_header AssoResp, op: :and, type: 0, subtype: 1
 
       # IEEE 802.11 ReAssociation Request frame
+      # @author Sylvain Daubert
       class ReAssoReq < AssoReq
         # @!attribute current_ap
         #  @return [Eth::MAcAddr]
@@ -95,18 +98,21 @@ module PacketGen
       Management.bind_header ReAssoReq, op: :and, type: 0, subtype: 2
 
       # IEEE 802.11 ReAssociation Response frame
+      # @author Sylvain Daubert
       class ReAssoResp < AssoResp
       end
       Header.add_class ReAssoResp
       Management.bind_header ReAssoResp, op: :and, type: 0, subtype: 3
 
       # IEEE 802.11 Probe Request frame
+      # @author Sylvain Daubert
       class ProbeReq < SubMngt
       end
       Header.add_class ProbeReq
       Management.bind_header ProbeReq, op: :and, type: 0, subtype: 4
 
       # IEEE 802.11 Probe Response frame
+      # @author Sylvain Daubert
       class ProbeResp < SubMngt
         # @!attribute timestamp
         #  @return [Integer] 64-bit timestamp
@@ -122,6 +128,7 @@ module PacketGen
       Management.bind_header ProbeResp, op: :and, type: 0, subtype: 5
 
       # IEEE 802.11 Beacon frame
+      # @author Sylvain Daubert
       class Beacon < SubMngt
         # @!attribute timestamp
         #  @return [Integer] 64-bit timestamp
@@ -137,11 +144,13 @@ module PacketGen
       Management.bind_header Beacon, op: :and, type: 0, subtype: 8
 
       # IEEE 802.11 ATIM frame
+      # @author Sylvain Daubert
       class ATIM < SubMngt; end
       Header.add_class ATIM
       Management.bind_header ATIM, op: :and, type: 0, subtype: 9
 
       # IEEE 802.11 Disassociation frame
+      # @author Sylvain Daubert
       class Disas < SubMngt
         # @!attribute reason
         #  @return [Integer] 16-bit reason value
@@ -151,6 +160,7 @@ module PacketGen
       Management.bind_header Disas, op: :and, type: 0, subtype: 10
 
       # IEEE 802.11 Authentication frame
+      # @author Sylvain Daubert
       class Auth < SubMngt
         # @!attribute algo
         #  @return [Integer] 16-bit algo value
@@ -166,6 +176,7 @@ module PacketGen
       Management.bind_header Auth, op: :and, type: 0, subtype: 11
 
       # IEEE 802.11 Deauthentication frame
+      # @author Sylvain Daubert
       class DeAuth < SubMngt
         # @!attribute reason
         #  @return [Integer] 16-bit reason value

data/lib/packetgen/packet.rb

@@ -43,6 +43,8 @@ module PacketGen
   #
   # == Save packets to a file
   #  Packet.write 'file.pcapng', packets
+  #
+  # @author Sylvain Daubert
   class Packet
     # @return [Array<Header::Base]
     attr_reader :headers
@@ -91,11 +93,23 @@ module PacketGen
 
     # Read packets from +filename+.
     #
-    # For more control, see {PcapNG::File}.
-    # @param [String] filename PcapNG file
+    # For more control, see {PcapNG::File} or {PCAPRUB::Pcap}.
+    # @param [String] filename PcapNG or Pcap file.
     # @return [Array<Packet>]
+    # @author Sylvain Daubert
+    # @author Kent Gruber
     def self.read(filename)
-      PcapNG::File.new.read_packets filename
+      begin
+        PcapNG::File.new.read_packets filename
+      rescue => e
+        raise ArgumentError, e unless File.extname(filename.downcase) == '.pcap'
+        packets = []
+        PCAPRUB::Pcap.open_offline(filename).each_packet do |packet|
+          next unless packet = PacketGen.parse(packet.to_s)  
+          packets << packet
+        end
+        packets
+      end
     end
 
     # Write packets to +filename+

data/lib/packetgen/pcapng/epb.rb

@@ -19,6 +19,7 @@ module PacketGen
     #   String  :data
     #   String  :options
     #   Int32   :block_len2
+    # @author Sylvain Daubert
     class EPB < Block
 
       # Minimum EPB size

data/lib/packetgen/pcapng/file.rb

@@ -7,6 +7,7 @@ module PacketGen
   module PcapNG
 
     # PcapNG::File is a complete Pcap-NG file handler.
+    # @author Sylvain Daubert
     class File
 
       # Known link types

data/lib/packetgen/pcapng/idb.rb

@@ -16,6 +16,7 @@ module PacketGen
     #   Int64   :snaplen        Default: 0 (no limit)
     #   String  :options
     #   Int32   :block_len2
+    # @author Sylvain Daubert
     class IDB < Block
 
       # Minimum IDB size

data/lib/packetgen/pcapng/shb.rb

@@ -17,6 +17,7 @@ module PacketGen
     #   Int64   :section_len
     #   String  :options        Default: ''
     #   Int32   :block_len2
+    # @author Sylvain Daubert
     class SHB < Block
 
       # @return [:little, :big]

data/lib/packetgen/pcapng/spb.rb

@@ -14,6 +14,7 @@ module PacketGen
     #   Int32   :orig_len
     #   String  :data
     #   Int32   :block_len2
+    # @author Sylvain Daubert
     class SPB < Block
 
       # Minimum SPB size

data/lib/packetgen/pcapng/unknown_block.rb

@@ -7,6 +7,7 @@ module PacketGen
   module PcapNG
 
     # {UnknownBlock} is used to handle unsupported blocks of a pcapng file.
+    # @author Sylvain Daubert
     class UnknownBlock < Block
 
       # Minimum Iblock size

data/lib/packetgen/pcapng.rb

@@ -8,6 +8,7 @@ module PacketGen
 
   # Module to handle PCAP-NG file format.
   # See http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc.cgi?url=https://raw.githubusercontent.com/pcapng/pcapng/master/draft-tuexen-opsawg-pcapng.xml&modeAsFormat=html/ascii&type=ascii
+  # @author Sylvain Daubert
   module PcapNG
 
     # Section Header Block type number

data/lib/packetgen/types/tlv.rb

@@ -65,9 +65,9 @@ module PacketGen
           self.old_type = val
         else
           unless has_human_types?
-            raise TypeError, "no human types defined for #{self.class}"
+            raise TypeError, 'need an Integer'
           end
-          new_val = self.class::TYPES[val.to_s]
+          new_val = self.class::TYPES.key(val.to_s)
           raise ArgumentError, "unknown #{val.to_s} type" if new_val.nil?
           self.old_type = new_val
         end

data/lib/packetgen/version.rb

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

metadata

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