DIY-pcap 0.4.1 → 0.4.3

data/lib/diy/parser/mu/scenario/pcap/fields.rb

@@ -1,50 +1,50 @@
-# http://www.mudynamics.com
-# http://labs.mudynamics.com
-# http://www.pcapr.net
-
-require 'mu/scenario/pcap'
-
-module Mu
-class Scenario
-module Pcap
-
-class Fields
-    FIELDS = [
-        :rtp,
-        :"rtp.setup-frame"
-    ].freeze
-    FIELD_COUNT = FIELDS.length
-    SEPARATOR   = "\xff".freeze
-    TSHARK_OPTS = "-Eseparator='#{SEPARATOR}'" 
-    FIELDS.each do |field|
-        TSHARK_OPTS << " -e #{field}"
-    end
-    TSHARK_OPTS.freeze
-
-    def self.readline io
-        if ::IO.select [ io ], nil, nil, Pcap::TSHARK_READ_TIMEOUT
-            return io.readline.chomp
-        end 
-        
-        raise Errno::ETIMEDOUT, "read timed out"
-    end
-
-    def self.next_from_io io
-        if line = readline(io)
-            fields = line.split SEPARATOR, FIELD_COUNT
-            hash = {}
-            FIELDS.each do |key|
-                val = fields.shift
-                hash[key] = val.empty? ? nil : val
-            end
-            return hash
-        end
-    rescue Exception => e
-        Pcap.warning e.message
-        return nil
-    end
-
-end
-end
-end
-end
+# http://www.mudynamics.com
+# http://labs.mudynamics.com
+# http://www.pcapr.net
+
+require 'mu/scenario/pcap'
+
+module Mu
+class Scenario
+module Pcap
+
+class Fields
+    FIELDS = [
+        :rtp,
+        :"rtp.setup-frame"
+    ].freeze
+    FIELD_COUNT = FIELDS.length
+    SEPARATOR   = "\xff".freeze
+    TSHARK_OPTS = "-Eseparator='#{SEPARATOR}'" 
+    FIELDS.each do |field|
+        TSHARK_OPTS << " -e #{field}"
+    end
+    TSHARK_OPTS.freeze
+
+    def self.readline io
+        if ::IO.select [ io ], nil, nil, Pcap::TSHARK_READ_TIMEOUT
+            return io.readline.chomp
+        end 
+        
+        raise Errno::ETIMEDOUT, "read timed out"
+    end
+
+    def self.next_from_io io
+        if line = readline(io)
+            fields = line.split SEPARATOR, FIELD_COUNT
+            hash = {}
+            FIELDS.each do |key|
+                val = fields.shift
+                hash[key] = val.empty? ? nil : val
+            end
+            return hash
+        end
+    rescue Exception => e
+        Pcap.warning e.message
+        return nil
+    end
+
+end
+end
+end
+end

data/lib/diy/parser/mu/scenario/pcap/rtp.rb

