DIY-pcap 0.0.3 → 0.0.4

data/README.md

@@ -45,7 +45,7 @@ DIY-pcap
     ```ruby
           DIY::Builder.new do
             pcapfile "pcaps/simple.pcap"
-            use SimpleStrategy.new
+            use DIY::SimpleStrategy.new
           end
     ```
 3. 同上

data/lib/diy/builder.rb

@@ -1,12 +1,14 @@
 module DIY
   class Builder
-    def initialize(&block)
+    def initialize(server = false, &block)
       @strategies = []
       instance_eval(&block)
+      @server = server
     end
     
     def find_device
       @device_name ||= FFI::PCap.dump_devices[0][0]
+      DIY::Logger.info( "Initialize Live: #{@device_name}" )
       @live = FFI::PCap::Live.new(:dev=>@device_name, :handler => FFI::PCap::Handler, :promisc => true)
     end
     
@@ -23,16 +25,18 @@ module DIY
     end
     
     def pcapfile(pcaps)
-      @offline = FFI::PCap::Offline.new(pcaps)
+      DIY::Logger.info( "Initialize Offline: #{pcaps.to_a.join(', ')}" )
+      @offline = DIY::Offline.new(pcaps)
     end
+    alias pcapfiles pcapfile
     
     def run
       @offline ||= FFI::PCap::Offline.new('pcaps/example.pcap')
-      @queue = Queue.new(@offline)
+      @queue = Queue.new(@offline, @server)
       @strategy_builder = DIY::StrategyBuilder.new(@queue)
       @strategies.each { |builder| @strategy_builder.add(builder) }
       find_device
-      controller = Controller.new( @live, @offline, @strategy_builder )
+      controller = Controller.new( @live, @strategy_builder )
       controller.before_send(&@before_send_hook)
       controller.run
     end

data/lib/diy/controller.rb

@@ -1,7 +1,7 @@
 # encoding : utf-8
 module DIY
   class Controller
-    def initialize(live, offline, strategy)
+    def initialize(live, strategy)
       @live = live
       @recver = Recver.new(@live)
       @recver.add_watcher(strategy)
@@ -24,12 +24,21 @@ module DIY
       
       begin
         @queue.do_loop do |pkt|
+          logger.info "send pkt: #{Utils.pp(pkt)}"
           @sender.inject(pkt)
         end
         @recver_t.join
-      rescue HopePacketTimeoutError
+      rescue HopePacketTimeoutError =>e
         # next offline
-        raise
+        DIY::Logger.warn("Timeout: #{e}")
+        old = e
+        begin
+          @queue.clear_and_next_pcap
+          retry
+        rescue EOFError
+          @recver.stop
+          raise old
+        end
       rescue EOFError
         @recver.stop
       end

data/lib/diy/dig.rb

@@ -1,7 +1,7 @@
 require 'diy/exceptions'
 require 'diy/logger'
 require 'diy/utils'
-
+require 'diy/offline'
 require 'diy/recver'
 require 'diy/sender'
 require 'diy/queue'

data/lib/diy/exceptions.rb

@@ -5,4 +5,11 @@ module DIY
   
   # 期望报文等待超时
   class HopePacketTimeoutError < Error; end
+  
+  # 没有报文被指定时
+  class ZeroOfflineError < Error; end
+  
+  # 不可能出现的报文出现
+  class UnExpectPacketError < Error; end
+  
 end

data/lib/diy/logger.rb

@@ -2,29 +2,53 @@ require 'logger'
 
 module DIY
   class Logger
+    @@logger_container = []
     @@logger = ::Logger.new(STDOUT)
-    @@logger.level = ::Logger::DEBUG
+    @@logger.level = ::Logger::INFO
     @@logger.datetime_format = "%d-%b-%Y %H:%M:%S"
+    @@logger_container.unshift @@logger
     class <<self
       def debug(*arg)
-        @@logger.debug(*arg)
+        @@logger_container.each do |logger|
+          logger.debug(*arg)
+        end
       end
       
       def info(*arg)
-        @@logger.info(*arg)
+        @@logger_container.each do |logger|
+          logger.info(*arg)
+        end
       end
       
       def warn(*arg)
