syspy 0.0.17 → 0.0.18

data/bin/syspy

@@ -1,3 +1,5 @@
+$:.unshift File.join(File.dirname(File.dirname(__FILE__)),"lib")
+
 require "rubygems"
 require "syspy"
 require "time"

data/lib/syspy.rb

@@ -1,3 +1,5 @@
+$:.unshift File.dirname(__FILE__)
+
 require "rubygems"
 require "log"
 require "tds_package_stream"

data/lib/tds_package_stream.rb

@@ -17,23 +17,33 @@ module Syspy
 
     def each_package()
       Thread.abort_on_exception = true       
-      @tcpdump_thread = Thread.new(){       
-        IO.popen("tcpdump -q -y EN10MB -U -B 2048 -w - -i #{@interface} tcp and dst #{@dst} and dst port #{@dst_port} 2>/dev/null"){|io|         
-          content = ""
-          loop(){
-            tcp_length = read_ip_header(io)
-            Log.debug "Got IP package: #{tcp_length}"
-            content_length = read_tcp_header(io,tcp_length)
-            Log.debug "Got TCP package: #{content_length}"
-            
-            if(content_length > 0)        
-              content = io.read(content_length)       
-              @out.write(content)
-              @out.flush      
+      @tcpdump_thread = Thread.new(){             
+        IO.popen("tcpdump -B 2048 -q -x -i #{@interface} tcp and dst #{@dst} and dst port #{@dst_port} 2>/dev/null"){|io|         
+          buffer = StringIO.new()
+          io.each_line(){|line|            
+            if(line.match(/^\d{1,2}:\d{1,2}:\d{1,2}.+$/))
+              puts line                         
+              unless(buffer.string.empty?)                
+                data_io = StringIO.new(buffer.string)
+                tcp_length = read_ip_header(data_io)               
+                Log.debug "Got IP package: #{tcp_length}"
+                content_length = read_tcp_header(data_io,tcp_length)               
+                Log.debug "Got TCP package: #{content_length}"
+                if(content_length > 0)        
+                  content = data_io.read(content_length)       
+                  @out.write(content)
+                  @out.flush      
+                end
+                buffer = StringIO.new()
+              end              
+            else
+              token = line.squeeze(" ").split(" ")[1..-1].join("")
+              0.upto((token.size / 2) - 1){|i|
+                char = token[i*2,2].to_i(16)
+                buffer.putc(char)
+              }
             end
-
-            Log.debug "Network package done"      
-          } 
+          }         
         }
       }  
 
@@ -80,13 +90,6 @@ module Syspy
     end
 
     def read_ip_header(io)
-      count = 0
-      loop(){
-        network_type = Bytes.uint16be(io)
-        break if network_type == 0x800 and count >= 14
-        count += 1 
-      }    
-
       # read IP version and header length
       ver_len = Bytes.uint(io)
       version = ver_len >> 4

metadata

@@ -1,34 +1,46 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: syspy
-version: !ruby/object:Gem::Version
-  version: 0.0.17
+version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 18
+  version: 0.0.18
 platform: ruby
-authors:
+authors: 
 - Matthias Balmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-14 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bindata
-  requirement: &12454940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *12454940
+  version_requirements: *id001
 description: 
 email: matthias.balmer@sysinf.ch
-executables:
+executables: 
 - syspy
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/bytes.rb
 - lib/tds_types.rb
 - lib/tds_tokens.rb
@@ -41,29 +53,39 @@ files:
 - lib/syspy.rb
 - lib/tds_package.rb
 - bin/syspy
+has_rdoc: true
 homepage: 
 licenses: []
-post_install_message: To use syspy as standalone application run "sudo syspy <interface>
-  <destination_ip> <destination_port>"
+
+post_install_message: To use syspy as standalone application run "sudo syspy <interface> <destination_ip> <destination_port>"
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Observe TDS packages directly from a network interface
 test_files: []
+