packet_via_dmem 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c91bd72301863ca9092e643890091fce9b9387ac
-  data.tar.gz: f60d3d27a871d6e6b18fce2e8cb8464890bb4a66
+  metadata.gz: 8440c5a60e199124adc3d0324bf38437174fb6a3
+  data.tar.gz: 73eebe8936d415da89dbf6e61c1c2086d8fa050b
 SHA512:
-  metadata.gz: d22df958223f3f66373060765fcc3619f2055119613c89244e98238b5dec7376d9f312bfadc0f847c4280b30a215815cf44ff9e13eebd82c690c737f1937f716
-  data.tar.gz: 218cde3c052d3418b7c667b3b50ca25dce497931db7e07c3102c66022c3e66999039ca59e63d1ea57e4e9a0fe7a8553265ad3d0f9e99a7688c2e6e8e2c3a1461
+  metadata.gz: 16e295f2ce92ffba8b559bba2aaf92b7df0bc2e2754a72736e47b9ae3418c54b5695a74f7bc149123ab733af600d087d0e30d64e66d135c5d16066007da40097
+  data.tar.gz: b3180ed9bac4472230ca4b0bd421bd79043f5dbe321d0501431fe0f9df588d8a3862aaed6f538c7854e0797417ca6694363b22f8b366f8480cc429bf01594ed4

data/README.md

@@ -2,13 +2,16 @@
 Finds junos packet-via-dmem packets from arbitrary output and generates text2pcap compatible output
 
 ## JunOS
+To capture say packets with IP address 10.11.12.13
+
     % ssh test2nqe31.dk|tee output.txt
     fisakytt@test2nqe31-re1.dk> start shell pfe network afeb0
 
     AFEB platform (1000Mhz QorIQ P2020 processor, 2048MB memory, 512KB flash)
     MX104-ABB-0(test2nqe31-re1.dk vty)# test jnh 0 packet-via-dmem enable
-    MX104-ABB-0(test2nqe31-re1.dk vty)# test jnh 0 packet-via-dmem 0x3 0xaabbcc
-    MX104-ABB-0(test2nqe31-re1.dk vty)# test jnh 0 packet-via-dmem 0x0
+    MX104-ABB-0(test2nqe31-re1.dk vty)# test jnh 0 packet-via-dmem capture 0x3 0x0a0b0c0d
+    MX104-ABB-0(test2nqe31-re1.dk vty)# test jnh 0 packet-via-dmem capture 0x0
+    MX104-ABB-0(test2nqe31-re1.dk vty)# test jnh 0 packet-via-dmem dump
     MX104-ABB-0(test2nqe31-re1.dk vty)# test jnh 0 packet-via-dmem disable
 
 
@@ -65,6 +68,72 @@ Finds junos packet-via-dmem packets from arbitrary output and generates text2pca
     dmem = PacketViaDMEM.new
     puts dmem.parse File.read(ARGF[0])
 
+
+## Header format
+Potentially first is type
+  * 00 ?? ?? ?? source ??
+  * 10 ?? ?? ?? ?? ?? source ??
+
+Example receive headers, MX480
+    00 0b 40 60 41 08
+    00 01 c0 70 81 08
+    00 02 40 70 81 08
+    00 02 c0 70 81 08
+    10 03 40 70 05 40 81 08
+    00 03 c0 70 81 08
+    00 06 40 70 81 08
+    00 07 c0 70 81 08
+    00 08 47 f0 20 00
+    00 09 45 f0 20 00
+    00 09 c7 f0 80 00
+    00 0b c0 70 81 08
+    10 0c 08 00 02 00 1f 00
+    00 00 c0 70 81 08
+    00 01 47 f0 80 00
+    00 04 40 60 41 08
+    10 04 c0 70 01 50 81 08
+    00 05 40 70 81 08
+    00 05 c0 70 81 08
+    00 06 c5 f0 20 00
+    10 07 08 00 02 00 1f 00
+    00 08 c0 70 81 08
+    00 0a 40 70 81 08
+    00 0a c0 70 81 08
+    00 0b 47 f0 20 00
+    00 01 c0 70 81 08
+    00 02 40 60 41 08
+    00 07 c7 f0 b0 80
+
+Example receive headers, MX80
+    00 08 00 f0 81 08
+    10 08 80 f0 05 b4 81 08
+    10 09 00 f0 05 b4 81 08
+    10 09 80 f0 05 b4 81 08
+    00 0a 00 f0 92 08
+    10 0a 80 f0 05 b4 81 08
+    10 03 00 f0 05 b4 81 08
+    00 04 00 f0 81 08
+    10 04 80 f0 05 b4 81 08
+    10 05 00 f0 05 b4 81 08
+    10 05 80 f0 05 b4 81 08
+    00 06 00 f0 81 08
+    10 06 80 f0 05 b4 81 08
+    00 07 00 f0 80 08
+    10 07 80 f0 05 b4 81 08
+    10 0b 00 f0 02 28 81 08
+
+TAZ-TBB-0(X vty)# show ixchip ifd
+
+   IFD       IFD        IX     WAN       Ing Queue     Egr Queue
+  Index      Name       Id     Port      Rt/Ct/Be      H/L 
+  ======  ==========  ======  ======  ==============  ======
+   148     ge-1/0/0      2       0        0/32/64       0/32
+   149     ge-1/0/1      2       1        1/33/65       1/33
+   166     ge-1/1/8      2      18       18/50/82      18/50
+
+For this box, second to last byte, divmod 64, returns these ports, which are
+correct port for source.
+
 ## Todo
   1. correctly discover how many bytes need to be popped, perhaps by finding valid ethernet headers and ignore anything before?
