DIY-pcap 0.2.7 → 0.2.8

data/lib/diy/controller.rb

@@ -28,7 +28,7 @@ module DIY
         one_round( client, server, pkts )
         client, server = server, client
         rescue HopePacketTimeoutError, UserError, FFI::PCap::LibError => e
-          DIY::Logger.warn( "Timeout: Hope packet is #{pkts[0].inspect} ") if e.kind_of?(HopePacketTimeoutError)
+          DIY::Logger.warn( "Timeout: Hope packet is #{pkts[0].pretty_print} ") if e.kind_of?(HopePacketTimeoutError)
           @fail_count += 1
           begin
           @offline.next_pcap
@@ -53,7 +53,10 @@ module DIY
       @error_flag = nil
       @round_count = 0 unless @round_count
       @round_count += 1
-      DIY::Logger.info "round #{@round_count}: (c:#{client.__drburi} / s:#{server.__drburi}) #{pkts[0].inspect}:(queue= #{pkts.size})"
+      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"
+      end
       server.ready do |recv_pkt|
         next if @error_flag # error accur waiting other thread do with it
         recv_pkt = Packet.new(recv_pkt)

data/lib/diy/live.rb

@@ -8,6 +8,7 @@ module DIY
       DIY::Logger.info( "Initialize Live: #{device_name}" )
       @live = FFI::PCap::Live.new(:dev=>device_name, :handler => FFI::PCap::CopyHandler, :promisc => true)
       DIY::Logger.info( "Listen on:  #{net} " )
+      @running = false
       #~ @live.non_blocking= true
     end
     attr_reader :live
@@ -19,13 +20,20 @@ module DIY
     alias send_packet inject
     
     def loop(&block)
-      Kernel.loop do
+      @running = true
+      while @running do
         @live.dispatch do |this, pkt|
           next unless pkt
           block.call(this, pkt)
         end
         sleep 0.1
       end
+      DIY::Logger.debug "stopped loop recv..."
+    end
+    
+    def break
+      DIY::Logger.debug "stopping loop recv..."
+      @running = false
     end
     
     def net

data/lib/diy/offline.rb

@@ -113,7 +113,7 @@ module DIY
         raise EOFError, " end of pcaps "
       end
       @position += 1
-      DIY::Logger.info("pcap file changed: #{@pcap_files[@position]}")
+      DIY::Logger.info("pcap file changed: #{@pcap_files[@position]} ( #{@position} of #{@pcap_files.size} )")
       @off = FFI::PCap::Offline.new(@pcap_files[@position])
       @num = 0
       clear_cached_mac

data/lib/diy/packet.rb

@@ -12,7 +12,16 @@ module DIY
     end
     
     def inspect
-      "#{Utils.pp(@content)} : from #{@detail_msg}"
+      "#<#{self.class.name}: #{Utils.pp(@content)}, from #{@detail_msg}>"
+    end
+    
+    def pretty_print(lsize = 150)
+      real = Utils.pp(@content, false)
+      dot = nil
+      if inspect.size >= lsize
+        dot = "..."
+      end
+      sprintf "%-#{lsize+2}.#{lsize}s%3s (size= %4d), from %20s", real,dot,@content.size,@detail_msg
     end
   end
 end

data/lib/diy/strategy.rb

@@ -37,5 +37,16 @@ module DIY
     end
   end
   
+  # 跳过相同源与目的MAC
+  class SkipSameMacStrategy < BasicStrategy
+    def call(hope_pkt, recv_pkt, queue)
+      if hope_pkt[0..5] == hope_pkt[6..11]
+        return OK
+      else
+        return NONE
+      end
+    end    
+  end
+  
 end
   

data/lib/diy/utils.rb

@@ -2,17 +2,21 @@ module DIY
   module Utils
     class << self
       # 漂亮输出包的前十个内容
-      def pp(pkt)
+      def pp(pkt, size_print = true)
         pkt = pkt.content if pkt.kind_of?(DIY::Packet)
         return nil if pkt.nil?
         #~ ( pkt[0..10] + "..." ).dump + "(#{pkt.size} sizes)"
         size = pkt.size
+        size_print_str = ""
+        if size_print
+          size_print_str = "(#{size} sizes)"
+        end
         begin
           new_pkt = pkt.dup
-          Mu::Pcap::Ethernet.from_bytes(new_pkt).to_s + "(#{size} sizes)"
+          Mu::Pcap::Ethernet.from_bytes(new_pkt).to_s + size_print_str
         rescue Mu::Pcap::ParseError =>e
-          DIY::Logger.warn "parse error from pkt: " + ( pkt[0..10] + "..." ).dump + "(#{pkt.size} sizes)"
-          return  ( pkt[0..10] + "..." ).dump + "(#{pkt.size} sizes)"
+          DIY::Logger.warn "parse error from pkt: " + ( pkt[0..10] + "..." ).dump + size_print_str
+          return  ( pkt[0..10] + "..." ).dump + size_print_str
         end
       end
       

