DIY-pcap 0.3.4 → 0.3.5

data/lib/diy/controller.rb

@@ -110,7 +110,11 @@ module DIY
     
     def stats_result( cost_time, fail_count )
       DIY::Logger.info " ====== Finished in #{cost_time} seconds"
-      DIY::Logger.info " ====== Total fail_count: #{fail_count} failures"
+      DIY::Logger.info " ====== #{offline_result}, #{fail_count} failures"
+    end
+    
+    def offline_result
+      sprintf "%4d files, %8d packets", @offline.files_size, @offline.now_size
     end
     
     def wait_recv_ok(pkts)
@@ -126,7 +130,7 @@ module DIY
       Timeout.timeout(timeout, DIY::HopePacketTimeoutError.new("hope packet wait timeout after #{timeout} seconds") ) do
         loop do
           break if block.call
-          sleep 0.1
+          sleep 0.01
         end
       end
     end

data/lib/diy/offline.rb

@@ -88,7 +88,6 @@ module DIY
       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
       fetch_cache
     end
     
@@ -100,5 +99,13 @@ module DIY
       "pkt: `#{filename}: #{@num}th' "
     end
     
+    def now_size
+      @num
+    end
+    
+    def files_size
+      @pcap_files.size
+    end
+    
   end
 end

data/lib/diy/utils.rb

@@ -17,8 +17,8 @@ module DIY
           new_pkt = pkt.dup
           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 + size_print_str
-          return  ( pkt[0..10] + "..." ).dump + size_print_str
+          DIY::Logger.debug "parse error from pkt: " + ( pkt[0..10] + "..." ).dump + size_print_str
+          return  ( pkt[0..10] + "..." ).dump + size_print_str + "( parse failed )"
         end
       end
       

data/lib/diy/version.rb

@@ -1,5 +1,5 @@
 module DIY
   class PCAP
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: DIY-pcap
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - yafei Lee
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-15 00:00:00 +08:00
-default_executable: 
+date: 2012-10-15 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
@@ -147,7 +148,6 @@ files:
 - spec/spec_helper.rb
 - spec/utils_spec.rb
 - spec/worker_spec.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -161,6 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -169,13 +170,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