-        @@logger.warn(*arg)
+        @@logger_container.each do |logger|
+          logger.warn(*arg)
+        end
       end
       
       def error(*arg)
-        @@logger.error(*arg)
+        @@logger_container.each do |logger|
+          logger.error(*arg)
+        end
       end
       
       def set(logger)
         @@logger = logger
       end
+      
+      def add(logger)
+        @@logger_container << logger
+      end
+      alias << add
+      
+      def clear
+        @@logger_container.clear
+      end
+      
+      def clear_and_add(logger)
+        clear
+        add(logger)
+      end
     end
     
   end

data/lib/diy/offline.rb

@@ -0,0 +1,62 @@
+# encoding : utf-8
+
+module DIY
+  class Offline
+    def initialize( file_or_files)
+      @file_or_files = file_or_files
+      if file_or_files.kind_of?(String)
+        @off = FFI::PCap::Offline.new(file_or_files)
+      elsif file_or_files.kind_of?(Array)
+        raise ZeroOfflineError," no pcap files found " if file_or_files.empty?
+        @off = FFI::PCap::Offline.new(file_or_files[0])
+        @position = 0
+      end
+      @new_pcap = true
+      @num = 0
+    end
+    
+    def next
+      pkt = @off.next
+      if pkt.nil?
+        begin
+          next_pcap
+          pkt = @off.next
+        rescue EOFError
+          pkt = nil
+        end
+      end
+      
+      #record num of pkt
+      @num += 1 if pkt
+      
+      pkt
+    end
+    
+    def first_pkt?
+      @num == 1
+    end
+    
+    def next_pcap
+      if @file_or_files.kind_of?(String) or @position >= @file_or_files.size - 1
+        raise EOFError, " end of pcaps "
+      end
+      @position += 1
+      DIY::Logger.info("pcap file changed: #{@file_or_files[@position]}")
+      @off = FFI::PCap::Offline.new(@file_or_files[@position])
+      @num = 0
+    end
+    
+    def filename
+      if @file_or_files.kind_of?(String)
+        @file_or_files
+      else
+        @file_or_files[@position]
+      end
+    end
+    
+    def fullname
+      "pkt: `#{filename}: #{@num}th' "
+    end
+    
+  end
+end

data/lib/diy/queue.rb

@@ -3,12 +3,14 @@ require 'timeout'
 module DIY
   class Queue
     
-    def initialize(offline)
+    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
@@ -18,16 +20,17 @@ module DIY
     def pop
       return nil if @expect_recv_queue.empty?
       @m.synchronize {
-        return @expect_recv_queue.shift
+        return @expect_recv_queue.shift[0]
       }
     end
     
     def delete(what)
-      if @expect_recv_queue.include?(what)
+      if @expect_recv_queue.find { |i| i[0] == what }
         @m.synchronize {
-          if @expect_recv_queue.include?(what)
-            return @expect_recv_queue.delete(what)
-          end
+            if @expect_recv_queue.find { |i| i[0] == what }
+              @expect_recv_queue.delete_if { |i| i[0] == what }
+              return what
+            end
         }
       end
       return nil
@@ -35,13 +38,30 @@ module DIY
     
     def delete_at(index)
       @m.synchronize {
-        return @expect_recv_queue.delete_at(index)
+        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]
+      @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
     
     # 处理发送报文
@@ -49,19 +69,37 @@ module DIY
     # 等待接受报文完成后, 返回发送报文, 并重新填充接受报文
     # TODO: 支持多个pcap文件
     def next_send_pkt(&block)
-      wait_until { @expect_recv_queue.empty? }
+      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
-        wait_until { @expect_recv_queue.empty? }
+        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
+      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
@@ -69,10 +107,15 @@ module DIY
     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) && ( set_first_gout(recv_pkt.body); comein?(recv_pkt.body) ) )
+      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
+          @expect_recv_queue << [ recv_pkt.copy.body, @offline.fullname ]
         }
       end
       recv_pkt
@@ -86,7 +129,7 @@ module DIY
     end
     
     def set_first_gout(pkt)
-      return @src_mac if @src_mac
+      #~ return @src_mac if @src_mac
       if pkt.size < 12
         raise PktError,"can't find src mac: error format packet"
       end
