dvrtools 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ddb800c33e118f64a660d98b3eee2eb80da814c
-  data.tar.gz: aec02509baece2b80544dbef260250675dd091b3
+  metadata.gz: add60494b261950949a033c3839f1d951860f0d9
+  data.tar.gz: 37f20949e643e0ad030a7f914995e27decbe619a
 SHA512:
-  metadata.gz: 1c87f1fd6bfdec071b10a88f7b6464a3a773b06495e047f7eedf5b134e520149c691f6631b309298fb95706ba324e11657c8a33413aaa890075eb339d2979b5a
-  data.tar.gz: ce2e281d1400adf211bba648947c0a28e5532e1c9ed5be50e33760f86c61c39e024945cb9a21809891a55ad5c36cef1a2a76f70ed5abb3ffc291ba6583714dc9
+  metadata.gz: 32bc6d2f78f5f6b56ba04e67d45a627f62253f4a1f948ecbba714cc5c64a8d1201291005fd9ac43be362bbc9ba24856f4d96fcb9efa80ead73292a57e519c48a
+  data.tar.gz: 5105e6527dea53eeec2e517fa7a8e28b25023613a6d7e4e522884f0ac90ed76fa8e2035f8dcfa79500a097fbe811188c3503616922f84599a83cc31aece1278c

data/bin/dnsmap

@@ -5,6 +5,7 @@ require 'digest/md5'
 require 'msgpack'
 require 'eventmachine'
 require 'gviz'
+require 'open3'
 require 'pp'
 
 opt = {
@@ -13,6 +14,8 @@ opt = {
   :aggregate => false,
   :layout => 'neato',
   :verbose => false,
+  :pcapfile => nil,
+  :binpath => 'devourer'
 }
 
 optpsr = OptionParser.new
@@ -20,6 +23,8 @@ optpsr.on('-o VAL', 'output file name') {|v| opt[:output] = v }
 optpsr.on('-i VAL', 'interval (sec)') {|v| opt[:interval] = v.to_i } 
 optpsr.on('-a', 'aggregate IP address by /24') {|v| opt[:aggregate] = v }
 optpsr.on('-l VAL', 'graphviz layout, default: neato') {|v| opt[:layout] = v}
+optpsr.on('-r VAL', 'specify pcap file') {|v| opt[:pcapfile] = v}
+optpsr.on('-b VAL', 'path of devourer') {|v| opt[:binpath] = v}
 optpsr.on('-q', 'quiet mode') {|v| $VERBOSE = nil}
 optpsr.on('-v', 'verbose mode') {|v| opt[:verbose] = v }
 
@@ -141,7 +146,17 @@ end
 
 if args.size == 0
   EM.run do
-    dm = EM.attach(STDIN, DnsMap, opt)
+    if opt[:pcapfile].nil?
+      warn 'stdin'
+      input_stream = STDIN
+    else
+      warn 'popen'
+      stdin, stdout, stderr = Open3.popen3("#{opt[:binpath]} -r #{opt[:pcapfile]} -o -")
+      stdout.sync = true
+      input_stream = stdout;
+    end
+    
+    dm = EM.attach(input_stream, DnsMap, opt)
     
     if opt[:interval] > 0
       pt = EventMachine::PeriodicTimer.new(interval) do

data/lib/dvrtools/version.rb

@@ -1,3 +1,3 @@
 module Dvrtools
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dvrtools
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masayoshi Mizutani