DIY-pcap 0.2.5 → 0.2.6

data/lib/diy/parser/readme.md

@@ -0,0 +1,72 @@
+PCAP parser
+=========
+
+## 使用方法
+
+### 解析报文
+
+
+
+    ether = Mu::Pcap::Ethernet.from_bytes pkt_str
+    
+    puts ether.payload
+    
+  即: 一个报文( 必须是纯字符串 ), 被递归解析, 每个 `payload`  是它上一层的协议类( 比如 `Ethernet`, `IPv4`, `UDP` ), 下面是一些常用的方法:
+  
+* Ethernet
+
+    * `from_bytes(str)`
+    
+        解析报文, 并返回特定的类(公共)
+    
+    * `to_bytes`
+      
+        重新生成报文, 会重新计算checksum(公共)
+    
+    * `payload`
+    
+        负荷, 通俗叫报文内容, 如果还有被支持的上层协议, 则返回相对应的类. 则已经没有, 则返回真正的负荷.(公共)
+       
+    * `src(=)`, `dst(=)`, `type(=)`
+    
+        源物理地址, 目的物理地址, 以及上层负载类型( IP, IP6, ARP, PPPOE, 802_1Q )
+        
+
+* IPv4
+
+    * `:ip_id`, `:offset`, `:ttl`, `:proto`, `:src`, `:dst`, `:dscp`
+    
+        标志, 段偏移, 生存期, 上层协议(TCP,UDP, SCTP), 源IP, 目的IP, TOS标记
+
+    * v4?
+        
+        返回 true
+    
+    * fragment?
+    
+        检查是否分片
+
+* IPv6
+
+    * hop_limit
+    
+    * next_header
+    
+* TCP
+
+    * `src_port`, `dst_port`, `seq`, `ack`, `flags`, `window`, `urgent`, `mss`, `proto_family`
+    
+        不一一说明, `flags` 可以直接与 ( `TH_FIN`, `TH_SYN`, `TH_RST`, `TH_PUSH`, `TH_ACK`, `TH_URG`, `TH_ECE`, `TH_CWR`) 相与(&), 以判断标识.
+    
+* UDP
+   
+   * `dst_port`, `src_port`
+
+更详细的指导, 请查看 `rdoc`:
+
+在命令行输入 `gem server`, 打开浏览器, 输入 `http://localhost:8808`.
+    
+## Thanks to:
+Fork from : <https://github.com/mudynamics/pcapr-local/tree/master/lib/mu>
+
+Thanks to  mudynamics, github is <https://github.com/mudynamics>

data/lib/diy/utils.rb

@@ -5,7 +5,15 @@ module DIY
       def pp(pkt)
         pkt = pkt.content if pkt.kind_of?(DIY::Packet)
         return nil if pkt.nil?
-        ( pkt[0..10] + "..." ).dump + "(#{pkt.size} sizes)"
+        #~ ( pkt[0..10] + "..." ).dump + "(#{pkt.size} sizes)"
+        size = pkt.size
+        begin
+          new_pkt = pkt.dup
+          Mu::Pcap::Ethernet.from_bytes(new_pkt).to_s + "(#{size} sizes)"
+        rescue Mu::Pcap::ParseError =>e
+          DIY::Logger.warn "parse error from pkt: " + ( pkt[0..10] + "..." ).dump + "(#{pkt.size} sizes)"
+          return  ( pkt[0..10] + "..." ).dump + "(#{pkt.size} sizes)"
+        end
       end
       
       def src_mac(pkt)

data/lib/diy/version.rb

@@ -1,5 +1,5 @@
 module DIY
   class PCAP
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/lib/diy/worker.rb

@@ -4,13 +4,14 @@ require 'drb'
 require 'thread'
 
 module DIY
-  include DRbUndumped
   class Worker
+    
+    include DRbUndumped
+    
     def initialize(live)
       @live = live
       @recv_t = nil
       @start = false
-      @m = Mutex.new
       @queue = Queue.new
       loop_recv
       loop_callback