@@ -107,7 +150,7 @@ module DIY
     end
     
     def server?
-      $SERVER
+      $SERVER || @force_server
     end
     
     def judge_direct(pkt,&block)

data/lib/diy/strategy.rb

@@ -3,7 +3,7 @@ module DIY
   # 具体返回值含义见 @BasicStrategy
   class Strategy
     OK = true
-    OK_NO_POP = 1
+    OK_NO_POP = SKIP = 1
     FAIL = false
     NONE = nil
   end
@@ -18,6 +18,7 @@ module DIY
     # @return: 
     # OK : 匹配, 可以进行下一个报文的处理
     # OK_NO_POP: 匹配了接收队列中的报文, 但是不需要框架自动pop掉期望报文( 注意, 你需要自行处于报文 )
+    # SKIP: 同上, 可用于跳过以后所有策略队列使用.
     # FAIL: 肯定失败时使用
     # NONE: 不匹配, 让框架进行下一个报文匹配
     def call(hope_pkt, recv_pkt, queue)

data/lib/diy/strategy_builder.rb

@@ -1,4 +1,5 @@
-  require 'logger'
+# encoding : utf-8
+require 'logger'
 module DIY
   class StrategyBuilder
     def initialize(queue)
@@ -35,21 +36,25 @@ module DIY
         begin
         ret = strategy.call(hope_pkt, recv_pkt, queue)
         rescue Exception => e
-          logger.error("strategy call exception: #{e.class} -> #{e.message}")
+          logger.error("user strategy exception: #{e.class} -> #{e.message}")
           raise
-          #仅仅忽略
+          #TODO 也许仅仅忽略?
         else
           if ret == Strategy::OK
             logger.info("pkt same:")
             queue.pop
             return
           elsif ret == Strategy::OK_NO_POP
-            logger.info("pkt same but no pop:")
+            logger.info("pkt skip:")
             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"
           elsif ret == Strategy::NONE
-            logger.debug("pkt jumpped:")
+            #~ logger.debug("pkt jumpped:")
             next
           end # end of if
         end # end of begin

data/lib/diy/utils.rb

@@ -1,18 +1,19 @@
 module DIY
   module Utils
-  
-    # 漂亮输出包的前十个内容
-    def pp(pkt)
-      return nil if pkt.nil?
-      pkt[0..10].dump + "..."
-    end
-    
-    def src_mac(pkt)
-      pkt[6..11]
-    end
-    
-    def dst_mac(pkt)
-      pkt[0..5]
+    class << self
+      # 漂亮输出包的前十个内容
+      def pp(pkt)
+        return nil if pkt.nil?
+        ( pkt[0..10] + "..." ).dump
+      end
+      
+      def src_mac(pkt)
+        pkt[6..11]
+      end
+      
+      def dst_mac(pkt)
+        pkt[0..5]
+      end
     end
   end
 end

data/lib/diy/version.rb

@@ -1,5 +1,5 @@
 module DIY
   class PCAP
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/simple/diy-strategy-pcap.rb

@@ -5,6 +5,10 @@ class NoMacEqualStrategy < DIY::BasicStrategy
   end
 end
 
+otherstr = lambda { |hope_pkt, recv_pkt, queue|
+  return DIY::Strategy::OK
+}
+
 nomac = NoMacEqualStrategy.new
 
 change_mac = lambda do |pkt|
@@ -18,4 +22,8 @@ builder = DIY::Builder.new do
   pcapfile "pcaps/gre.pcap"
 end
 
+logger = Logger.new(STDOUT)
+logger.level = Logger::INFO
+
+DIY::Logger.set(logger)
 builder.run

data/simple/pcap.rb

@@ -7,7 +7,7 @@ ss = DIY::SimpleStrategy.new
 
 a = DIY::Builder.new do 
   use ss
-  pcapfile "pcaps/gre.pcap"
+  pcapfile Dir["pcaps/*.pcap"]
 end
 
 a.run

data/spec/builder_spec.rb

@@ -4,4 +4,79 @@ 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

data/spec/logger_spec.rb

@@ -2,6 +2,18 @@ require 'spec_helper'
 
 describe DIY::Logger do
   it "#debug" do