data/lib/diy/version.rb

@@ -1,5 +1,5 @@
 module DIY
   class PCAP
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
   end
 end

data/lib/diy/worker.rb

@@ -13,6 +13,7 @@ module DIY
       @recv_t = nil
       @start = false
       @queue = Queue.new
+      @running = false
       loop_recv
       loop_callback
     end
@@ -20,7 +21,7 @@ module DIY
     # 发包
     def inject(pkts)
       pkts.each do |pkt|
-        DIY::Logger.info "send pkt: #{pkt.inspect}"
+        DIY::Logger.info "send pkt: #{pkt.pretty_print}"
         @live.send_packet(pkt.content)
       end
     end
@@ -32,21 +33,25 @@ module DIY
           next unless @start
           @queue.push(pkt.body)
         end
+        DIY::Logger.debug "worker: stopped loop recv"
       end
     end
     
     def loop_callback
+      @running = true
       @callback_t = Thread.new do 
         #~ DIY::Logger.info "start thread callbacking pkt..."
-        loop do
+        while @running do
           begin
             pkt = @queue.pop
             #~ DIY::Logger.info "callback: #{pkt}"
             @block.call(pkt) if @block
           rescue DRb::DRbConnError
             DIY::Logger.info "closed connection by controller"
+            @queue.clear
           end
         end
+        DIY::Logger.debug "stopped loop callback"
       end
     end
     
@@ -58,12 +63,22 @@ module DIY
       @start = true
     end
     
+    # 停止收发
     def terminal
       DIY::Logger.info("stop recv pkt")
       @start = false
       @queue.clear
     end
     
+    # 停止线程
+    def stop
+      @running = false
+      @queue.push nil
+      @live.break
+      Utils.wait_until { @recv_t && ! @recv_t.alive? }
+      Utils.wait_until { @callback_t && ! @callback_t.alive? }    
+    end
+    
     def inspect
       "<Worker: #{@live.net}>"
     end

data/lib/diy/worker_keeper.rb

@@ -8,8 +8,11 @@ module DIY
     def initialize(worker, uri)
       @worker = worker
       @uri = uri
+      @running = false
+      @over = false
       yield self if block_given?
     end
+    attr_accessor :running
     
     def use_timeridconv
       require 'drb/timeridconv'
@@ -20,13 +23,21 @@ module DIY
       Thread.abort_on_exception = true
       DIY::Logger.info "serving at #{@uri}"
       DRb.start_service(@uri, @worker)
-      running = true
-      trap("INT") { running = false }
-      while running
+      @running = true
+      @over = false
+      trap("INT") { @running = false }
+      while @running
         sleep 0.5
       end
       DIY::Logger.info "bye..."
+      @worker.stop
       DRb.stop_service
+      @over = true
+    end
+    
+    def stop
+      @running = false
+      Utils.wait_until { @over }
     end
   end
 end

data/spec/controller_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+require 'diy/device_finder'
+
+def raise_me
+  raise "Error on me"
+end
+
+describe "Controller" do
+  Thread.abort_on_exception = true
+  before(:all) do
+    @device_name = DIY::DeviceFinder.smart_select
+    @live = DIY::Live.new(@device_name)
+    @live2 = DIY::Live.new(@device_name)
+    
+    @curi = "druby://localhost:7878"
+    @suri = "druby://localhost:7879"
+    @c1 = @s1 = nil
+    # client create
+    Thread.abort_on_exception = true
+    @client_t ||= Thread.new do
+      client = DIY::Worker.new(@live)
+      @c1 = DIY::WorkerKeeper.new(client, @curi)
+      @c1.run
+    end
+    
+    @server_t ||= Thread.new do
+      server = DIY::Worker.new(@live2)
+      @s1 = DIY::WorkerKeeper.new(server, @suri)
+      @s1.run
+    end    
+  end
+  
+  after(:all) do
+    #~ @c1.stop #if @c
+    #~ @s1.stop #if @s
+    #~ DIY::Utils.wait_until { ! @client_t.alive? && ! @server_t.alive? }
+  end
+  
+  it "#run " do
+    sleep 1
+    builder = DIY::Builder.new do
+      pcapfiles "helper/http.pcap"
+      use DIY::SimpleStrategy.new
+      timeout 10
+    end
+    lambda { builder.run }.should_not raise_error  
+  end
+    
+  it "#run stragety error" do
+    
+    
+    wrongUserStragety = lambda {
+        raise_me
+        #~ raise "error one me"
+    }
+    
+    sleep 1
+    builder = DIY::Builder.new do
+      pcapfiles "helper/http.pcap"
+      use wrongUserStragety
+      timeout 10
+    end
+    lambda { builder.run }.should_not raise_error
+  end
+  
+  it "#run before_send error" do
+    sleep 1
+    build2 = DIY::Builder.new do
+      before_send do
+        raise "error on me"
+      end
+      pcapfiles "helper/http.pcap"
+    end
+    lambda { build2.run }.should_not raise_error
+  end
+  
+  it "#run big packet " do
+    sleep 1
+    build2 = DIY::Builder.new do
+      before_send do |pkt|
+        new_pkt = "a" * 10000
+      end
+      pcapfiles "helper/http.pcap"
+    end
+    lambda { build2.run }.should_not raise_error  
+  end
+
+end

