DIY-pcap 0.2.4 → 0.2.5

data/bin/pcap

@@ -61,7 +61,7 @@ else
     device_name = DIY::DeviceFinder.smart_select
   end
   DIY::Logger.info( "Initialize Live: #{device_name}" )
-  device = FFI::PCap::Live.new(:dev=>device_name, :handler => FFI::PCap::Handler, :promisc => true)
+  device = DIY::Live.new(device_name) #FFI::PCap::Live.new(:dev=>device_name, :handler => FFI::PCap::Handler, :promisc => true)
   worker = DIY::Worker.new(device)
   DIY::WorkerKeeper.new(worker, uri).run
 end

data/bin/rpcap

@@ -62,7 +62,7 @@ else
     device_name = DIY::DeviceFinder.smart_select
   end
   DIY::Logger.info( "Initialize Live: #{device_name}" )
-  device = FFI::PCap::Live.new(:dev=>device_name, :handler => FFI::PCap::Handler, :promisc => true)
+  device = DIY::Live.new(device_name) #FFI::PCap::Live.new(:dev=>device_name, :handler => FFI::PCap::Handler, :promisc => true)
   worker = DIY::Worker.new(device)
   DIY::WorkerKeeper.new(worker, uri).run
 end

data/lib/diy/builder.rb

@@ -30,6 +30,10 @@ module DIY
       @server = DRbObject.new_with_uri(@suri)
     end
     
+    def timeout(timeout)
+      @timeout = timeout
+    end
+    
     def client(ip_or_iport)
       @curi = ip_or_iport_with_default(ip_or_iport, 7878)
     end
@@ -73,6 +77,7 @@ module DIY
       find_worker_keepers
       controller = Controller.new( @client, @server, @offline, @strategy_builder )
       controller.before_send(&@before_send_hook)
+      controller.timeout(@timeout) if @timeout
       controller.run
     end
     

data/lib/diy/controller.rb

@@ -9,6 +9,7 @@ module DIY
       @offline = offline
       @strategy = strategy
       @before_send = nil
+      @timeout = nil
     end
     
     def run
@@ -79,17 +80,21 @@ module DIY
       @before_send = block
     end
     
+    def timeout(timeout)
+      @timeout = timeout
+    end
+    
     def stats_result( cost_time, fail_count )
       DIY::Logger.info " ====== Finished in #{cost_time} seconds"
       DIY::Logger.info " ====== Total fail_count: #{fail_count} failures"
     end
     
     def wait_recv_ok(pkts)
-      wait_until { pkts.empty? }
+      wait_until(@timeout ||= 10) { pkts.empty? }
     end
     
     def wait_until( timeout = 10, &block )
-      timeout(timeout, DIY::HopePacketTimeoutError.new("hope packet wait timeout after #{timeout} seconds") ) do
+      Timeout.timeout(timeout, DIY::HopePacketTimeoutError.new("hope packet wait timeout after #{timeout} seconds") ) do
         loop do
           break if block.call
           sleep 0.01

data/lib/diy/dig.rb

@@ -3,6 +3,7 @@ require 'diy/logger'
 require 'diy/utils'
 require 'diy/packet'
 require 'diy/offline'
+require 'diy/live'
 require 'diy/builder'
 require 'diy/controller'
 require 'diy/strategy_builder'

data/lib/diy/ext/capture_wrapper.rb

@@ -0,0 +1,29 @@
+require 'ffi/pcap'
+
+unless defined?(FFI::PCap::CaptureWrapper)
+  raise "must define FFI::PCap::CaptureWrapper before monkey fix"
+end
+
+module FFI
+module PCap 
+  class CaptureWrapper
+    #  Fix bug: dispatch but call pcap_loop
+    #
+    def dispatch(opts={}, &block)
+      cnt = opts[:count] || -1 # default to infinite loop
+      h = opts[:handler]
+
+      ret = FFI::PCap.pcap_dispatch(_pcap, cnt, _wrap_callback(h, block),nil)
+      if ret == -1
+        raise(ReadError, "pcap_dispatch(): #{geterr()}")
+      elsif ret -2
+        return nil
+      elsif ret > -1
+        return ret
+      else
+        raise(ReadError, "unexpected return from pcap_dispatch() -> #{ret}")
+      end
+    end
+  end
+end
+end