@@ -1,71 +1,71 @@
-# http://www.mudynamics.com
-# http://labs.mudynamics.com
-# http://www.pcapr.net
-
-module Mu
-class Scenario
-module Pcap
-module Rtp
-
-    TRUNC_COUNT = 5
-
-    def self.preprocess packets, fields_per_packet
-        signaled_by = []
-        prev_signal_frame = {}
-        packets.each_with_index do |packet, idx|
-            fields = fields_per_packet[idx]
-            if fields and fields[:rtp]
-                flow_id = packet.flow_id
-                if frame = fields[:"rtp.setup-frame"]
-                    prev_signal_frame[flow_id] = frame
-                else
-                    if frame = prev_signal_frame[flow_id]
-                        fields[:"rtp.setup-frame"] = frame
-                    else
-                        packets[idx] = nil
-                        fields_per_packet[idx] = nil
-                        next
-                   end
-                end
-                sig_idx = frame.to_i 
-                signaled_by[idx] = sig_idx
-            end
-        end
-
-        flow_to_count = Hash.new 0
-        prev_setup_frame = {} 
-        keep_frames = []
-        packets.each_with_index do |packet, idx|
-            if setup_frame = signaled_by[idx]
-                flow = packet.flow_id
-                count = flow_to_count[flow]
-                if setup_frame != prev_setup_frame[flow]
-                    prev_setup_frame[flow] = setup_frame
-                    count = 1
-                else
-                    count += 1 
-                end
-                if count <= TRUNC_COUNT
-                    keep_frames << idx + 1
-                else
-                    packets[idx] = nil
-                    fields_per_packet[idx] = nil
-                end
-                flow_to_count[flow] = count
-            end
-        end
-
-        packets.reject! {|p| not p }
-        fields_per_packet.reject! {|p| not p }
-
-        filter = "not rtp"
-        keep_frames.each do |frame|
-            filter << " or frame.number == #{frame}"
-        end
-
-        return filter
-    end
-end
-end
-end
-end
+# http://www.mudynamics.com
+# http://labs.mudynamics.com
+# http://www.pcapr.net
+
+module Mu
+class Scenario
+module Pcap
+module Rtp
+
+    TRUNC_COUNT = 5
+
+    def self.preprocess packets, fields_per_packet
+        signaled_by = []
+        prev_signal_frame = {}
+        packets.each_with_index do |packet, idx|
+            fields = fields_per_packet[idx]
+            if fields and fields[:rtp]
+                flow_id = packet.flow_id
+                if frame = fields[:"rtp.setup-frame"]
+                    prev_signal_frame[flow_id] = frame
+                else
+                    if frame = prev_signal_frame[flow_id]
+                        fields[:"rtp.setup-frame"] = frame
+                    else
+                        packets[idx] = nil
+                        fields_per_packet[idx] = nil
+                        next
+                   end
+                end
+                sig_idx = frame.to_i 
+                signaled_by[idx] = sig_idx
+            end
+        end
+
+        flow_to_count = Hash.new 0
+        prev_setup_frame = {} 
+        keep_frames = []
+        packets.each_with_index do |packet, idx|
+            if setup_frame = signaled_by[idx]
+                flow = packet.flow_id
+                count = flow_to_count[flow]
+                if setup_frame != prev_setup_frame[flow]
+                    prev_setup_frame[flow] = setup_frame
+                    count = 1
+                else
+                    count += 1 
+                end
+                if count <= TRUNC_COUNT
+                    keep_frames << idx + 1
+                else
+                    packets[idx] = nil
+                    fields_per_packet[idx] = nil
+                end
+                flow_to_count[flow] = count
+            end
+        end
+
+        packets.reject! {|p| not p }
+        fields_per_packet.reject! {|p| not p }
+
+        filter = "not rtp"
+        keep_frames.each do |frame|
+            filter << " or frame.number == #{frame}"
+        end
+
+        return filter
+    end
+end
+end
+end
+end

data/lib/diy/parser/pcap.rb

@@ -1,113 +1,113 @@
-# http://www.mudynamics.com
-# http://labs.mudynamics.com
+# http://www.mudynamics.com
+# http://labs.mudynamics.com
 # http://www.pcapr.net
 
 $LOAD_PATH.unshift File.dirname(__FILE__)
-
-require 'socket'
+
+require 'socket'
 require 'stringio'
