packetman 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ee06237cff9b2ffb77984c3d3ed1447e9fe4ba8
-  data.tar.gz: 58b85bd5f40726dbe58271425c6247556659dcfe
+  metadata.gz: 3009b4eaadbac87e9eb30cdfce2b5514dab7e1dd
+  data.tar.gz: 72ac9e408e40c1ca6d8547c4a2761ab0f1f92357
 SHA512:
-  metadata.gz: cfa7fe1df88846174e93d98003b4399da5b97162b3ccf8c9a23895d87e4d16a69da654c1da5772dd98eb0ce06afe97033b1adbb36913e3e1c470efd3a3dfe964
-  data.tar.gz: 48890d5a660428531b7d17f6338bcba85f142ec6b76ce09519632fddd2a7536f9079432e89065f817a5de5a1e07fc997bd24e3ee5ec9b45c5d70211314353a68
+  metadata.gz: 2a8a7307b4d2a614a40bfedddcfb93830222f3942f9a3ba14e6faac6364a3277620569b367ab52999b34800c18421227d94ed0aa0d7f6fb1babf9f83d402eee2
+  data.tar.gz: 3bd51c16765436d178d6b718cfb40e411ba20362f134376fb6ed8f214f1d8e34a38918c48fa1f5b52f9992d6bc6b938a6d1eabd08665386b3234d3627e21be47

data/config/applications.yml

@@ -0,0 +1,7 @@
+---
+dns: # packetman -tbo 21 -p udp -w '.' 'google.com'
+  :offset: 21
+  :start_with_transport: true
+  :offset_type: :bytes
+  :wildcard: .
+  :transport: udp

data/lib/packetman/config.rb

@@ -14,6 +14,10 @@ module Packetman
       @protocols ||= YAML.load(File.read(File.expand_path('../../../config/protocols.yml', __FILE__)))
     end
 
+    def applications
+      @applications ||= YAML.load(File.read(File.expand_path('../../../config/applications.yml', __FILE__)))
+    end
+
     def payload_query
       protocols[transport]['payload_query'] unless start_with_transport
     end
@@ -26,10 +30,18 @@ module Packetman
       end
     end
 
+    # FIXME figure out a way to do defaults so this can just set defaults
+    def application_override(app_name)
+      applications[app_name].each do |key, value|
+        __send__("#{key}=", value)
+      end
+    end
+
     def opts
       @opts ||= OptionParser.new do |opt|
         opt.banner = "Usage: #{File.basename($PROGRAM_NAME)} [OPTIONS] FILTER_STRING"
         opt.on("-p", "--protocol PROTO", protocols.keys, "Transport Protocol (#{protocols.keys.join(',')})") { |v| self.transport = v }
+        opt.on("-a", "--application APPLICATION", applications.keys, "Application Protocol (#{applications.keys.join(',')}) OVERRIDES ALL OTHER SETTINGS") { |v| application_override(v) }
         opt.on("-t", "--transport", "OFFSET starts at transport header instead of data payload") { |v| self.start_with_transport = v }
         opt.on("-r", "--radix RADIX", Integer, "Treat FILTER_STRING as RADIX instead of String") { |v| self.radix = v }
         opt.on("-o", "--offset OFFSET", Integer, "Offset in bits") { |v| self.offset = v }

data/lib/packetman/filter.rb

@@ -53,7 +53,7 @@ module Packetman
 
     # Binary string for _chr_ substituting wildcards as necessary
     def bin_chr(chr)
-      chr = '0' if chr == config.wildcard
+      chr = 0 if chr == config.wildcard
 
       if config.radix
         raise "invalid character '#{chr}' for radix=#{config.radix}" if chr.downcase != chr.to_i(config.radix).to_s(config.radix).downcase

data/lib/packetman/version.rb

@@ -1,3 +1,3 @@
 module Packetman
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetman
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jason Scholl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
@@ -115,6 +115,7 @@ files:
 - bin/console
 - bin/setup
 - circle.yml
+- config/applications.yml
 - config/protocols.yml
 - exe/packetman
 - lib/packetman.rb
@@ -150,3 +151,4 @@ signing_key:
 specification_version: 4
 summary: Advanced tcpdump and Wiresharp filter generator.
 test_files: []
+has_rdoc: