DIY-pcap 0.0.4 → 0.2.0

data/spec/worker_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+require 'diy/worker'
+describe DIY::Worker do
+  
+  class FakeLive
+    def inject
+    end
+    class ::String
+      def body
+        self
+      end
+    end
+    def loop
+      pkt = 1
+      @go = true
+      while(@go) do
+        pkt += 1
+        sleep 0.01
+        yield( nil, "pkt #{pkt}" )
+      end
+    end
+    
+    def stop
+      #~ @go = false
+    end
+    
+  end
+  
+  let(:live) { FakeLive.new }
+  
+  it "should create ok" do
+    DIY::Worker.new(live)
+  end
+  
+  it "#inject" do
+  end
+  
+  it "#ready" do
+  end
+  
+  it "#terminal" do
+    #~ live.should_recieve(:stop)
+    worker = DIY::Worker.new(live)
+    worker.terminal
+    
+    
+    worker.ready do |pkt|
+      puts pkt.inspect
+    end
+    
+    sleep 0.1
+    worker.terminal
+    worker.terminal
+    
+  end
+  
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.2.0
 platform: ruby
 authors: 
 - yafei Lee
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-13 00:00:00 +08:00
+date: 2012-09-19 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,21 +54,36 @@ files:
 - lib/DIY-pcap.rb
 - lib/diy/builder.rb
 - lib/diy/controller.rb
+- lib/diy/device_finder.rb
 - lib/diy/dig.rb
 - lib/diy/exceptions.rb
 - lib/diy/logger.rb
 - lib/diy/offline.rb
+- lib/diy/packet.rb
 - lib/diy/pcap.rb
-- lib/diy/queue.rb
-- lib/diy/recver.rb
-- lib/diy/sender.rb
 - lib/diy/strategy.rb
 - lib/diy/strategy_builder.rb
 - lib/diy/task.rb
 - lib/diy/utils.rb
 - lib/diy/version.rb
+- lib/diy/worker.rb
+- lib/diy/worker_keeper.rb
+- simple/4000port.rb
+- simple/4000port/r1.dat
+- simple/4000port/r3.dat
+- simple/4000port/r4.dat
+- simple/4000port/r6.dat
+- simple/4000port/r7.dat
+- simple/4000port/s1.dat
+- simple/4000port/s2.dat
+- simple/4000port/s3.dat
+- simple/4000port/s4.dat
+- simple/4000port/s5.dat
+- simple/4000port/s6.dat
+- simple/4000port/s8.dat
 - simple/cmd-pcap.rb
 - simple/diy-strategy-pcap.rb
+- simple/howto.vsd
 - simple/pcap.rb
 - simple/pcaps/app.pcap
 - simple/pcaps/gre.pcap
@@ -79,7 +94,8 @@ files:
 - simple/pcaps/s2.dat
 - simple/pcaps/s3.dat
 - simple/pcaps/s4.dat
-- spec/builder_spec.rb
+- spec/controller_spec.rb
+- spec/device_finder_spec.rb
 - spec/helper/app.pcap
 - spec/helper/gre.pcap
 - spec/helper/http.pcap
@@ -91,10 +107,9 @@ files:
 - spec/helper/ssh.pcap
 - spec/logger_spec.rb
 - spec/offline_spec.rb
-- spec/queue_spec.rb
-- spec/sender_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb
+- spec/worker_spec.rb
 has_rdoc: true
 homepage: ""
 licenses: []

data/lib/diy/queue.rb

