DIY-pcap 0.2.8 → 0.3.0

data/lib/diy/controller.rb

@@ -24,14 +24,15 @@ module DIY
       
       loop do
         begin
-        pkts = @offline.nexts
-        one_round( client, server, pkts )
-        client, server = server, client
+          pkts = @offline.nexts
+          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].pretty_print} ") if e.kind_of?(HopePacketTimeoutError)
           @fail_count += 1
           begin
-          @offline.next_pcap
+            @offline.next_pcap
+            server.terminal
           rescue EOFError
             client.terminal
             server.terminal
@@ -62,7 +63,7 @@ module DIY
         recv_pkt = Packet.new(recv_pkt)
         begin
           @strategy.call(pkts.first, recv_pkt, pkts)
-        rescue DIY::StrategyCallError =>e
+        rescue DIY::UserError =>e
           DIY::Logger.warn("UserError Catch: " + e.inspect)
           e.backtrace.each do |msg|
             DIY::Logger.info(msg)

data/lib/diy/exceptions.rb

@@ -9,12 +9,8 @@ module DIY
   # 没有报文被指定时
   class ZeroOfflineError < Error; end
   
-  # 不可能出现的报文出现
-  class UnExpectPacketError < Error; end
-  
   class UserError < Error
     def initialize(real_exception)
-      puts "new..."
       @real_exception = real_exception
       @name = real_exception.class
       @message = real_exception.message
@@ -26,6 +22,9 @@ module DIY
     end
   end
   
+    # 不可能出现的报文出现
+  class UnExpectPacketError < UserError; end
+  
   # 策略执行异常
   class StrategyCallError < UserError; end
   # before_send 异常

data/lib/diy/strategy_builder.rb

@@ -42,10 +42,11 @@ module DIY
             return
           elsif ret == Strategy::FAIL
             logger.warn("pkt fail:")
-            logger.warn("pkt fail: hope_pkt is #{Utils.pp(hope_pkt)}")
-            logger.warn("pkt fail: recv_pkt is #{Utils.pp(recv_pkt)}")
-            #TODO 也许需要将Queue输出?
-            raise UnExpectPacketError, "strategy FAIL"
+            logger.warn("pkt fail: hope_pkt is #{hope_pkt.pretty_print}")
+            logger.warn("pkt fail: recv_pkt is #{recv_pkt.pretty_print}")
+            e = RuntimeError.new("Strategy FAIL: hope #{hope_pkt.pretty_print} but get #{recv_pkt.pretty_print}")
+            e.set_backtrace(caller) # not used
+            raise UnExpectPacketError.new(e)
           elsif ret == Strategy::NONE
             #~ logger.debug("pkt jumpped:")
             next

data/lib/diy/utils.rb

@@ -1,3 +1,4 @@
+# encoding : utf-8
 module DIY
   module Utils
     class << self
@@ -5,12 +6,13 @@ module DIY
       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_print_str
@@ -46,7 +48,6 @@ module DIY
           if ! Utils.ary_match(filter_ary, msg)
            new_bt << msg
           else
-            puts "break"
             break
           end
         end

data/lib/diy/version.rb

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

data/spec/controller_spec.rb

@@ -84,5 +84,21 @@ describe "Controller" do
     end
     lambda { build2.run }.should_not raise_error  
   end
+  
+  it "#run stragety fail" do
+    
+    def return_fail
+      DIY::Strategy::FAIL
+    end
+    
+    fail = lambda { |h,r,q|
+      return_fail
+    }
+    build2 = DIY::Builder.new do
+      use fail
+      pcapfiles "helper/http.pcap"
+    end
+    lambda { build2.run }.should_not raise_error  
+  end
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: DIY-pcap
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 2
-  - 8
-  version: 0.2.8
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - yafei Lee
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-11 00:00:00 Z
+date: 2012-10-11 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
@@ -146,6 +145,7 @@ files:
 - spec/spec_helper.rb
 - spec/utils_spec.rb
 - spec/worker_spec.rb
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -159,7 +159,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -168,14 +167,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