+    lambda { DIY::Logger.info("hello world") }.should_not raise_error
     lambda { DIY::Logger.debug("hello world") }.should_not raise_error
+    lambda { DIY::Logger.warn("hello world") }.should_not raise_error
+    lambda { DIY::Logger.error("hello world") }.should_not raise_error
+  end
+  
+  it "#add #clear" do
+    require 'logger'
+    logger = ::Logger.new(STDOUT)
+    DIY::Logger.add(logger)
+    lambda { DIY::Logger.info("hello world") }.should_not raise_error
+    DIY::Logger.clear_and_add(logger)
+    lambda { DIY::Logger.info("hello world") }.should_not raise_error
   end
 end

data/spec/offline_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe DIY::Offline do
+  it "should get single pkt" do
+    file = "helper/gre.pcap"
+    offline = DIY::Offline.new(file)
+    offline.next.body.should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt1' ) )
+  end
+  
+  it "should get single pkt nil " do
+    file = "helper/gre.pcap"
+    offline = DIY::Offline.new(file)
+    lambda { while( offline.next ) do ; end }.should_not raise_error
+  end
+  
+  it "should get correct pkt in two files" do
+    files = [ "helper/gre.pcap", "helper/app.pcap" ]
+    offline = DIY::Offline.new(files)
+    lambda { while( offline.next ) do ; end }.should_not raise_error
+  end
+  
+  it "should get next pcap" do
+    files = [ "helper/gre.pcap", "helper/app.pcap" ]
+    offline = DIY::Offline.new(files)
+    offline.next_pcap
+    lambda { offline.next_pcap }.should raise_error(DIY::EOFError)
+  end
+  
+  it "should get correct first_pkt flag" do
+    files = [ "helper/gre.pcap", "helper/app.pcap" ]
+    offline = DIY::Offline.new(files)
+    offline.next
+    offline.should be_first_pkt
+    offline.fullname.should == "pkt: `helper/gre.pcap: 1th' "
+    offline.next
+    offline.should_not be_first_pkt
+    offline.fullname.should == "pkt: `helper/gre.pcap: 2th' "
+    offline.next_pcap
+    offline.next
+    offline.fullname.should == "pkt: `helper/app.pcap: 1th' "
+    offline.should be_first_pkt
+    offline.next
+    offline.should_not be_first_pkt
+    offline.fullname.should == "pkt: `helper/app.pcap: 2th' "
+  end
+  
+end

data/spec/queue_spec.rb

@@ -4,16 +4,18 @@ describe DIY::Queue do
   before(:each) do
     @device_name = FFI::PCap.dump_devices[0][0]
     @live = FFI::PCap::Live.new(:dev=>@device_name, :handler => FFI::PCap::Handler, :promisc => true)
-    @offline = FFI::PCap::Offline.new('../simple/pcaps/gre.pcap')
+    @pcap_name = "../simple/pcaps/gre.pcap"
+    @offline = DIY::Offline.new(@pcap_name)
   end
   
   it "#next_send_pkt" do
     $SERVER = nil
     q = DIY::Queue.new(@offline)
     q.stub(:wait_until).and_return(true)
+    q.stub(:wait_for_seconds).and_return(nil)
     q.next_send_pkt.should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt1' ) )
-    pkt1 = q.instance_variable_get("@expect_recv_queue")[0]
-    pkt2 = q.instance_variable_get("@expect_recv_queue")[1]
+    pkt1 = q.instance_variable_get("@expect_recv_queue")[0][0]
+    pkt2 = q.instance_variable_get("@expect_recv_queue")[1][0]
     q.instance_variable_get("@expect_recv_queue").size.should == 2
     pkt1.should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt2' ) )
     pkt2.should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt3' ) )
@@ -27,21 +29,23 @@ describe DIY::Queue do
     $SERVER = true
     q = DIY::Queue.new(@offline)
     q.stub(:wait_until).and_return(true)
+    q.stub(:wait_for_seconds).and_return(nil)
     q.next_send_pkt.should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt2' ) )