@@ -1,174 +0,0 @@
-require 'thread'
-require 'timeout'
-module DIY
-  class Queue
-    
-    def initialize(offline, force_server = false)
-      @expect_recv_queue = []
-      @offline = offline
-      @m = Mutex.new
-      # 暂存 next_send_pkt 数据
-      @tmp_send_pkt = nil
-      
-      @force_server = force_server
-    end
-    
-    def expect_recv_queue
-      @expect_recv_queue
-    end
-    
-    def pop
-      return nil if @expect_recv_queue.empty?
-      @m.synchronize {
-        return @expect_recv_queue.shift[0]
-      }
-    end
-    
-    def delete(what)
-      if @expect_recv_queue.find { |i| i[0] == what }
-        @m.synchronize {
-            if @expect_recv_queue.find { |i| i[0] == what }
-              @expect_recv_queue.delete_if { |i| i[0] == what }
-              return what
-            end
-        }
-      end
-      return nil
-    end
-    
-    def delete_at(index)
-      @m.synchronize {
-        deleted = @expect_recv_queue.delete_at(index)
-        return deleted.nil? ? nil : deleted[0]
-      }
-    end
-    
-    def peek
-      return nil if @expect_recv_queue.empty?
-      @expect_recv_queue[0][0]
-    end
-    
-    def peek_full
-      return nil if @expect_recv_queue.empty?
-      @expect_recv_queue[0]      
-    end
-    
-    def clear_and_next_pcap
-      @offline.next_pcap
-      clear
-    end
-    
-    def clear
-      @m.synchronize {
-        return @expect_recv_queue.clear
-      }
-    end
-    
-    # 处理发送报文
-    #
-    # 等待接受报文完成后, 返回发送报文, 并重新填充接受报文
-    # TODO: 支持多个pcap文件
-    def next_send_pkt(&block)
-      begin
-        wait_until { @expect_recv_queue.empty? }
-      rescue HopePacketTimeoutError
-        raise HopePacketTimeoutError, "#{peek_full && peek_full[1]}"
-      end
-      if @tmp_send_pkt
-        pkt = @tmp_send_pkt
-        @tmp_send_pkt = nil
-      else
-        pkt = write_recv_pkt
-        begin
-          wait_until { @expect_recv_queue.empty? }
-        rescue HopePacketTimeoutError
-          raise HopePacketTimeoutError, "#{peek_full && peek_full[1]}"
-        end
-      end
-      raise EOFError, " no pkt to send " unless pkt
-      pkt = pkt.copy
-      
-      need_wait_for_seconds = nil
-      # 刚切换pcap文件后需要等待
-      if @offline.first_pkt?
-        need_wait_for_seconds = true
-      end
-      
-      recv_pkt = write_recv_pkt
-      
-      if need_wait_for_seconds
-        wait_for_seconds
-      end
-      
-      yield(pkt.body) if block_given?
-      
-      @tmp_send_pkt = recv_pkt.copy if recv_pkt
-      pkt.body
-    end
-    alias_method :next, :next_send_pkt
-    
-    def wait_for_seconds
-      DIY::Logger.info("new pcap file, sleep 3...")
-      sleep 3
-    end
-    
-    def write_recv_pkt
-      while ( (recv_pkt = @offline.next) && ( @offline.first_pkt? && set_first_gout(recv_pkt.body); comein?(recv_pkt.body) ) )
-        @m.synchronize {
-          @expect_recv_queue << [ recv_pkt.copy.body, @offline.fullname ]
-        }
-      end
-      recv_pkt
-    end
-    
-    def do_loop(&block)
-      raise "Must give me block" unless block_given?
-      while(true) do 
-        next_send_pkt(&block)
-      end
-    end
-    
-    def set_first_gout(pkt)
-      #~ return @src_mac if @src_mac
-      if pkt.size < 12
-        raise PktError,"can't find src mac: error format packet"
-      end
-      @src_mac = pkt[6..11]
-    end
-    
-    def comein?(pkt)
-      ret = judge_direct(pkt) do | pkt_mac, src_mac|
-        (pkt_mac != src_mac) ^ server?
-      end
-      ret
-    end
-    
-    def gout?(pkt)
-      judge_direct(pkt) do | pkt_mac, src_mac|
-        (pkt_mac == src_mac) ^ server?
-      end
-    end
-    
-    def server?
-      $SERVER || @force_server
-    end
-    
-    def judge_direct(pkt,&block)
-      if pkt.size < 12
-        raise PktError,"can't find src mac: error format packet"
-      end
-      raise "src_mac not set" unless @src_mac
-      yield( pkt[6..11], @src_mac )
-    end
-    
-    def wait_until( timeout = 20, &block )
-      timeout(timeout, DIY::HopePacketTimeoutError.new("hope packet wait timeout after #{timeout} senconds") ) do
-        loop do
-          break if block.call
-          sleep 0.01
-        end
-      end
-    end
-    
-  end # end Queue
-end

