packet_via_dmem 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3437cddffd7d621744b7ac1d8fbfac6243d5b7f
-  data.tar.gz: b50cb9dc98e3faeabb9be6f8d89cf96d28941edb
+  metadata.gz: 8817b2bac1c9fe1cdf6a2f24c90508bfb5bddc54
+  data.tar.gz: 092b207f0481c995223532662c21d37c001e42b1
 SHA512:
-  metadata.gz: 299fbfc90cc15cdf0e122f850092995423757ad118878feef5811dfcd6b15d362c936e0dd8793bfe033ce7da08c0bd040da4c9a9fd1ecedaecffc41e52517028
-  data.tar.gz: 741a8465e4209dce7d095d20ef888feac578f4bb3a33156919d425d0c6ff7094054008445c4c33c9a6986da756ac4c4fd00615c577ee6b6401793ba7480ad394
+  metadata.gz: 79f503258a66b6e81d43fb2c5e0d2109172172fbb0cb6942d19d2ac250ea6c2f2e4a142f8b3bb156e6ea50ea68c0c1ce80a36ffd37fc03bbeed73bbc01025856
+  data.tar.gz: a54c11bbc0021679f9dc45ca181cab80c99011bf6e1891e3aa1f9e9ac56ae923c84a1fea96f5ddbf1dd7ebc5af599fcd5468cda4c8b869fb32f47819d6840bd2

data/lib/packet_via_dmem.rb

@@ -1,4 +1,5 @@
 require 'strscan'
+require 'logger'
 
 class PacketViaDMEM
   PACKET = /^(Received|Sent) \d+ byte parcel:.*\n/
@@ -18,13 +19,17 @@ class PacketViaDMEM
   def initialize opts={}
     @received   = opts.delete :received
     @sent       = opts.delete :sent
-    @debug      = opts.delete :debug
+    @log        = opts.delete :log
+    if not @log
+      @log = Logger.new STDERR
+      @log.level = Logger::FATAL
+    end
     @received ||= HEADER_SIZE[:received]
     @sc         = StringScanner.new ''
   end
 
   def parse str
-    packets = Packets.new @debug
+    packets = Packets.new @log
     @sc.string = str
     while @sc.scan_until PACKET
       match = @sc.matched.split(/\s+/)

data/lib/packet_via_dmem/cli.rb

@@ -8,8 +8,9 @@ class PacketViaDMEM
     attr_reader :debug
 
     def initialize
-      @opts   = opts_parse
-      @debug  = @opts.debug?
+      @opts      = opts_parse
+      @log       = Logger.new STDERR
+      @log.level = Logger::INFO unless @opts.debug?
     end
 
     def run
@@ -22,7 +23,7 @@ class PacketViaDMEM
       end
       packets = PacketViaDMEM.new(:received=>@opts.received?,
                                   :sent=>@opts.sent?,
-                                  :debug=>@opts.debug?).parse file
+                                  :log=>@log).parse file
       count = 0
       packets.each do |pkt|
         pop = false
@@ -37,7 +38,7 @@ class PacketViaDMEM
         packet = pkt.pretty pkt.pop(pop) if pop
         puts pkt.header.to_s count+=1
         puts packet
-        $stderr.puts pkt.header.join(' ') if @opts.headers?
+        $stderr.puts pkt.popped.join(' ') if @opts.popped?
         puts
       end
     end
@@ -46,7 +47,7 @@ class PacketViaDMEM
 
     def opts_parse
       Slop.parse do |o|
-        o.bool       '--headers',  'print headers to stderr'
+        o.bool       '--popped',   'print popped bytes to stderr'
         o.bool '-o', '--original', 'print original frames'
         o.bool '-r', '--received', 'print received frames only (DEFAULT)'
         o.bool '-s', '--sent',     'print sent frames only'

data/lib/packet_via_dmem/header/received.rb

@@ -17,8 +17,8 @@ class Header
       str << '# RX %03d # '     % packet_number
       str << 'bytes: %d # '     % size if msg_type > 0
       str << 'stream: %d # '    % stream
-      str << 'port: %d (%s) # ' % [port, port.divmod(64).join('/')]
-      str << "type: %d\n"       % type
+      str << 'port: %x (%s) # ' % [port, port.divmod(64).join('/')]
+      str << "type: %x\n"       % type
       str << '#          '
       str << 'table: %d # '     % table
       str << 'offset: %d # '    % offset

data/lib/packet_via_dmem/header/sent.rb

@@ -31,8 +31,8 @@ class Header
       str << (decrement_reference ? 'D' : 'd')
       str << (prequeue_priority ? 'P' : 'p')
       str << ' # '
-      str << 'port: %d (%s) # '   % [port, port.divmod(64) ]
-      str << 'type: %d # '        % type
+      str << 'port: %x (%s) # '   % [port, port.divmod(64) ]
+      str << 'type: %x # '        % type
       str << 'QoS: %d@%d # '      % [queue_number, queue_system]
       str << "QueueDropOp: %d\n"  % [queue_drop_opcode]
       str << '#          '

data/lib/packet_via_dmem/packet.rb

@@ -54,13 +54,12 @@ class PacketViaDMEM
     def get_pop_push pkt, header
       header.port = pkt.shift.to_i(16)
       header.type = pkt.shift.to_i(16)
-      case header.type
-      when *Type::MPLS, *Type::SELF, *Type::SENT
+      if Type::NOPOP.include? header.type # no-op, DMAC follows
+        [0, []]
+      else # *Type::MPLS, *Type::SELF, *Type::SENT (But be robust for unexpected)
         header.magic1 = pkt.shift.to_i(16)
         header.magic2 = pkt.shift.to_i(16)
         magic pkt, header
-      when *Type::NOPOP  # no-op, DMAC follows
-        [0, []]
       end
     end
 
@@ -69,13 +68,18 @@ class PacketViaDMEM
       when 0x00 # the super dodgy one
         magic_self pkt, header
       when 0x01 # we're missing ethertype, need more data to discover etype
-        push = pkt[0..11] + FAKE[:etype_mpls]
+        etype = FAKE[:etype_ipv4]
+        etype = FAKE[:etype_mpls] if Type::MPLS.include? header.type
+        push = pkt[0..11] + etype
         [ 12 , push ]
       when 0x20 # we have extra crap
         [ 21, [] ]
       when 0x80 # sent... only?
         header.magic3 = pkt.shift.to_i(16)
         [ 0, [] ]
+      else
+        @log.warn "unknown magic1: (%x/%x), type: %x, port: %x'" % [header.magic1, header.magic2, header.type, header.port]
+        [ 0, [] ]
       end
     end
 
@@ -90,7 +94,8 @@ class PacketViaDMEM
         push = FAKE[:dmac] + FAKE[:smac] + FAKE[:etype_ipv4]
         [ 3, push ]
       else
-        $stderr.puts "magic_self: magic: (%x/%x), port: %x'" % [header.magic1, header.magic2, header.port] if @debug
+        @log.warn "unknown port: magic: (%x/%x), type: %x, port: %x'" % [header.magic1, header.magic2, header.type, header.port]
+        [ 0, [] ]
       end
     end
 

data/lib/packet_via_dmem/packets.rb

@@ -7,15 +7,15 @@ class PacketViaDMEM
     include Enumerable
     class InvalidType < Error; end
 
-    def initialize debug
-      @debug   = debug
+    def initialize log
+      @log    = log
       @packets = []
     end
 
     def add packet, type
       packet = case type
-      when :received then Received.new packet, @debug
-      when :sent     then Sent.new packet, @debug
+      when :received then Received.new packet, @log
+      when :sent     then Sent.new packet, @log
       else raise InvalidType, "#{type} not valid packet type"
       end
       @packets << packet

data/lib/packet_via_dmem/received.rb

@@ -2,8 +2,8 @@ require_relative 'header/received'
 class PacketViaDMEM
   class Received < Packet
 
-    def initialize packet, debug
-      @debug                    = debug
+    def initialize packet, log
+      @log                      = log
       @type                     = :received
       @original                 = packet.dup
       @header                   = Header::Received.new

data/lib/packet_via_dmem/sent.rb

@@ -2,8 +2,8 @@ require_relative 'header/sent'
 class PacketViaDMEM
   class Sent < Packet
 
-    def initialize packet, debug
-      @debug           = debug
+    def initialize packet, log
+      @log             = log
       @type            = :sent
       @original        = packet.dup
       @header          = Header::Sent.new

data/packet_via_dmem.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'packet_via_dmem'
-  s.version           = '0.0.12'
+  s.version           = '0.0.14'
   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.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Saku Ytti