DIY-pcap 0.4.1 → 0.4.3

data/.gitignore

@@ -1,5 +1,5 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
 *.txt

data/DIY-pcap.gemspec

@@ -1,19 +1,19 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "diy/version"
-
-Gem::Specification.new do |s|
-  s.name        = "DIY-pcap"
-  s.version     = DIY::PCAP::VERSION
-  s.authors     = ["yafei Lee"]
-  s.email       = ["lyfi2003@gmail.com"]
-  s.homepage    = ""
-  s.summary     = %q{DIY pcap send and recv}
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "diy/version"
+
+Gem::Specification.new do |s|
+  s.name        = "DIY-pcap"
+  s.version     = DIY::PCAP::VERSION
+  s.authors     = ["yafei Lee"]
+  s.email       = ["lyfi2003@gmail.com"]
+  s.homepage    = ""
+  s.summary     = %q{DIY pcap send and recv}
   s.description = %q{DIY pcap send and recv}
-  
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency "ffi-pcap", ">=0.2.0"
-end
+  s.add_dependency "ffi-pcap", ">=0.2.0"
+end

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://ruby.taobao.org"
-
-# Specify your gem's dependencies in DIY-pcap.gemspec
+source "http://ruby.taobao.org"
+
+# Specify your gem's dependencies in DIY-pcap.gemspec
 gem "ffi-pcap", ">=0.2.0"

data/Rakefile

@@ -1 +1 @@
-require 'bundler/gem_tasks'
+require 'bundler/gem_tasks'

data/lib/DIY-pcap.rb

@@ -1,3 +1,3 @@
-require "diy/version"
-require 'diy/pcap'
+require "diy/version"
+require 'diy/pcap'
 require 'diy/dig'

data/lib/diy/command.rb

@@ -12,6 +12,7 @@ end
 
 options = {
   :ip => "0.0.0.0:#{$_PORT}",
+  :promisc => true,
 }
 
 OptionParser.new do |opts|
@@ -34,6 +35,11 @@ OptionParser.new do |opts|
     exit 0
   end
   
+  opts.on_tail("-o", "--non-promious", "Disable device's promiscuous mode", "default is enabled") do
+    DIY::Logger.info "Device's promiscuous mode is DISABLED"
+    options[:promisc] = false
+  end
+  
   opts.on_tail("--timer","Use TimerIdConv module instead of DRb's default idconv") do
     options[:timer] = true
   end
@@ -70,7 +76,7 @@ else
     require 'diy/device_finder'
     device_name = DIY::DeviceFinder.smart_select
   end
-  device = DIY::Live.new(device_name)
+  device = DIY::Live.new(device_name, :promisc=> options[:promisc])
   worker = DIY::Worker.new(device)
   worker_keeper = DIY::WorkerKeeper.new(worker, uri)
   if options[:timer]

data/lib/diy/controller.rb

@@ -124,7 +124,6 @@ module DIY
     end
     
     def client_send(client, pkts)
-      #~ pkt_contents = pkts.collect { |pkt| pkt.content }
       begin
         client.inject(pkts)
       rescue FFI::PCap::LibError =>e
@@ -172,22 +171,18 @@ module DIY
     end
     
     def wait_recv_ok(pkts)
-      loop do 
+      @timeout ||= 10
+      tick = 0
+      until pkts.empty? do
         now_size = pkts.size
-        break if now_size == 0
-        wait_until(@timeout ||= 10) do
-          raise @error_flag if @error_flag
-          pkts.size < now_size
-        end
-      end
-    end
-    
-    def wait_until( timeout = 10, &block )
-      Timeout.timeout(timeout, DIY::HopePacketTimeoutError.new("hope packet wait timeout after #{timeout} seconds") ) do
-        loop do
-          break if block.call
-          sleep 0.01
+        raise @error_flag if @error_flag
+        tick += 0.01
+        sleep 0.01
+        if pkts.size < now_size
+          # clear tick time if at least one packet has passed the judgement of stratgies.
+          tick = 0
         end
+        raise DIY::HopePacketTimeoutError.new("hope packet wait timeout after #{@timeout} seconds") if !pkts.empty? && tick >= @timeout
       end
     end
     

data/lib/diy/live.rb

@@ -4,9 +4,12 @@ require 'diy/ext/capture_wrapper'
 
 module DIY
   class Live
-    def initialize(device_name)
+    def initialize(device_name, args = {})
       DIY::Logger.info( "Initialize Live: #{device_name}" )
-      @live = FFI::PCap::Live.new(:dev=>device_name, :handler => FFI::PCap::CopyHandler, :promisc => true, :timeout=>1)
+      
+      default = { :dev=>device_name, :handler => FFI::PCap::CopyHandler, :promisc => true, :timeout=>1 }
+      default = merge_arguments(default, args)
+      @live = FFI::PCap::Live.new(default)
       DIY::Logger.info( "Listen on:  #{net} " )
       @running = false
       @live.non_blocking= true
@@ -45,6 +48,10 @@ module DIY
       @live.network + " / " + @live.netmask
     end
     
+    def merge_arguments(default, new)
+      default.merge(new)
+    end
+    
   end # end of class Live
   
 end

data/lib/diy/parser/mu/pcap/ethernet.rb

@@ -1,160 +1,160 @@
-# http://www.mudynamics.com
-# http://labs.mudynamics.com
-# http://www.pcapr.net
-
-module Mu
-class Pcap
-
-class Ethernet < Packet
-    attr_accessor :src, :dst, :type
-    
-    ETHERTYPE_IP  = 0x0800
-    ETHERTYPE_IP6 = 0x86dd
-    ETHERTYPE_ARP = 0x0806
-    ETHERTYPE_PPPOE_SESSION = 0x8864
-    ETHERTYPE_802_1Q = 0X8100
-
-    PPP_IP   = 0x0021
-    PPP_IPV6 = 0x0057 
-
-    def initialize src=nil, dst=nil, type=0
-        super()
-        @src = src
-        @dst = dst
+# http://www.mudynamics.com
+# http://labs.mudynamics.com
+# http://www.pcapr.net
+
+module Mu
+class Pcap
+
+class Ethernet < Packet
+    attr_accessor :src, :dst, :type
+    
+    ETHERTYPE_IP  = 0x0800
+    ETHERTYPE_IP6 = 0x86dd
+    ETHERTYPE_ARP = 0x0806
+    ETHERTYPE_PPPOE_SESSION = 0x8864
+    ETHERTYPE_802_1Q = 0X8100
+
+    PPP_IP   = 0x0021
+    PPP_IPV6 = 0x0057 
+
+    def initialize src=nil, dst=nil, type=0
+        super()
+        @src = src
+        @dst = dst
         @type = type
-        @vlan = false
+        @vlan = false
     end
     attr_accessor :vlan
     
     def vlan?
       vlan
-    end
-
-    def flow_id
-        if not @payload or @payload.is_a? String
-            return [:ethernet, @src, @dst, @type]
-        else
-            return @payload.flow_id
-        end
-    end
-
-    FMT_MAC = "C6"
-    FMT_n = 'n'
-    MAC_TEMPLATE = '%02x:%02x:%02x:%02x:%02x:%02x'
-    def self.from_bytes bytes
-        if bytes.length < 14
-            raise ParseError, "Truncated Ethernet header: expected 14 bytes, got #{bytes.length} bytes"
-        end
-
-        dst = bytes.slice!(0,6).unpack FMT_MAC
-        dst = MAC_TEMPLATE % dst
-        src = bytes.slice!(0,6).unpack FMT_MAC
-        src = MAC_TEMPLATE % src
+    end
+
+    def flow_id
+        if not @payload or @payload.is_a? String
+            return [:ethernet, @src, @dst, @type]
+        else
+            return @payload.flow_id
+        end
+    end
+
+    FMT_MAC = "C6"
+    FMT_n = 'n'
+    MAC_TEMPLATE = '%02x:%02x:%02x:%02x:%02x:%02x'
+    def self.from_bytes bytes
+        if bytes.length < 14
+            raise ParseError, "Truncated Ethernet header: expected 14 bytes, got #{bytes.length} bytes"
+        end
+
+        dst = bytes.slice!(0,6).unpack FMT_MAC
+        dst = MAC_TEMPLATE % dst
+        src = bytes.slice!(0,6).unpack FMT_MAC
+        src = MAC_TEMPLATE % src
         type = bytes.slice!(0,2).unpack(FMT_n)[0]
         if type == ETHERTYPE_802_1Q
           @vlan = true
         else
           @vlan = false
