DIY-pcap 0.3.2 → 0.3.3

data/lib/diy/builder.rb

@@ -70,11 +70,23 @@ module DIY
     end
     alias pcapfiles pcapfile
     
+    def filter(reg)
+      @filter = reg
+    end
+    
+    def set_filter
+      if @filter
+        @client.filter(@filter)
+        @server.filter(@filter)
+      end
+    end
+    
     def run
       @offline ||= DIY::Offline.new('pcaps/example.pcap')
       @strategy_builder = DIY::StrategyBuilder.new
       @strategies.each { |builder| @strategy_builder.add(builder) }
       find_worker_keepers
+      set_filter
       controller = Controller.new( @client, @server, @offline, @strategy_builder )
       controller.before_send(&@before_send_hook)
       controller.timeout(@timeout) if @timeout

data/lib/diy/ext/capture_wrapper.rb

@@ -1,4 +1,5 @@
 require 'ffi/pcap'
+require 'ffi/pcap/capture_wrapper'
 
 unless defined?(FFI::PCap::CaptureWrapper)
   raise "must define FFI::PCap::CaptureWrapper before monkey fix"

data/lib/diy/live.rb

@@ -31,6 +31,10 @@ module DIY
       DIY::Logger.debug "stopped loop recv..."
     end
     
+    def set_filter(reg)
+      @live.set_filter(reg)
+    end
+    
     def break
       DIY::Logger.debug "stopping loop recv..."
       @running = false

data/lib/diy/mac_learner.rb

@@ -0,0 +1,53 @@
+module DIY
+  class MacLearner
+    def initialize(default_host = :A)
+      @default_host = default_host
+      @table = {}
+    end
+    
+    #
+    def learn(packet, where)
+      raise "Only receive :A or B for where argument" unless where == :A or where == :B
+      #~ @table.delete( src(packet) )
+      _learn( src(packet), where)
+    end
+    
+    def _learn(mac, where)
+      @table[mac] = where
+    end
+    
+    # 报告包所在的端口 A or B
+    # 如果包不在学习表内, 返回缺省端口(默认为A)
+    def tellme(packet)
+      src_p = src(packet)
+      if @table.has_key? src_p
+        where =  @table[src_p]
+      else
+        where = @default_host
+        _learn( src(packet), where )
+      end
+      _learn( dst(packet), other(where) )
+      where
+    end
+    
+    def other(where)
+      if where == :A
+        return :B
+      elsif where == :B
+        return :A
+      else
+        raise "Argument error"
+      end
+    end
+    
+    
+    private
+    def  src(packet)
+      Utils.src_mac(packet)
+    end
+    
+    def dst(packet)
+      Utils.dst_mac(packet)
+    end
+  end
+end

data/lib/diy/offline.rb

@@ -1,4 +1,5 @@
 # encoding : utf-8
+require 'diy/mac_learner'
 
 module DIY
   class Offline
@@ -6,6 +7,9 @@ module DIY
       @pcap_files = [ pcap_files ] if pcap_files.kind_of?(String)
       @pcap_files ||= pcap_files
       @off = FFI::PCap::Offline.new(@pcap_files[0])
+      
+      @ml = MacLearner.new
+      
       # 记录文件在目录中的位置
       @position = 0
       # 记录包在当前文件的位置
@@ -24,42 +28,21 @@ module DIY
       end
       
       ret << pkt
-      op = "=="
-      if ! fetch_cached_mac
-        cached_mac(pkt)
-      else
-        if Utils.src_mac(pkt) != fetch_cached_mac
-          op = "!="
-        end
-      end
+      where = @ml.tellme(pkt.content)
       
       loop do
-        pkt = self.next
-        if pkt.nil?
-          return ret
-        end
-        
-        if compare_mac( op, Utils.src_mac(pkt), fetch_cached_mac)
-          ret << pkt
-        else
+        pkt = fetch_one
+        return ret if pkt.nil?
+        if @ml.tellme(pkt.content) != where
           cached(pkt)
           return ret
+        else
+          ret << pkt
         end
-        
       end
       
     end
     
-    def compare_mac( op, mac1, mac2)
-      if op == "=="
-        mac1 == mac2
-      elsif op == "!="
-        mac1 != mac2
-      else
-        raise "error op"
-      end
-    end
-    
     def fetch_one
       pkt = fetch_cache
       if pkt.nil?
@@ -82,18 +65,6 @@ module DIY
       @tmp_pcap = pkt
     end
     
-    def cached_mac(pkt)
-      @src = Utils.src_mac(pkt)
-    end
-    
-    def fetch_cached_mac
-      @src
-    end
-    
-    def clear_cached_mac
-      @src = nil
-    end
-    
     def fetch_cache
       if @tmp_pcap
         tmp = @tmp_pcap
@@ -104,7 +75,6 @@ module DIY
     end
     
     def first_pkt?
-      puts @num
       @num == 1
     end
     public

data/lib/diy/strategy_builder.rb

@@ -54,7 +54,8 @@ module DIY
             queue.shift
             # skip this round if nil found
             return unless hope_pkt = queue.first
-            next
+            # redo strategy
+            retry
           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.2"
+    VERSION = "0.3.3"
   end
 end

data/lib/diy/worker.rb

@@ -79,6 +79,11 @@ module DIY
       Utils.wait_until { @callback_t && ! @callback_t.alive? }    
     end
     
+    # 过滤器
+    def filter(reg)
+      @live.set_filter(reg)
+    end
+    
     def inspect
       "<Worker: #{@live.net}>"
     end

data/spec/controller_spec.rb

@@ -121,5 +121,14 @@ describe "Controller" do
     end
     lambda { build2.run }.should_not raise_error  
   end
+  
+  it "#run with filter" do
+    build2 = DIY::Builder.new do
+      use DIY::SimpleStrategy.new
+      filter "not host 127.0.0.1"
+      pcapfiles "helper/http.pcap"
+    end
+    lambda { build2.run }.should_not raise_error  
+  end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: DIY-pcap
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - yafei Lee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-12 00:00:00 Z
+date: 2012-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi-pcap
@@ -62,6 +62,7 @@ files:
 - lib/diy/ext/capture_wrapper.rb
 - lib/diy/live.rb
 - lib/diy/logger.rb
+- lib/diy/mac_learner.rb
 - lib/diy/offline.rb
 - lib/diy/packet.rb
 - lib/diy/parser/mu/fixnum_ext.rb