data/lib/diy/worker_keeper.rb

@@ -8,6 +8,12 @@ module DIY
     def initialize(worker, uri)
       @worker = worker
       @uri = uri
+      yield self if block_given?
+    end
+    
+    def use_timeridconv
+      require 'drb/timeridconv'
+      DRb.install_id_conv DRb::TimerIdConv.new    
     end
     
     def run

data/spec/live_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+require 'diy/device_finder'
+
+describe DIY::Live do
+  it "#net" do
+    live = DIY::Live.new( DIY::DeviceFinder.smart_select )
+    puts live.net
+  end
+end

data/spec/mu_parser_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Mu do
+  let(:pkt) { File.open("helper/tcp.dat", "rb") { |f| f.read } }
+  it "#ethernet parse" do
+    eth = Mu::Pcap::Ethernet.from_bytes(pkt)
+    eth.should be_ip
+    ip = eth.payload
+    tcp = ip.payload
+    tcp.should be_kind_of(Mu::Pcap::TCP)
+  end
+end

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 + "(100 sizes)"
+    DIY::Utils.pp('a' * 100).should match(/\(100 sizes\)/)
   end
   
   it "#src_mac" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - yafei Lee
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-08 00:00:00 +08:00
+date: 2012-10-10 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
 - bin/rpcap
 - lib/DIY-pcap.rb
 - lib/diy/builder.rb
+- lib/diy/command.rb
 - lib/diy/controller.rb
 - lib/diy/device_finder.rb
 - lib/diy/dig.rb
@@ -62,6 +63,33 @@ files:
 - lib/diy/logger.rb
 - lib/diy/offline.rb
 - lib/diy/packet.rb
+- lib/diy/parser/mu/fixnum_ext.rb
+- lib/diy/parser/mu/pcap/ethernet.rb
+- lib/diy/parser/mu/pcap/header.rb
+- lib/diy/parser/mu/pcap/io_pair.rb
+- lib/diy/parser/mu/pcap/io_wrapper.rb
+- lib/diy/parser/mu/pcap/ip.rb
+- lib/diy/parser/mu/pcap/ipv4.rb
+- lib/diy/parser/mu/pcap/ipv6.rb
+- lib/diy/parser/mu/pcap/packet.rb
+- lib/diy/parser/mu/pcap/pkthdr.rb
+- lib/diy/parser/mu/pcap/reader.rb
+- lib/diy/parser/mu/pcap/reader/http_family.rb
+- lib/diy/parser/mu/pcap/sctp.rb
+- lib/diy/parser/mu/pcap/sctp/chunk.rb
+- lib/diy/parser/mu/pcap/sctp/chunk/data.rb
+- lib/diy/parser/mu/pcap/sctp/chunk/init.rb
+- lib/diy/parser/mu/pcap/sctp/chunk/init_ack.rb
+- lib/diy/parser/mu/pcap/sctp/parameter.rb
+- lib/diy/parser/mu/pcap/sctp/parameter/ip_address.rb
+- lib/diy/parser/mu/pcap/stream_packetizer.rb
+- lib/diy/parser/mu/pcap/tcp.rb
+- lib/diy/parser/mu/pcap/udp.rb
+- lib/diy/parser/mu/scenario/pcap.rb
+- lib/diy/parser/mu/scenario/pcap/fields.rb
+- lib/diy/parser/mu/scenario/pcap/rtp.rb
+- lib/diy/parser/pcap.rb
+- lib/diy/parser/readme.md
 - lib/diy/pcap.rb
 - lib/diy/strategy.rb
 - lib/diy/strategy_builder.rb
@@ -107,7 +135,10 @@ files:
 - spec/helper/pkt4
 - spec/helper/pkt5
 - spec/helper/ssh.pcap
+- spec/helper/tcp.dat
+- spec/live_spec.rb
 - spec/logger_spec.rb
+- spec/mu_parser_spec.rb
 - spec/offline_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb