packetnom 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da39ff5a4480b640bc6d56830c833db9d9eace99
-  data.tar.gz: e5342d68de92bb8ca831506d4ff7a0be09814a77
+  metadata.gz: 4427150c842370e73dbd5ac68b957f0e0533ce25
+  data.tar.gz: 57a1080baaafc23fae7a3f350992256bc2ede7b3
 SHA512:
-  metadata.gz: 0be19443b6ec3a24f9067f82ea261a173d7abe48f1a583307928eef13cbb641b59f7568cb00cd404f17d5a598fb2ca029afd7e9c921c5a131153db05f1126f2c
-  data.tar.gz: 9f44f180e04fba37d016d42a0b0a55fdf269e8a0eab2eb46388664e55ce42c8e99396824d2c816a314112a9f07d1b8f1686efc02bf9b00bb670723b5bb692d20
+  metadata.gz: fa3b75eb9260a340c8a780f8d191020f9bc2ba3a3daef4233feeecae47aa7bf7c43371c6f9fe19c20e9758bc720b4b4d1d2719a90998d4f45f964b6cfa9f0ae1
+  data.tar.gz: 3e3264fd76588c8af17af9b6463f813675556990e5a4022d2b96fc83151914a803645fc8af5426706988d136de543da5e7a052c35338eaeaae54c3cabb2ce834

data/lib/packet/eth.rb

@@ -14,12 +14,33 @@ module Packetnom
                 # Layer 2
                 @dst = bytes[0..5].join(':')
                 @src = bytes[6..11].join(':')
-                @type = bytes[12..13].join() # http://en.wikipedia.org/wiki/EtherType
+                @type = bytes[12..13].join # http://en.wikipedia.org/wiki/EtherType
+
+                # WHY DOES THIS HAVE PADDING ON ETHERTYPE ON REPLAY?!
+                if @type.eql? '0000'
+                    @type = bytes[13..14].join
+                end
+                
+            end
+
+            def type? (is)
+                if type.eql? type
+                    return true
+                end
+
+                false
             end
 
             def type
                types = {
                     "0800" => "ip",
+                    "0801" => "x.75",
+                    "0802" => "nbs",
+                    "0803" => "ecma",
+                    "0804" => "chaosnet",
+                    "0805" => "x.25",
+                    "0806" => "arp",
+                    "814C" => "snmp",
                     "86dd" => "ipv6"
                 }
 

data/lib/packet/ipv4.rb

@@ -19,22 +19,24 @@ module Packetnom
             attr_accessor :dst
 
             # Initialize the packet
-            def initialize( bytes )                
-                @version = bytes[14].split(//)[0]
-                @ihl = bytes[14].split(//)[1]
-                @ds = bytes[15]
-                @len = bytes[16..17].join().to_i(16)
-                @id = bytes[18..19].join()
-
-                @flags = bytes[20].split(//)[0].to_i(16) #todo
-                @offset = "#{bytes[20].split(//)[1]}#{bytes[21]}".to_i(16) #todo
-
-                @ttl = bytes[22].to_i(16)
-                @proto = bytes[23].to_i(16)
-                @sum = bytes[24..25].join().to_i(16)
-                @src = bytes[26..29].map{|octet| octet.to_i(16).to_s(10)}.join('.')
-                @dst = bytes[30..33].map{|octet| octet.to_i(16).to_s(10)}.join('.')
-               
+            def initialize( bytes )
+                offset = Hash[bytes[0..24].map.with_index.to_a]['45']
+
+                @version = bytes[offset].split(//)[0]
+                @ihl = bytes[offset].split(//)[1]
+                @ds = bytes[offset+1]
+                @len = bytes[offset+2..offset+3].join().to_i(16)
+                @id = bytes[offset+4..offset+5].join().to_i(16)
+
+                options = bytes[offset+6..offset+7].join().to_i(16).to_s(2).rjust(16, '0')
+                @flags = options[0..2].to_i(2).to_s(10)
+                @offset = options[3..15].to_i(2).to_s(10)
+
+                @ttl = bytes[offset+8].to_i(16)
+                @proto = bytes[offset+9].to_i(16)
+                @sum = bytes[offset+10..offset+11].join()
+                @src = bytes[offset+12..offset+15].map{|octet| octet.to_i(16).to_s(10)}.join('.')
+                @dst = bytes[offset+16..offset+19].map{|octet| octet.to_i(16).to_s(10)}.join('.')
             end
 
             alias_method :length, :len

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetnom
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mike Mackintosh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-pcap
@@ -61,7 +61,6 @@ files:
 - lib/packetnom.rb
 - lib/packet/eth.rb
 - lib/packet/ipv4.rb
-- lib/packet/ipv6.rb
 - lib/packet/tcp.rb
 - lib/packet/udp.rb
 homepage: http://github.com/mikemackintosh/packetnom

data/lib/packet/ipv6.rb

@@ -1,79 +0,0 @@
-module Packetnom
-    
-    class Packet
-        
-        class IPv6
-
-            # Attributes
-            attr_accessor :version
-            attr_accessor :ihl
-            attr_accessor :ds
-            attr_accessor :len
-            attr_accessor :id
-            attr_accessor :flags
-            attr_accessor :offset
-            attr_accessor :ttl
-            attr_accessor :proto
-            attr_accessor :sum
-            attr_accessor :src
-            attr_accessor :dst
-
-            # Initialize the packet
-            def initialize( bytes )                
-                @version = bytes[14].split(//)[0]
-                @ihl = bytes[14].split(//)[1]
-                @ds = bytes[15]
-                @len = bytes[16..17].join().to_i(16)
-                @id = bytes[18..19].join()
-
-                @flags = bytes[20].split(//)[0].to_i(16) #todo
-                @offset = "#{bytes[20].split(//)[1]}#{bytes[21]}".to_i(16) #todo
-
-                @ttl = bytes[22].to_i(16)
-                @proto = bytes[23].to_i(16)
-                @sum = bytes[24..25].join().to_i(16)
-                @src = bytes[26..29].map{|octet| octet.to_i(16).to_s(10)}.join('.')
-                @dst = bytes[30..33].map{|octet| octet.to_i(16).to_s(10)}.join('.')
-               
-            end
-
-            alias_method :length, :len
-            alias_method :checksum, :sum
-
-            def protonum
-                @proto.to_i
-            end
-            def proto
-                protocol( @proto.to_i )
-            end
-            alias_method :protocol, :proto
-
-            def src
-               IPAddress @src
-            end
-            alias_method :source, :src
-            alias_method :from, :src
-
-
-            def dst
-                IPAddress @dst
-            end
-            alias_method :dest, :dst
-            alias_method :target, :dst
-
-        private
-
-            def protocol( proto )
-               protocols = {
-                    6 => "tcp",
-                    17 => "udp",
-                }
-
-                protocols[ proto ]
-            end
-
-        end
-
-    end
-
-end