packet_via_dmem 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef2cad0361ca93db4bedc5a4ba817c091bb7caae
-  data.tar.gz: 3a15a48484054db79bba1014ec008d5147e9427c
+  metadata.gz: 28abcdc9ceedec9ebdf16bbbfa2042d7b6c39d52
+  data.tar.gz: b53337153602aba2419d04d7d707f94b7821062a
 SHA512:
-  metadata.gz: 8d54500d03397a67b058c9cf94cbf5b74efa81800a2a87eb2231691a223509a5584178470c603a972d49d4c630bf65818cc6f098ab3bc41d79060eca75778c66
-  data.tar.gz: a06ffee647a7f386a716c9bddf9bfa10dd796d691d7f02e1446d7bba2f5046f2bfcf6c921215eaf690de68a964ac78addddf9a54e7ba76217239ee599cc43d95
+  metadata.gz: 58ba362cdd5a27229ecb9ca4138c10c291b1b158e0f15310edd6be4efe4526070fbc7dfc501e6b856b3d0efbee8fb697254eb81fef98ecd69c9d994a9192d645
+  data.tar.gz: 61b94c892afa4793638e01ea3f62ba47de3a05eba13b86e74bc06c2a5372ffa0fb91bd15a88e82c98a8b2e8f7320376debabb240377d935d2757e8c22ead66da

data/README.md

@@ -57,12 +57,16 @@ To capture say packets with IP address 10.11.12.13
     Read 28 potential packets, wrote 28 packets (4388 bytes).
     % ./bin/packet-via-dmem --help
     usage: ./bin/packet-via-dmem [options]
-        -d, --debug     turn on debugging
         --headers       print headers to stderr
         -o, --original  print original frames
-        -r, --received  pop BYTES from received frames, default 6
-        -s, --sent      pop BYTES from senti frames, default is not to show sent frames
+        -r, --received  print received frames only (DEFAULT)
+        -s, --sent      print sent frames only
+        -b, --both      print received and sent frames
+        --poprx         pop N bytes from received frames
+        --poptx         pop N bytes from sent frames
+        -d, --debug     turn on debugging
         -h, --help
+    %
 
 ## Library
     require 'packet_via_dmem'

data/lib/packet_via_dmem/cli.rb

@@ -23,9 +23,16 @@ class PacketViaDMEM
       packets = PacketViaDMEM.new(:received=>@opts[:received], :sent=>@opts[:sent]).parse file
       count = 0
       packets.each do |pkt|
-        next if pkt.type == :received and (not @opts[:received] or @opts[:received] < 1)
-        next if pkt.type == :sent     and (not @opts[:sent]     or @opts[:sent] < 1)
+        pop = false
+        if pkt.type == :received
+          next if @opts.sent?
+          pop = @opts[:poprx]
+        elsif pkt.type == :sent
+          next unless (@opts.sent? or @opts.both?)
+          pop = @opts[:poptx]
+        end
         packet = @opts.original? ? pkt.pretty_original : pkt.pretty_packet
+        packet = pkt.pretty pkt.pop(pop) if pop
         puts '### Packet %d ###' % [count+=1]
         puts packet
         $stderr.puts pkt.header.join(' ') if @opts.headers?
@@ -37,11 +44,14 @@ class PacketViaDMEM
 
     def opts_parse
       Slop.parse do |o|
-        o.bool '-d', '--debug',    'turn on debugging'
         o.bool       '--headers',  'print headers to stderr'
         o.bool '-o', '--original', 'print original frames'
-        o.int  '-r', '--received', "pop BYTES from received frames, default #{PacketViaDMEM::HEADER_SIZE[:received]}", :default=>PacketViaDMEM::HEADER_SIZE[:received]
-        o.int  '-s', '--sent',     "pop BYTES from senti frames, default is not to show sent frames"
+        o.bool '-r', '--received', 'print received frames only (DEFAULT)'
+        o.bool '-s', '--sent',     'print sent frames only'
+        o.bool '-b', '--both',     'print received and sent frames'
+        o.int        '--poprx',    'pop N bytes from received frames'
+        o.int        '--poptx',    'pop N bytes from sent frames'
+        o.bool '-d', '--debug',    'turn on debugging'
         o.on   '-h', '--help' do puts o; exit; end
       end
     end

data/packet_via_dmem.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'packet_via_dmem'
-  s.version           = '0.0.4'
+  s.version           = '0.0.5'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packet_via_dmem
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Saku Ytti