data/lib/diy/live.rb

@@ -0,0 +1,32 @@
+# encoding : utf-8
+
+require 'diy/ext/capture_wrapper'
+
+module DIY
+  class Live
+    def initialize(device_name)
+      DIY::Logger.info( "Initialize Live: #{device_name}" )
+      @live = FFI::PCap::Live.new(:dev=>device_name, :handler => FFI::PCap::CopyHandler, :promisc => true)
+      #~ @live.non_blocking= true
+    end
+    attr_reader :live
+    
+    # 发包
+    def inject(packet_str)
+      @live.send_packet(packet_str)
+    end
+    alias send_packet inject
+    
+    def loop(&block)
+      Kernel.loop do
+        @live.dispatch do |this, pkt|
+          next unless pkt
+          block.call(this, pkt)
+        end
+        sleep 0.1
+      end
+    end
+    
+  end # end of class Live
+  
+end

data/lib/diy/version.rb

@@ -1,5 +1,5 @@
 module DIY
   class PCAP
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

data/lib/diy/worker.rb

@@ -11,7 +11,9 @@ module DIY
       @recv_t = nil
       @start = false
       @m = Mutex.new
+      @queue = Queue.new
       loop_recv
+      loop_callback
     end
   
     # 发包
@@ -27,10 +29,19 @@ module DIY
         DIY::Logger.info "start thread recving pkt..."
         @live.loop do |this, pkt|
           next unless @start
+          @queue.push(pkt.body)
+        end
+      end
+    end
+    
+    def loop_callback
+      @callback_t = Thread.new do 
+        #~ DIY::Logger.info "start thread callbacking pkt..."
+        loop do
           begin
-            @m.synchronize do
-              @block.call(pkt.body) if @block
-            end
+            pkt = @queue.pop
+            #~ DIY::Logger.info "callback: #{pkt}"
+            @block.call(pkt) if @block
           rescue DRb::DRbConnError
             DIY::Logger.info "closed connection by controller"
           end
@@ -42,12 +53,14 @@ module DIY
     def ready(&block)
       DIY::Logger.info("start recv pkt")
       @block = block
+      @queue.clear
       @start = true
     end
     
     def terminal
       DIY::Logger.info("stop recv pkt")
       @start = false
+      @queue.clear
     end
     
     def inspect

data/spec/controller_spec.rb

@@ -5,8 +5,8 @@ describe DIY::Builder do
   before(:each) do
     @device_name = FFI::PCap.dump_devices[0][0]
     DIY::Logger.info( "Initialize Live: #{@device_name}" )
-    @live = FFI::PCap::Live.new(:dev=>@device_name, :handler => FFI::PCap::Handler, :promisc => true)
-    @live2 = FFI::PCap::Live.new(:dev=>@device_name, :handler => FFI::PCap::Handler, :promisc => true)
+    @live = DIY::Live.new(@device_name)#FFI::PCap::Live.new(:dev=>@device_name, :handler => FFI::PCap::Handler, :promisc => true)
+    @live2 = DIY::Live.new(@device_name)#FFI::PCap::Live.new(:dev=>@device_name, :handler => FFI::PCap::Handler, :promisc => true)
     
     @curi = "druby://localhost:7878"
     @suri = "druby://localhost:7879"
@@ -30,6 +30,7 @@ describe DIY::Builder do
     builder = DIY::Builder.new do
       pcapfiles "helper/http.pcap"
       use DIY::SimpleStrategy.new
+      timeout 10
     end
     builder.run
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: DIY-pcap
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - yafei Lee
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-08 00:00:00 Z
+date: 2012-10-08 00:00:00 +08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi-pcap
@@ -25,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 2
@@ -58,6 +57,8 @@ files:
 - lib/diy/device_finder.rb
 - lib/diy/dig.rb
 - lib/diy/exceptions.rb
+- lib/diy/ext/capture_wrapper.rb
+- lib/diy/live.rb
 - lib/diy/logger.rb
 - lib/diy/offline.rb
 - lib/diy/packet.rb
@@ -111,6 +112,7 @@ files:
 - spec/spec_helper.rb
 - spec/utils_spec.rb
 - spec/worker_spec.rb
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -124,7 +126,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -133,14 +134,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DIY pcap send and recv