DIY-pcap 0.3.0 → 0.3.1

data/lib/diy/controller.rb

@@ -56,7 +56,7 @@ module DIY
       @round_count += 1
       DIY::Logger.info "round #{@round_count}: (c:#{client.__drburi} / s:#{server.__drburi}) #{pkts[0].pretty_print}:(queue= #{pkts.size})"
       if pkts.size >= 10
-        DIY::Logger.warn "queue size too big: #{pkts.size}, maybe something error"
+        DIY::Logger.info "queue size too big: #{pkts.size}, maybe something error"
       end
       server.ready do |recv_pkt|
         next if @error_flag # error accur waiting other thread do with it

data/lib/diy/offline.rb

@@ -112,6 +112,8 @@ module DIY
       if @position >= @pcap_files.size - 1
         raise EOFError, " end of pcaps "
       end
+      # must close before's handle
+      @off.close
       @position += 1
       DIY::Logger.info("pcap file changed: #{@pcap_files[@position]} ( #{@position} of #{@pcap_files.size} )")
       @off = FFI::PCap::Offline.new(@pcap_files[@position])

data/lib/diy/parser/mu/pcap/ethernet.rb

@@ -21,7 +21,13 @@ class Ethernet < Packet
         super()
         @src = src
         @dst = dst
-        @type = type
+        @type = type
+        @vlan = false
+    end
+    attr_accessor :vlan
+    
+    def vlan?
+      vlan
     end
 
     def flow_id
@@ -44,13 +50,19 @@ class Ethernet < Packet
         dst = MAC_TEMPLATE % dst
         src = bytes.slice!(0,6).unpack FMT_MAC
         src = MAC_TEMPLATE % src
-        type = bytes.slice!(0,2).unpack(FMT_n)[0]
+        type = bytes.slice!(0,2).unpack(FMT_n)[0]
+        if type == ETHERTYPE_802_1Q
+          @vlan = true
+        else
+          @vlan = false
+        end
         while (type == ETHERTYPE_802_1Q)
             # Skip 4 bytes for 802.1q vlan tag field
             bytes.slice!(0,2)
             type = bytes.slice!(0,2).unpack(FMT_n)[0]
         end
-        ethernet = Ethernet.new src, dst, type
+        ethernet = Ethernet.new src, dst, type
+        ethernet.vlan = @vlan
         ethernet.payload = bytes
         ethernet.payload_raw = bytes
         begin

data/lib/diy/strategy.rb

@@ -2,10 +2,11 @@ module DIY
   # 这个策略是一个最基本的: 
   # 具体返回值含义见 @BasicStrategy
   class Strategy
-    OK = true
-    OK_NO_POP = SKIP = 1
-    FAIL = false
-    NONE = nil
+    OK = "S_OK"
+    OK_NO_POP = SKIP = "S_OK_NO_POP"
+    FAIL = "S_FAIL"
+    NONE = "S_NONE"
+    NONE_HOPE_SKIP = NONE_HOPE_POP = "S_NONE_HOPE_POP" 
   end
   
   class BasicStrategy < Strategy
@@ -21,6 +22,7 @@ module DIY
     # SKIP: 同上, 可用于跳过以后所有策略队列使用.
     # FAIL: 肯定失败时使用
     # NONE: 不匹配, 让框架进行下一个报文匹配
+    # NONE_HOPE_POP: 跳过期望报文, 但继续让框架进行下一个报文匹配
     def call(hope_pkt, recv_pkt, queue)
       raise "write code here"
     end
@@ -41,7 +43,7 @@ module DIY
   class SkipSameMacStrategy < BasicStrategy
     def call(hope_pkt, recv_pkt, queue)
       if hope_pkt[0..5] == hope_pkt[6..11]
-        return OK
+        return NONE_HOPE_POP
       else
         return NONE
       end

data/lib/diy/strategy_builder.rb

@@ -50,6 +50,10 @@ module DIY
           elsif ret == Strategy::NONE
             #~ logger.debug("pkt jumpped:")
             next
+          elsif ret == Strategy::NONE_HOPE_POP
+            queue.shift
+            hope_pkt = queue.first
+            next
           end # end of if
         end # end of begin
       end # end of each

data/lib/diy/version.rb

@@ -1,5 +1,5 @@
 module DIY
   class PCAP
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/controller_spec.rb

@@ -45,6 +45,27 @@ describe "Controller" do
     end
     lambda { builder.run }.should_not raise_error  
   end
+  
+  it "#run none_hope_skip" do
+    running = false
+    hope_skip = lambda { |h, r, q|
+      if running == false
+        running == true
+        return DIY::Strategy::NONE_HOPE_SKIP
+      else
+        return DIY::Strategy::NONE
+      end
+    }
+    
+    sleep 1
+    builder = DIY::Builder.new do
+      pcapfiles "helper/http.pcap"
+      use hope_skip
+      use DIY::SimpleStrategy.new
+      timeout 10
+    end
+    lambda { builder.run }.should_not raise_error    
+  end
     
   it "#run stragety error" do
     

data/spec/mu_parser_spec.rb

@@ -2,11 +2,19 @@ require 'spec_helper'
 
 describe Mu do
   let(:pkt) { File.open("helper/tcp.dat", "rb") { |f| f.read } }
+  let(:vlan_pkt) { File.open("helper/vlan.dat", "rb") { |f| f.read } }
   it "#ethernet parse" do
     eth = Mu::Pcap::Ethernet.from_bytes(pkt)
+    eth.vlan.should == false
     eth.should be_ip
     ip = eth.payload
     tcp = ip.payload
     tcp.should be_kind_of(Mu::Pcap::TCP)
   end
+
+  it "#ethernet vlan" do
+    eth = Mu::Pcap::Ethernet.from_bytes(vlan_pkt)
+    eth.vlan.should == true
+    eth.should be_vlan
+  end
 end

data/spec/offline_spec.rb

@@ -41,4 +41,17 @@ describe DIY::Offline do
     lambda { loop do offline.nexts end }.should raise_error(DIY::EOFError)
   end
   
+  it "should open many files" do
+      files = []
+      600.times do
+        files << "helper/http.pcap"
+      end
+      puts "files size = #{files.size}"
+      offline = DIY::Offline.new(files)
+      lambda {
+      loop do
+        offline.next_pcap
+      end }.should raise_error(DIY::EOFError)
+  end
+  
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: DIY-pcap
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - yafei Lee
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-11 00:00:00 +08:00
-default_executable: 
+date: 2012-10-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi-pcap
@@ -25,6 +25,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 2
@@ -137,6 +138,7 @@ files:
 - spec/helper/pkt5
 - spec/helper/ssh.pcap
 - spec/helper/tcp.dat
+- spec/helper/vlan.dat
 - spec/live_spec.rb
 - spec/logger_spec.rb
 - spec/mu_parser_spec.rb
@@ -145,7 +147,6 @@ files:
 - spec/spec_helper.rb
 - spec/utils_spec.rb
 - spec/worker_spec.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -159,6 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -167,13 +169,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: DIY pcap send and recv