-  1. reverse engineer header/cookie, at least figuring out which egress NPU is going to be used should be trivial
+  1. reverse engineer header/cookie, at least figuring out which fabric stream (And hence egress NPU) is going to be used should be trivial

data/lib/packet_via_dmem.rb

@@ -16,7 +16,8 @@ class PacketViaDMEM
   end
 
   def parse str
-    pkts = []
+    packets = []
+    headers = []
     @sc.string = str
     while @sc.scan_until PACKET
       match = @sc.matched.split(/\s+/)
@@ -24,25 +25,40 @@ class PacketViaDMEM
       next if type == :received and (not @received or @received < 1)
       next if type == :sent     and (not @sent     or @sent < 1)
       @sc.scan_until(/\n/) if type == :received
-      type = type == :received ? @received : @sent
       pkt = ''
       while @sc.match?(/^0x/)
         pkt << @sc.scan_until(/\n/).strip
       end
-      pkt = parse_packet(pkt, type)
-      pkts << pkt if pkt
+      pkt = parse_packet pkt
+      pop = get_pop(type, pkt)
+      header = pkt[0..pop-1]
+      pkt = pkt[pop..-1]
+      if pkt
+        packets << '000000 ' + pkt.join(' ')
+        headers << header.join(' ')
+      end
     end
-    pkts
+    [packets, headers]
   end
 
   private
 
-  def parse_packet pkt, pop
+  def get_pop type, pkt
+    if type == :sent
+      @sent
+    else
+      case pkt.first.to_i(16)
+      when 0x0  then 6 #1,2,3,4,5,6
+      when 0x10 then 8 #1,2,3,4,7,8,5,6
+      else @received
+      end
+    end
+  end
+
+  def parse_packet pkt
     pkt = pkt.gsub(/0x/, '')
     pkt = pkt.gsub(/\s+/, '')
     pkt = pkt.scan(/../)
-    '000000 ' + pkt[pop..-1].join(' ')
-  rescue
-    nil
+    pkt
   end
 end

data/lib/packet_via_dmem/cli.rb

@@ -11,7 +11,7 @@ class PacketViaDMEM
       @opts   = opts_parse
       @debug  = @opts.debug?
     end
-    
+
     def run
       file = @opts.arguments.shift
       raise NoFile, 'filename is mandatory argument' unless file
@@ -20,7 +20,9 @@ class PacketViaDMEM
       rescue
         raise InvalidFile, "unable to read #{file}"
       end
-      puts PacketViaDMEM.new(:received=>@opts[:received], :sent=>@opts[:sent]).parse file
+      packets, headers = PacketViaDMEM.new(:received=>@opts[:received], :sent=>@opts[:sent]).parse file
+      $stderr.puts headers if @opts.headers?
+      puts packets
     end
 
     private
@@ -28,6 +30,7 @@ class PacketViaDMEM
     def opts_parse
       Slop.parse do |o|
         o.bool '-d', '--debug', 'turn on debugging'
+        o.bool '--headers', 'print headers to stderr'
         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.on   '-h', '--help' do puts o; exit; end

data/packet_via_dmem.gemspec

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