-require 'mu/fixnum_ext'
-
-module Mu
-
-class Pcap
-    class ParseError < StandardError ; end
-
-    LITTLE_ENDIAN = 0xd4c3b2a1
-    BIG_ENDIAN    = 0xa1b2c3d4
-
-    DLT_NULL      = 0
-    DLT_EN10MB    = 1
-    DLT_RAW       = 12 # DLT_LOOP in OpenBSD
-    DLT_LINUX_SLL = 113
-
-    attr_accessor :header, :pkthdrs
-    
-    def initialize
-        @header = Header.new
-        @pkthdrs = []
-    end
-
-    # Read PCAP file from IO and return Mu::Pcap.  If decode is true, also
-    # decode the Pkthdr packet contents to Mu::Pcap objects.
-    def self.read io, decode=true
-        pcap = Pcap.new
-        pcap.header = each_pkthdr(io, decode) do |pkthdr|
-            pcap.pkthdrs << pkthdr
-        end
-        return pcap
-    end
-
-    # Create PCAP from list of packets.
-    def self.from_packets packets
-        pcap = Pcap.new
-        packets.each do |packet|
-            pkthdr = Mu::Pcap::Pkthdr.new
-            pkthdr.pkt = packet
-            pcap.pkthdrs << pkthdr
-        end
-        return pcap
-    end
-
-    # Write PCAP file to IO.  Uses big-endian and linktype EN10MB.
-    def write io
-        @header.write io
-        @pkthdrs.each do |pkthdr|
-            pkthdr.write io
-        end
-    end
-
-    # Read PCAP packet headers from IO and return Mu::Pcap::Header.  If decode
-    # is true, also decode the Pkthdr packet contents to Mu::Pcap objects.  Use
-    # this for large files when each packet header can processed independently
-    # - it will perform better.
-    def self.each_pkthdr io, decode=true
-        header = Header.read io
-        while not io.eof?
-            pkthdr = Pkthdr.read io, header.magic
-            if decode
-                pkthdr.decode! header.magic, header.linktype
-            end
-            yield pkthdr
-        end
-        return header
-    end
-
-    # Read packets from PCAP
-    def self.read_packets io, decode=true
-        packets = []
-        each_pkthdr(io) { |pkthdr| packets << pkthdr.pkt }
-        return packets
-    end
-
-    # Assertion used during Pcap parsing
-    def self.assert cond, msg
-        if not cond
-            raise ParseError, msg
-        end
-    end
-
-    # Warnings from Pcap parsing are printed using this method.
-    def self.warning msg
-        $stderr.puts "WARNING: #{msg}"
-    end
-
-    def == other
-        return self.class == other.class &&
-            self.header   == other.header &&
-            self.pkthdrs  == other.pkthdrs
-    end
-end
-
-end
-
-require 'mu/pcap/header'
-require 'mu/pcap/pkthdr'
-require 'mu/pcap/packet'
-require 'mu/pcap/ethernet'
-require 'mu/pcap/ip'
-require 'mu/pcap/ipv4'
-require 'mu/pcap/ipv6'
-require 'mu/pcap/tcp'
-require 'mu/pcap/udp'
-require 'mu/pcap/sctp'
+require 'mu/fixnum_ext'
+
+module Mu
+
+class Pcap
+    class ParseError < StandardError ; end
+
+    LITTLE_ENDIAN = 0xd4c3b2a1
+    BIG_ENDIAN    = 0xa1b2c3d4
+
+    DLT_NULL      = 0
+    DLT_EN10MB    = 1
+    DLT_RAW       = 12 # DLT_LOOP in OpenBSD
+    DLT_LINUX_SLL = 113
+
+    attr_accessor :header, :pkthdrs
+    
+    def initialize
+        @header = Header.new
+        @pkthdrs = []
+    end
+
+    # Read PCAP file from IO and return Mu::Pcap.  If decode is true, also
+    # decode the Pkthdr packet contents to Mu::Pcap objects.
+    def self.read io, decode=true
+        pcap = Pcap.new
+        pcap.header = each_pkthdr(io, decode) do |pkthdr|
+            pcap.pkthdrs << pkthdr
+        end
+        return pcap
+    end
+
+    # Create PCAP from list of packets.
+    def self.from_packets packets
+        pcap = Pcap.new
+        packets.each do |packet|
+            pkthdr = Mu::Pcap::Pkthdr.new
+            pkthdr.pkt = packet
+            pcap.pkthdrs << pkthdr
+        end
+        return pcap
+    end
+
+    # Write PCAP file to IO.  Uses big-endian and linktype EN10MB.
+    def write io
+        @header.write io
+        @pkthdrs.each do |pkthdr|
+            pkthdr.write io
+        end
+    end
+
+    # Read PCAP packet headers from IO and return Mu::Pcap::Header.  If decode
+    # is true, also decode the Pkthdr packet contents to Mu::Pcap objects.  Use
+    # this for large files when each packet header can processed independently
+    # - it will perform better.
+    def self.each_pkthdr io, decode=true
+        header = Header.read io
+        while not io.eof?
+            pkthdr = Pkthdr.read io, header.magic
+            if decode
+                pkthdr.decode! header.magic, header.linktype
+            end
+            yield pkthdr
+        end
+        return header
+    end
+
+    # Read packets from PCAP
+    def self.read_packets io, decode=true
+        packets = []
+        each_pkthdr(io) { |pkthdr| packets << pkthdr.pkt }
+        return packets
+    end
+
+    # Assertion used during Pcap parsing
+    def self.assert cond, msg
+        if not cond
+            raise ParseError, msg
+        end
+    end
+
+    # Warnings from Pcap parsing are printed using this method.
+    def self.warning msg
+        $stderr.puts "WARNING: #{msg}"
+    end
+
+    def == other
+        return self.class == other.class &&
+            self.header   == other.header &&
+            self.pkthdrs  == other.pkthdrs
+    end
+end
+
+end
+
+require 'mu/pcap/header'
+require 'mu/pcap/pkthdr'
+require 'mu/pcap/packet'
+require 'mu/pcap/ethernet'
+require 'mu/pcap/ip'
+require 'mu/pcap/ipv4'
+require 'mu/pcap/ipv6'
+require 'mu/pcap/tcp'
+require 'mu/pcap/udp'
+require 'mu/pcap/sctp'