data/lib/diy/recver.rb

@@ -1,33 +0,0 @@
-module DIY  
-  class Recver
-    def initialize(live)
-      @live = live
-      @watchers = []
-    end
-    
-    def run
-      @live.loop do |this, pkt|
-        notify_recv_pkt(pkt)
-      end
-    end
-    
-    def stop
-      @live.stop
-    end
-    
-    def notify_recv_pkt(pkt)
-      @watchers.each do |watcher|
-        watcher.recv_pkt(pkt.body)
-      end
-    end
-    
-    def add_watcher(watcher)
-      @watchers = [] unless @watchers
-      @watchers << watcher
-    end
-    
-    def del_watcher(watcher)
-      @watchers.delete(watcher)
-    end
-  end
-end

data/lib/diy/sender.rb

@@ -1,26 +0,0 @@
-module DIY
-  class Sender
-    def initialize(live)
-      @live = live
-      @before_send_hook = nil
-    end
-    
-    def inject(pkt)
-      pkt = before_send_call(pkt)
-      @live.inject(pkt)
-    end
-    
-    def before_send(&block)
-      @before_send_hook = block
-    end
-    
-    def before_send_call(pkt)
-      if @before_send_hook
-        @before_send_hook.call(pkt)
-      else
-        pkt
-      end
-    end
-    
-  end
-end

data/spec/builder_spec.rb

@@ -1,82 +0,0 @@
-require 'spec_helper'
-
-describe DIY::Builder do
-  it "should respond before_send" do
-    DIY::Builder.new { ; }.should be_respond_to("before_send")
-  end
-  
-  it "should run two pcaps success " do
-    builder = DIY::Builder.new(true) do 
-      use DIY::SimpleStrategy.new
-      pcapfile ["helper/ssh.pcap", "helper/http.pcap"]
-    end
-    
-    b = Thread.new do
-      builder.run
-    end
-    
-    builder2 = DIY::Builder.new do 
-      use DIY::SimpleStrategy.new
-      pcapfile ["helper/ssh.pcap", "helper/http.pcap"]
-    end    
-    builder2.run
-    b.join
-  end
-  
-  it "should run one pcap success" do
-    builder = DIY::Builder.new(true) do 
-      use DIY::SimpleStrategy.new
-      pcapfile ["helper/ssh.pcap"]
-    end
-    
-    b = Thread.new do
-      builder.run
-    end
-    
-    builder2 = DIY::Builder.new do 
-      use DIY::SimpleStrategy.new
-      pcapfile ["helper/ssh.pcap"]
-    end    
-    builder2.run
-    b.join
-  end
-  
-  it "should run one pcap error" do
-    builder = DIY::Builder.new(true) do 
-      use DIY::SimpleStrategy.new
-      pcapfile ["helper/ssh.pcap"]
-    end
-    
-    b = Thread.new do
-      builder.run
-    end
-    
-    builder2 = DIY::Builder.new do 
-      use DIY::SimpleStrategy.new
-      pcapfile ["helper/http.pcap"]
-    end    
-    lambda { builder2.run }.should raise_error(DIY::HopePacketTimeoutError)
-    lambda { b.join }.should raise_error(DIY::HopePacketTimeoutError)
-  end
-  
-  it "should run two pcap error" do
-    builder = DIY::Builder.new(true) do 
-      use DIY::SimpleStrategy.new
-      pcapfile ["helper/ssh.pcap", "helper/http.pcap"]
-    end
-    
-    b = Thread.new do
-      builder.run
-    end
-    
-    builder2 = DIY::Builder.new do 
-      use DIY::SimpleStrategy.new
-      pcapfile ["helper/http.pcap"]
-    end    
-    lambda { builder2.run }.should raise_error(DIY::HopePacketTimeoutError)
-    lambda { b.join }.should raise_error(DIY::HopePacketTimeoutError)
-  end
-  
-   
-  
-end