data/spec/packet_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe DIY::Packet do
+  let(:normal_content) { File.open('helper/tcp.dat', 'rb') { |io| io.read } }
+  let(:long_content) { File.open('helper/long.dat', 'rb') { |io| io.read } }
+  it "#pretty_print normal_content" do
+    pkt = DIY::Packet.new(normal_content, "xxx")
+    puts pkt.pretty_print
+  end
+  
+  it "#pretty_print long_content" do
+    pkt = DIY::Packet.new(long_content, "xxx")
+    puts pkt.pretty_print
+  end  
+end

data/spec/utils_spec.rb

@@ -5,6 +5,10 @@ describe DIY::Utils do
     DIY::Utils.pp('a' * 100).should match(/\(100 sizes\)/)
   end
   
+  it "#pp false" do
+    DIY::Utils.pp('a' * 100, false).should_not match(/\(100 sizes\)/)
+  end
+  
   it "#src_mac" do
     DIY::Utils.src_mac( 'a' * 100 ).should == "a" * 6
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: DIY-pcap
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - yafei Lee
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-10 00:00:00 +08:00
-default_executable: 
+date: 2012-10-11 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
@@ -129,6 +130,7 @@ files:
 - spec/helper/app.pcap
 - spec/helper/gre.pcap
 - spec/helper/http.pcap
+- spec/helper/long.dat
 - spec/helper/pkt1
 - spec/helper/pkt2
 - spec/helper/pkt3
@@ -140,11 +142,10 @@ files:
 - spec/logger_spec.rb
 - spec/mu_parser_spec.rb
 - spec/offline_spec.rb
+- spec/packet_spec.rb
 - spec/spec_helper.rb
-- spec/usererror_spec.rb
 - spec/utils_spec.rb
 - spec/worker_spec.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -158,6 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -166,13 +168,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

data/spec/usererror_spec.rb

@@ -1,85 +0,0 @@
-require 'spec_helper'
-require 'diy/device_finder'
-
-def raise_me
-  raise "Error on me"
-end
-
-describe "Controller" do
-
-  before(:all) do
-    @device_name = DIY::DeviceFinder.smart_select
-    @live = DIY::Live.new(@device_name)
-    @live2 = DIY::Live.new(@device_name)
-    
-    @curi = "druby://localhost:7878"
-    @suri = "druby://localhost:7879"
-    
-    # client create
-    Thread.abort_on_exception = true
-    @client_t ||= Thread.new do
-      client = DIY::Worker.new(@live)
-      DIY::WorkerKeeper.new(client, @curi).run
-    end
-    
-    @server_t ||= Thread.new do
-      server = DIY::Worker.new(@live2)
-      DIY::WorkerKeeper.new(server, @suri).run
-    end    
-  end
-  
-  after(:all) do
-    @client_t.kill
-    @server_t.kill
-  end
-  
-  it "#run " do
-    sleep 1
-    builder = DIY::Builder.new do
-      pcapfiles "helper/http.pcap"
-      use DIY::SimpleStrategy.new
-      timeout 10
-    end
-    lambda { builder.run }.should_not raise_error  
-  end
-    
-  it "#run stragety error" do
-    
-    
-    wrongUserStragety = lambda {
-        raise_me
-        #~ raise "error one me"
-    }
-    
-    sleep 1
-    builder = DIY::Builder.new do
-      pcapfiles "helper/http.pcap"
-      use wrongUserStragety
-      timeout 10
-    end
-    lambda { builder.run }.should_not raise_error
-  end
-  
-  it "#run before_send error" do
-    sleep 1
-    build2 = DIY::Builder.new do
-      before_send do
-        raise "error on me"
-      end
-      pcapfiles "helper/http.pcap"
-    end
-    lambda { build2.run }.should_not raise_error
-  end
-  
-  it "#run big packet " do
-    sleep 1
-    build2 = DIY::Builder.new do
-      before_send do |pkt|
-        new_pkt = "a" * 10000
-      end
-      pcapfiles "helper/http.pcap"
-    end
-    lambda { build2.run }.should_not raise_error  
-  end
-
-end