-    q.instance_variable_get("@expect_recv_queue").should == [ File.read( File.join( File.dirname(__FILE__), 'helper/pkt1' ) )  ]
+    q.instance_variable_get("@expect_recv_queue")[0][0].should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt1' ) ) 
     q.instance_variable_set("@expect_recv_queue", [])
     q.next_send_pkt.should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt3' ) )
-    q.instance_variable_get("@expect_recv_queue").should == [ File.read( File.join( File.dirname(__FILE__), 'helper/pkt4' )), File.read( File.join( File.dirname(__FILE__), 'helper/pkt5' )) ]
+    q.instance_variable_get("@expect_recv_queue")[0][0].should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt4' ))
+    q.instance_variable_get("@expect_recv_queue")[1][0].should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt5' ))
     $SERVER = nil
   end
   
   it "#comein? server" do
     $SERVER = true
     q = DIY::Queue.new(@offline)
+    q.stub(:wait_for_seconds).and_return(nil)
     pkt =  File.read( File.join( File.dirname(__FILE__), 'helper/pkt1' ) )
     pkt2 =  File.read( File.join( File.dirname(__FILE__), 'helper/pkt2' ) )
-    q.set_first_gout(pkt)
-    q.set_first_gout(pkt2).should == pkt[6..11]
+    q.set_first_gout(pkt).should == pkt[6..11]
     q.comein?(pkt).should == true
     q.comein?(pkt2).should == false
     $SERVER = nil
@@ -50,6 +54,7 @@ describe DIY::Queue do
   it "#peek #pop" do
     q = DIY::Queue.new(@offline)
     q.stub(:wait_until).and_return(true)
+    q.stub(:wait_for_seconds).and_return(nil)
     q.next_send_pkt
     q.peek.should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt2' ) )
     q.pop.should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt2' ) )
@@ -61,6 +66,7 @@ describe DIY::Queue do
   it "#delete" do
     q = DIY::Queue.new(@offline)
     q.stub(:wait_until).and_return(true)
+    q.stub(:wait_for_seconds).and_return(nil)
     q.next_send_pkt
     q.delete(File.read( File.join( File.dirname(__FILE__), 'helper/pkt2' ) )).should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt2' ) )
     q.pop
@@ -70,6 +76,7 @@ describe DIY::Queue do
   it "#delete_at" do
     q = DIY::Queue.new(@offline)
     q.stub(:wait_until).and_return(true)
+    q.stub(:wait_for_seconds).and_return(nil)
     q.next_send_pkt
     q.delete_at(0).should == File.read( File.join( File.dirname(__FILE__), 'helper/pkt2' ) )
   end

data/spec/utils_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe DIY::Utils do
+  it "#pp" do
+    DIY::Utils.pp('a' * 100).should == ('a' * 11 + '...').dump
+  end
+  
+  it "#src_mac" do
+    DIY::Utils.src_mac( 'a' * 100 ).should == "a" * 6
+  end
+
+  it "#dst_mac" do
+    DIY::Utils.dst_mac( 'a' * 100 ).should == "a" * 6
+  end
+
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: DIY-pcap
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - yafei Lee
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-11 00:00:00 Z
+date: 2012-09-13 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
@@ -58,6 +57,7 @@ files:
 - lib/diy/dig.rb
 - lib/diy/exceptions.rb
 - lib/diy/logger.rb
+- lib/diy/offline.rb
 - lib/diy/pcap.rb
 - lib/diy/queue.rb
 - lib/diy/recver.rb
@@ -70,6 +70,7 @@ files:
 - simple/cmd-pcap.rb
 - simple/diy-strategy-pcap.rb
 - simple/pcap.rb
+- simple/pcaps/app.pcap
 - simple/pcaps/gre.pcap
 - simple/pcaps/r1.dat
 - simple/pcaps/r3-2.dat
@@ -79,15 +80,22 @@ files:
 - simple/pcaps/s3.dat
 - simple/pcaps/s4.dat
 - spec/builder_spec.rb
+- spec/helper/app.pcap
+- spec/helper/gre.pcap
+- spec/helper/http.pcap
 - spec/helper/pkt1
 - spec/helper/pkt2
 - spec/helper/pkt3
 - spec/helper/pkt4
 - spec/helper/pkt5
+- 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
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -101,7 +109,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -110,14 +117,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