DIY-pcap 0.2.0 → 0.2.1

data/README.md

@@ -9,7 +9,7 @@ DIY-pcap
 
 1. 安装很简单
 
-    ```
+    ```bash
         gem install DIY-pcap
     ```
         
@@ -32,9 +32,9 @@ DIY-pcap
 
 3. 开始发送与接收数据
 
-  * 服务端,执行 `rpcap spec.rb`
+  * 服务端,执行 `rpcap -f spec.rb`
   
-  * 本机, 执行 `pcap spec.rb`
+  * 本机, 执行 `pcap -f spec.rb`
   
 ## 使用方法, 回放pcap报文 ( 二 )
 
@@ -46,10 +46,18 @@ DIY-pcap
           DIY::Builder.new do
             pcapfile "pcaps/simple.pcap"
             use DIY::SimpleStrategy.new
+            client "x.x.x.x" # 配置客户端ip, 缺省端口为7878
+            server "x.x.x.x" # 配置服务端ip, 缺省端口为7879, 以上都可以写为 x.x.x.x:x 的形式, 与 rpcap或pcap的 -i 参数对应
           end
     ```
-3. 同上
+3. 使用方法( 准备三台主机或逻辑主机 )
+
+  * 服务端, 执行 `rpcap` ( 如果启动出错, 请参考 rpcap -h 中参数 -i 与 -n )
+  
+  * 客户端, 执行 `pcap` ( 如果启动出错, 请参考 pcap -h 中参数 -i 与 -n )
+  
+  * 控制端, 执行 `ruby spec.rb`, OK, 开始交互, 结束后, 会有 cost time 与 fail count 输出.
 
-4. (其他说明) 扩展策略, 自定义日志, 修改报文内容.
+4. (其他说明) 扩展策略, 自定义日志, 修改报文内容参见 [Wiki Home](/windy/DIY-pcap/wiki).
   
-OK, 祝你好运.
+OK, 一切如故.

data/lib/diy/builder.rb

@@ -11,8 +11,12 @@ module DIY
       @strategies.unshift(what)
     end
     
-    def before_send(&block)
-      @before_send_hook = block
+    def before_send(arg= nil, &block)
+      if arg
+        @before_send_hook = arg
+      else
+        @before_send_hook = block
+      end
     end
     
     def find_worker_keepers
@@ -23,6 +27,33 @@ module DIY
       @server = DRbObject.new_with_uri(@suri)
     end
     
+    def client(ip_or_iport)
+      default_port = "7878"
+      if ! ip_or_iport.include?(':')
+        iport = ip_or_iport + ':' + default_port
+      else
+        iport = ip_or_iport
+      end
+      @curi = ip2druby(iport)
+    end
+    
+    def server(ip_or_iport)
+      default_port = "7879"
+      if ! ip_or_iport.include?(':')
+        iport = ip_or_iport + ':' + default_port
+      else
+        iport = ip_or_iport
+      end
+      @suri = ip2druby(iport)
+    end
+    
+    def ip2druby(ip)
+      if ! ip.include?('://')
+        return "druby://" + ip
+      end
+      return ip
+    end
+    
     def pcapfile(pcaps)
       DIY::Logger.info( "Initialize Offline: #{pcaps.to_a.join(', ')}" )
       @offline = DIY::Offline.new(pcaps)
@@ -35,7 +66,7 @@ module DIY
       @strategies.each { |builder| @strategy_builder.add(builder) }
       find_worker_keepers
       controller = Controller.new( @client, @server, @offline, @strategy_builder )
-      #~ controller.before_send(&@before_send_hook)
+      controller.before_send(&@before_send_hook)
       controller.run
     end
     

data/lib/diy/controller.rb

@@ -8,12 +8,15 @@ module DIY
       @server = server
       @offline = offline
       @strategy = strategy
+      @before_send = nil
     end
     
     def run
       client = @client
       server = @server
       
+      @fail_count = 0
+      start_time = Time.now
       #clear
       client.terminal
       server.terminal
@@ -25,7 +28,14 @@ module DIY
         client, server = server, client
         rescue HopePacketTimeoutError
           DIY::Logger.warn( "Timeout: Hope packet is #{pkts[0].inspect} ")
+          @fail_count += 1
+          begin
           @offline.next_pcap
+          rescue EOFError
+            client.terminal
+            server.terminal
+            break
+          end
           client,server = @client, @server
         rescue EOFError
           client.terminal
@@ -33,27 +43,52 @@ module DIY
           break
         end
       end
+      end_time = Time.now
+      stats_result( end_time - start_time, @fail_count )
     end
     
     def one_round( client, server, pkts )
       @round_count = 0 unless @round_count
       @round_count += 1
-      DIY::Logger.info "round #{@round_count}: #{client} #{server} #{pkts[0].inspect}:(size= #{pkts.size})"
+      DIY::Logger.info "round #{@round_count}: (c:#{client.__drburi} / s:#{server.__drburi}) #{pkts[0].inspect}:(size= #{pkts.size})"
       server.ready do |recv_pkt|
         recv_pkt = Packet.new(recv_pkt)
         @strategy.call(pkts.first, recv_pkt, pkts)
       end
-      client.inject(pkts)
+      client_send(client, pkts)
       wait_recv_ok(pkts)
       server.terminal
     end
     
+    def client_send(client, pkts)
+      if ! @before_send
+        client.inject(pkts)
+      else
+        pkts = pkts.collect do |pkt| 
+          content = pkt.content
+          pkt.content = @before_send.call(content)
+          pkt
+        end
+        
+        client.inject(pkts)
+      end
+    end
+    
+    def before_send(&block)
+      @before_send = block
+    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? }
     end
     
-    def wait_until( timeout = 20, &block )
-      timeout(timeout, DIY::HopePacketTimeoutError.new("hope packet wait timeout after #{timeout} senconds") ) do
+    def wait_until( timeout = 10, &block )
+      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/packet.rb

@@ -5,6 +5,7 @@ module DIY
       @detail_msg = detail_msg
     end
     attr_reader :content, :detail_msg
+    attr_writer :content
     
     def to_s
       @content

data/lib/diy/utils.rb

@@ -5,7 +5,7 @@ module DIY
       def pp(pkt)
         pkt = pkt.content if pkt.kind_of?(DIY::Packet)
         return nil if pkt.nil?
-        ( pkt[0..10] + "..." ).dump
+        ( pkt[0..10] + "..." ).dump + "(#{pkt.size} sizes)"
       end
       
       def src_mac(pkt)

data/lib/diy/version.rb

@@ -1,5 +1,5 @@
 module DIY
   class PCAP
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/simple/diy-strategy-pcap.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'diy-pcap'
 class NoMacEqualStrategy < DIY::BasicStrategy
   def call(hope_pkt, recv_pkt, queue)
     return OK if hope_pkt[12..-1] == recv_pkt[12..-1]

data/simple/pcap.rb

@@ -8,6 +8,8 @@ ss = DIY::SimpleStrategy.new
 a = DIY::Builder.new do 
   use ss
   pcapfile Dir["pcaps/*.pcap"]
+  client "127.0.0.1"
+  server "127.0.0.1"
 end
 
 a.run

data/spec/utils_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe DIY::Utils do
   it "#pp" do
-    DIY::Utils.pp('a' * 100).should == ('a' * 11 + '...').dump
+    DIY::Utils.pp('a' * 100).should == ('a' * 11 + '...').dump + "(100 sizes)"
   end
   
   it "#src_mac" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - yafei Lee