embulk-input-pcapng-files 0.1.3 → 0.1.4

data/README.md

@@ -12,8 +12,14 @@ Obsoletes enukane/embulk-plugin-input-pcapng-files
 
 ## Configuration
 
-- **paths**: Paths to search pcapng (not recursive)
-- **schema**: List of fields to extract
+### Original options
+
+|name|type|required?|default|description|
+|:---|:---|:--------|:------|:----------|
+| paths | string | required | [] | paths where pcapng files exist (no recursive searching|
+| convertdot | string | optional | nil | convert "." in field name (for outputing into DB who doesn't accept "dot" in schema)|
+| schema| array of field hash | required | nil | list of field to extract from pcapng file |
+|field hash| hash ({name, type}) | required | nil | "name" matches field name for tshakr (-e), "type" should be "long", "double", "string" |
 
 ## Example
 
@@ -21,11 +27,13 @@ Obsoletes enukane/embulk-plugin-input-pcapng-files
 in:
   type: pcapng_files
   paths: [ /Users/enukane/Desktop/emtestpcap/ ]
+  convertdot: "__"
   threads: 2
   schema:
     - { name: frame.number,                 type: long }
-    - { name: frame.time_epoch,             type: long }
+    - { name: frame.time_epoch,             type: double }
     - { name: frame.len,                    type: long }
+    - { name: wlan_mgt.ssid,                type: string }
 ```
 
 ## Build

data/embulk-input-pcapng-files.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-pcapng-files"
-  spec.version       = "0.1.3"
+  spec.version       = "0.1.4"
   spec.authors       = ["enukane"]
   spec.summary       = "Pcapng Files input plugin for Embulk"
   spec.description   = "Pcapng Files input plugin for Embulk"

data/lib/embulk/input/pcapng_files.rb

@@ -10,10 +10,11 @@ module Embulk
         task = {
           'paths' => [],
           'done' => config.param('done', :array, default: []),
+          'convertdot' => config.param('convertdot', :string, default: nil),
         }
 
         task['paths'] = config.param('paths', :array, default: []).map {|path|
-          next [] unless Dir.exists?(path)
+          next [] unless Dir.exist?(path)
           Dir.entries(path).sort.select {|entry| entry.match(/^.+\.pcapng$/)}.map {|entry|
             path + "/" + entry
           }
@@ -30,7 +31,9 @@ module Embulk
         idx = 0
         columns.concat schema.map{|c|
           idx += 1
-          Column.new(idx, "#{c['name']}", c['type'].to_sym)
+          name = c['name']
+          name = name.gsub(".", task['convertdot']) if task['convertdot'] != nil # convert dot
+          Column.new(idx, "#{name}", c['type'].to_sym)
         }
 
         commit_reports = yield(task, columns, task['paths'].length)
@@ -65,12 +68,15 @@ module Embulk
       def convert val, type
         v = val
         v = "" if val == nil
-        if type == :long
+        case type
+        when :long
           if v.is_a?(String) and v.match(/^0x[0-9a-fA-F]+$/)
             v = v.hex
           else
             v = v.to_i
           end
+        when :double
+          v = v.to_f
         end
         return v
       end
@@ -78,6 +84,7 @@ module Embulk
       def build_options(fields)
         options = ""
         fields.each do |field|
+          field = field.gsub(task['convertdot'], '.') if task['convertdot'] != nil # put converted back to dot for tshark
           options += "-e \"#{field}\" "
         end
         return options
@@ -96,15 +103,6 @@ module Embulk
         end
         io.close
       end
-
-      def fetch_from_pcap(path, fields)
-        options = build_options(fields)
-        io = IO.popen("tshark -E separator=, #{options} -T fields -r #{path}")
-        data = io.read
-        io.close
-        return data
-      end
-
     end
   end
 end

metadata

@@ -1,41 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-pcapng-files
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
+  prerelease: 
 platform: ruby
 authors:
 - enukane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Pcapng Files input plugin for Embulk
@@ -45,7 +50,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -55,25 +60,32 @@ files:
 homepage: https://github.com/enukane/embulk-input-pcapng-files
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4490009824512618125
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4490009824512618125
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Pcapng Files input plugin for Embulk
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 30b497c71278b04611e349cf6b5b2f373146ebea
-  data.tar.gz: f6e57ea08bc45a8708340ac1a3b17163d72c7c5d
-SHA512:
-  metadata.gz: 5380028c8c911c542bcac93b0c035228dc563e5699937d5c1cadf6995cd5f7dbabe5093accf2ecf66774e5775f6d9a609675dca20a980dd7cdc5ba4baa754d19
-  data.tar.gz: b96e95d2ced69d8eea48a1bcc6606b57d82ffe35406375a35bfe5f82e8772b0265fb0c20a390665b4a417f9546f1afda64e0b650ee371371e0fac07a23294693