-        end
-        while (type == ETHERTYPE_802_1Q)
-            # Skip 4 bytes for 802.1q vlan tag field
-            bytes.slice!(0,2)
-            type = bytes.slice!(0,2).unpack(FMT_n)[0]
-        end
+        end
+        while (type == ETHERTYPE_802_1Q)
+            # Skip 4 bytes for 802.1q vlan tag field
+            bytes.slice!(0,2)
+            type = bytes.slice!(0,2).unpack(FMT_n)[0]
+        end
         ethernet = Ethernet.new src, dst, type
-        ethernet.vlan = @vlan
-        ethernet.payload = bytes
-        ethernet.payload_raw = bytes
-        begin
-            case type
-            when ETHERTYPE_IP
-                ethernet.payload = IPv4.from_bytes bytes
-            when ETHERTYPE_IP6
-                ethernet.payload = IPv6.from_bytes bytes
-            when ETHERTYPE_PPPOE_SESSION
-                # Remove PPPoE/PPP session layer
-                ethernet.payload = bytes
-                ethernet.remove_pppoe!
-            else
-                ethernet.payload = bytes
-            end
-        rescue ParseError => e
-            Pcap.warning e
-        end
-        return ethernet
-    end
-
-    def ip?
-        return payload.is_a?(IP)
-    end
-    
-    ADDR_TO_BYTES = {}
-    FMT_HEADER = 'a6a6n'
-    def write io
-        dst_mac = ADDR_TO_BYTES[@dst] ||= @dst.split(':').inject('') {|m, b| m << b.to_i(16).chr}
-        src_mac = ADDR_TO_BYTES[@src] ||= @src.split(':').inject('') {|m, b| m << b.to_i(16).chr}
-        bytes = [dst_mac, src_mac, @type].pack(FMT_HEADER)
-        io.write bytes
-        if @payload.is_a? String
-            io.write @payload
-        else
-            @payload.write io
-        end
-    end
-
-    # Remove the PPPoE and PPP headers.  PPPoE is documented in RFC 2516.
-    def remove_pppoe!
-        bytes = self.payload_raw
-
-        # Remove PPPoE header
-        Pcap.assert bytes.length >= 6, 'Truncated PPPoE header: ' +
-            "expected at least 6 bytes, got #{bytes.length} bytes"
-        version_type, code, session_id, length = bytes.unpack 'CCnn'
-        version = version_type >> 4 & 0b1111
-        type    = version_type      & 0b1111
-        Pcap.assert version == 1, "Unknown PPPoE version: #{version}"
-        Pcap.assert type == 1, "Unknown PPPoE type: #{type}"
-        Pcap.assert code == 0, "Unknown PPPoE code: #{code}"
-        bytes = bytes[6..-1]
-        Pcap.assert bytes.length >= length, 'Truncated PPoE packet: ' +
-            "expected #{length} bytes, got #{bytes.length} bytes"
-        
-        # Remove PPP header
-        Pcap.assert bytes.length >= 2, 'Truncated PPP packet: ' +
-            "expected at least bytes, got #{bytes.length} bytes"
-        protocol_id, = bytes.unpack 'n'
-        bytes = bytes[2..-1]
-        case protocol_id
-        when PPP_IP
-            self.payload = IPv4.from_bytes bytes
-            self.payload_raw = bytes
-            self.type = ETHERTYPE_IP
-        when PPP_IPV6
-            self.payload = IPv6.from_bytes bytes
-            self.payload_raw = bytes
-            self.type = ETHERTYPE_IP6
-        else
-            # Failed.  Don't update payload or type.
-            raise ParseError, "Unknown PPP protocol: 0x#{'%04x' % protocol_id}"
-        end
-    end
-
-    def to_s
-        if @payload.is_a? String
-            payload = @payload.inspect
-        else
-            payload = @payload.to_s
-        end
-        return "ethernet(%s, %s, %d, %s)" % [@src, @dst, @type, payload]
-    end
-
-    def == other
-        return super &&
-            self.src  == other.src &&
-            self.dst  == other.dst &&
-            self.type == other.type
-    end
-end
-
-end
-end
+        ethernet.vlan = @vlan
+        ethernet.payload = bytes
+        ethernet.payload_raw = bytes
+        begin
+            case type
+            when ETHERTYPE_IP
+                ethernet.payload = IPv4.from_bytes bytes
+            when ETHERTYPE_IP6
+                ethernet.payload = IPv6.from_bytes bytes
+            when ETHERTYPE_PPPOE_SESSION
+                # Remove PPPoE/PPP session layer
+                ethernet.payload = bytes
+                ethernet.remove_pppoe!
+            else
+                ethernet.payload = bytes
+            end
+        rescue ParseError => e
+            Pcap.warning e
+        end
+        return ethernet
+    end
+
+    def ip?
+        return payload.is_a?(IP)
+    end
+    
+    ADDR_TO_BYTES = {}
+    FMT_HEADER = 'a6a6n'
+    def write io
+        dst_mac = ADDR_TO_BYTES[@dst] ||= @dst.split(':').inject('') {|m, b| m << b.to_i(16).chr}
+        src_mac = ADDR_TO_BYTES[@src] ||= @src.split(':').inject('') {|m, b| m << b.to_i(16).chr}
+        bytes = [dst_mac, src_mac, @type].pack(FMT_HEADER)
+        io.write bytes
+        if @payload.is_a? String
+            io.write @payload
+        else
+            @payload.write io
+        end
+    end
+
+    # Remove the PPPoE and PPP headers.  PPPoE is documented in RFC 2516.
+    def remove_pppoe!
+        bytes = self.payload_raw
+
+        # Remove PPPoE header
+        Pcap.assert bytes.length >= 6, 'Truncated PPPoE header: ' +
+            "expected at least 6 bytes, got #{bytes.length} bytes"
+        version_type, code, session_id, length = bytes.unpack 'CCnn'
+        version = version_type >> 4 & 0b1111
+        type    = version_type      & 0b1111
+        Pcap.assert version == 1, "Unknown PPPoE version: #{version}"
+        Pcap.assert type == 1, "Unknown PPPoE type: #{type}"
+        Pcap.assert code == 0, "Unknown PPPoE code: #{code}"
+        bytes = bytes[6..-1]
+        Pcap.assert bytes.length >= length, 'Truncated PPoE packet: ' +
+            "expected #{length} bytes, got #{bytes.length} bytes"
+        
+        # Remove PPP header
+        Pcap.assert bytes.length >= 2, 'Truncated PPP packet: ' +
+            "expected at least bytes, got #{bytes.length} bytes"
+        protocol_id, = bytes.unpack 'n'
+        bytes = bytes[2..-1]
+        case protocol_id
+        when PPP_IP
+            self.payload = IPv4.from_bytes bytes
+            self.payload_raw = bytes
+            self.type = ETHERTYPE_IP
+        when PPP_IPV6
+            self.payload = IPv6.from_bytes bytes
+            self.payload_raw = bytes
+            self.type = ETHERTYPE_IP6
+        else
+            # Failed.  Don't update payload or type.
+            raise ParseError, "Unknown PPP protocol: 0x#{'%04x' % protocol_id}"
+        end
+    end
+
+    def to_s
+        if @payload.is_a? String
+            payload = @payload.inspect
+        else
+            payload = @payload.to_s
+        end
+        return "ethernet(%s, %s, %d, %s)" % [@src, @dst, @type, payload]
+    end
+
+    def == other
+        return super &&
+            self.src  == other.src &&
+            self.dst  == other.dst &&
+            self.type == other.type
+    end
+end
+
+end
+end