packetfu 1.1.12.pre → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27fdb60e2d8cf9c2abe63361c024c6b6b4077c45
-  data.tar.gz: ddb6a367565f97de59c730d6e5141e85165407f4
+  metadata.gz: 712224a72548bc850cf753d398d54c91560b5ca4
+  data.tar.gz: 79a17434b2b794b94ad8f17339e9eed70f8110ad
 SHA512:
-  metadata.gz: d063030465de3423c0b59295bd5ebd02d568d1832f7770965cb6825d29d645cfd6bc6ab43e40cb5871fb7b187507d3ba2a1415bc3d63b7b017287b39adfd5481
-  data.tar.gz: 445f37e0c272b179382396bd2307fa24e6214fd0ae8cdb34d65cbcdef3fd05562a927239bea0f4aeaf6d79d34386827d4c2489604b9261b35422eb376ba6937b
+  metadata.gz: 0552cd39507b9d8fa6613a2e0c6fed7a9950336d0ed5a315ae721d829d8b5db66acde56e756e7977d332fb0d69136f621e04c4d4d791f5edc61631d1624aea48
+  data.tar.gz: 6ec922087b78eeddb1dcfd827a6d4348bf7e132d1d349afaf9ab88aab56e9f58c1703e500ef9864bf1553a5ae43858a426784dd009e619a2ba6a911e904351f6

data.tar.gz.sig

@@ -0,0 +1,5 @@
+@�Rr˟� ��?t�Zy�ҫ��_K>؉�{n��V�U3�|TEц7{���g�I5;�����Bt��"2t���G�ĉ�Q:71l�}&~:��$����0˿7��w� �DCkV�|"5�wp
+T�����ZT�cO�
+q��󑉈����jf��O��b�w����ߏ�ˡ����džM�
+
+s<ݮʆ��A �۴;oj��ܹ"s8k�%�O�ߨ/����,[�@����E������

data/.gitignore

@@ -1,4 +1,6 @@
 *.gem
+*.swp
+*~
 doc/
 .yardoc/
 pkg/

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 before_install:
  - sudo apt-get install libpcap-dev -qq
 rvm:
-  - 2.1.6
-  - 2.2.3
-  - 2.3.0
+  - 2.1
+  - 2.2
+  - 2.3.3
+  - 2.4.0

data/README.md

@@ -64,33 +64,33 @@ Here's an example of creating a TCPPacket and sending it out on the wire:
 ```
 2.3.0 :002 > packet = TCPPacket.new(:config => Utils.whoami?)
  => --EthHeader-------------------------------------------
-  eth_dst      ec:08:6b:62:bc:d2 PacketFu::EthMac     
-  eth_src      ac:bc:32:85:47:3f PacketFu::EthMac     
-  eth_proto    0x0800            StructFu::Int16      
+  eth_dst      ec:08:6b:62:bc:d2 PacketFu::EthMac
+  eth_src      ac:bc:32:85:47:3f PacketFu::EthMac
+  eth_proto    0x0800            StructFu::Int16
 --IPHeader--------------------------------------------
-  ip_v         4                 Fixnum               
-  ip_hl        5                 Fixnum               
-  ip_tos       0                 StructFu::Int8       
-  ip_len       20                StructFu::Int16      
-  ip_id        0x77e4            StructFu::Int16      
-  ip_frag      0                 StructFu::Int16      
-  ip_ttl       32                StructFu::Int8       
-  ip_proto     6                 StructFu::Int8       
-  ip_sum       0xffff            StructFu::Int16      
-  ip_src       192.168.0.100     PacketFu::Octets     
-  ip_dst       0.0.0.0           PacketFu::Octets     
+  ip_v         4                 Integer
+  ip_hl        5                 Integer
+  ip_tos       0                 StructFu::Int8
+  ip_len       20                StructFu::Int16
+  ip_id        0x77e4            StructFu::Int16
+  ip_frag      0                 StructFu::Int16
+  ip_ttl       32                StructFu::Int8
+  ip_proto     6                 StructFu::Int8
+  ip_sum       0xffff            StructFu::Int16
+  ip_src       192.168.0.100     PacketFu::Octets
+  ip_dst       0.0.0.0           PacketFu::Octets
 --TCPHeader-------------------------------------------
-  tcp_src      42653             StructFu::Int16      
-  tcp_dst      0                 StructFu::Int16      
-  tcp_seq      0x8d65fbbf        StructFu::Int32      
-  tcp_ack      0x00000000        StructFu::Int32      
-  tcp_hlen     5                 PacketFu::TcpHlen    
+  tcp_src      42653             StructFu::Int16
+  tcp_dst      0                 StructFu::Int16
+  tcp_seq      0x8d65fbbf        StructFu::Int32
+  tcp_ack      0x00000000        StructFu::Int32
+  tcp_hlen     5                 PacketFu::TcpHlen
   tcp_reserved 0                 PacketFu::TcpReserved
-  tcp_ecn      0                 PacketFu::TcpEcn     
-  tcp_flags    ......            PacketFu::TcpFlags   
-  tcp_win      16384             StructFu::Int16      
-  tcp_sum      0x7f29            StructFu::Int16      
-  tcp_urg      0                 StructFu::Int16      
+  tcp_ecn      0                 PacketFu::TcpEcn
+  tcp_flags    ......            PacketFu::TcpFlags
+  tcp_win      16384             StructFu::Int16
+  tcp_sum      0x7f29            StructFu::Int16
+  tcp_urg      0                 StructFu::Int16
   tcp_opts                       PacketFu::TcpOptions
 
 2.3.0 :003 > packet.ip_dst = "8.8.8.8"

data/examples/ping.rb

@@ -0,0 +1,40 @@
+# Usage:
+# rvmsudo ruby examples/ping.rb 8.8.8.8
+
+# Path setting slight of hand:
+$: << File.expand_path("../../lib", __FILE__)
+
+require 'packetfu'
+
+ip = ARGV[0].chomp
+
+config = PacketFu::Utils.whoami?()
+
+icmp_packet = PacketFu::ICMPPacket.new(:config => config)
+icmp_packet.ip_daddr = ip
+icmp_packet.payload = "I'm sending ICMP packets using PacketFu!!!"
+icmp_packet.icmp_type = 8
+icmp_packet.recalc
+
+capture_thread = Thread.new do
+  begin
+    Timeout::timeout(3) {
+      cap = PacketFu::Capture.new(:iface => config[:iface], :start => true)
+      cap.stream.each do |p|
+        pkt = PacketFu::Packet.parse p
+        next unless pkt.is_icmp?
+        if pkt.ip_saddr == ip and pkt.icmp_type == 0
+          puts "Got ICMP echo reply from #{ip}"
+          break
+        end
+      end
+    }
+  rescue Timeout::Error
+    puts "ICMP echo request timed out"
+  end
+end
+
+puts "Sending ICMP echo request to #{ip}"
+icmp_packet.to_w
+
+capture_thread.join

data/examples/tcp_handshake.rb

@@ -0,0 +1,61 @@
+# Usage:
+# rvmsudo ruby examples/tcp_handshake.rb 192.30.252.130
+
+# Notes:
+# because we're bypassing the kernel for this raw TCP handshake it will normally
+# RST SYN/ACK operations because the kernel is not tracking the TCP session.
+# You can prevent the RST from being sent by your client using the following iptables hack.
+#
+# iptables -A OUTPUT -p tcp --tcp-flags RST RST -j DROP
+
+# Path setting slight of hand:
+$: << File.expand_path("../../lib", __FILE__)
+
+require 'packetfu'
+
+ip = ARGV[0].chomp
+
+config = PacketFu::Utils.whoami?()
+
+syn_packet = PacketFu::TCPPacket.new(:config => config)
+syn_packet.ip_daddr = ip
+syn_packet.tcp_dst = 80
+syn_packet.tcp_flags.syn = 1
+syn_packet.recalc
+
+capture_thread = Thread.new do
+  begin
+    Timeout::timeout(3) {
+      cap = PacketFu::Capture.new(:iface => config[:iface], :start => true)
+      cap.stream.each do |p|
+        pkt = PacketFu::Packet.parse p
+        next unless pkt.is_tcp?
+
+        if pkt.ip_saddr == ip &&
+           pkt.tcp_flags.syn == 1 &&
+           pkt.tcp_flags.ack == 1
+
+          puts "Got SYN/ACK reply from #{ip}"
+
+          syn_ack_packet = pkt
+          ack_packet = syn_packet.dup
+          ack_packet.tcp_flags.syn = 0
+          ack_packet.tcp_flags.ack = 1
+          ack_packet.tcp_ack = syn_ack_packet.tcp_seq + 1
+          ack_packet.tcp_seq = syn_ack_packet.tcp_ack
+
+          puts "Sending ACK reply to #{ip}"
+          ack_packet.to_w
+          break
+        end
+      end
+    }
+  rescue Timeout::Error
+    puts "SYN request timed out"
+  end
+end
+
+puts "Sending SYN request to #{ip}"
+syn_packet.to_w
+
+capture_thread.join

data/gem-public_cert.pem

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
 MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQ0wCwYDVQQDDAR0b2Ri
 MRgwFgYKCZImiZPyLGQBGRYIcGFja2V0ZnUxEzARBgoJkiaJk/IsZAEZFgNjb20w
-HhcNMTUwODI1MTQ1MzQ2WhcNMTYwODI0MTQ1MzQ2WjA+MQ0wCwYDVQQDDAR0b2Ri
+HhcNMTcwMjAzMTc1MjAyWhcNMTgwMjAzMTc1MjAyWjA+MQ0wCwYDVQQDDAR0b2Ri
 MRgwFgYKCZImiZPyLGQBGRYIcGFja2V0ZnUxEzARBgoJkiaJk/IsZAEZFgNjb20w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl/jdqB/u4WnnAV7ds6U7r
-kffHRJCMc1+s0lvjnWMnZuegjJkuElm0jNQnkUzNqhJGI2NVDc1COoT6VHsEPRi8
-uD8po+7pisLwqUHIyx8PFu+pGSRGawEgAPT5DfEf9MwGTob1G9vm1Hv7rTMN+S1X
-nMIxpFwiMilhLKdoTEZAo0moFbWEVK4ZuEaNkPXGxFKEdnpyb8Fi+/akzwWtwRp1
-ByJktlF3YIZgAimvY/PtV0V1n+Mktoz+706EUDe/ZnD8M+o6orzqryCiQrqdzJyk
-cPv7u1RuG1VPC8mK5TmB9lqlMPi/hxbjC4LfhJsZYoO1AF6baZ8HzqCISInBLwyd
-AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBS/B6/d
-CN84yx061Q/xqilGxY4qqTAcBgNVHREEFTATgRF0b2RiQHBhY2tldGZ1LmNvbTAc
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDig9ogvD2veEAEcmJt92br
+5RhDcUv6VobqIazGJKdXhEYU6wk1353IxEfRTEWOwSKlFjJqwuV/Bm+jmZktoTQV
+ry8IZAfTxdHBSyWiXBGgg5UA3QS5ZH8gJIv7z9YQLWy8XORo76Xjpt0tr33z5+TU
+8N3hh0ede6CAlM+TtCPJ6/GYvusJ1ThKjTWKMftllBFwFkbxMjrla6tfFu02tw/D
+bIeaC9kLliH+3exUzVDRqXZjHaD4edUPAId1QiFpLOgQBtqMCSm2aN3Cwdtb/4rc
+7NSF7js+i+tgeAqNWogimx7P0/SKjE+UJ+qj7PK4bvPDqOxCwBprVzeQACQd/wNJ
+AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBS0hsMH
+SbakJkxOU8dncu6xO+S/6zAcBgNVHREEFTATgRF0b2RiQHBhY2tldGZ1LmNvbTAc
 BgNVHRIEFTATgRF0b2RiQHBhY2tldGZ1LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEA
-Oz/R618bt2/QxwL1wM6bP/yb+xNd/DR8aOUeKZwarfWuo6zhVY03qiydlElHU0YJ
-Rl0/JGQIHNVUzIr3J/QXv225LUECYTejPKC8LcELdfjSfUwzTd75zrGisL0//a4m
-+Zcv8PSfdOCug3jj5EDMVZe/sX7G4vEqM81SaQaUYFltKGk2YUrlYJsNGW6Yp4As
-c4y7lD0Rc4OsaoWT5ozhFBJv1qSuoL1y1qySsVazbc0jYjxm6HkVWqOd1cO5zO74
-AFvBtuFFTUDdrs3M/q6ktx295osXr2XpaygJmhkMLj81xoIX9G8eEjPc/XQWDlI1
-ma/kCj5vaQ3hma/0DsajCg==
+JuFlw48r9fmUML3z9e82Ldx+zh8Y5ry6Pf/fgacLpP9fpn62Dc/lZlCE6jYAyHo1
+hK40RP+CJAm/6pGfCX66nX3+CTWQimZLRMpaBoAvSFEZ6ksBqXnzFH0YZlJccTxe
+FIyxZQgxjsXfAbmkFfSh8zGGN0Yk1TSjnS54b9sQpmmopRShM2nMFimu6381SmLU
+LZVT1SzAMqjK5HKaFwBwmb9i+vPycblrL8ngjSg4TWqMt4PLXOTvyiCy2IQRXb+o
+aNODmav4FDa8Yham3QhPACahVVxZczCpbDHFvojjk127uca93t3gc2IGx1jYO0mv
+bGMb9KcX7MTVhg4J4u5k6A==
 -----END CERTIFICATE-----

data/lib/packetfu/packet.rb

@@ -44,7 +44,7 @@ module PacketFu
       end
 
       new_args = {}
-      new_args[:on_ipv6] = true if IPv6Packet.can_parse?(packet)
+      new_args[:on_ipv6] = true if PacketFu::IPv6Packet.can_parse?(packet)
       p = classes.detect { |pclass| pclass.can_parse?(packet) }.new(new_args)
       parsed_packet = p.read(packet,args)
     end

data/lib/packetfu/protos/eth/header.rb

@@ -6,24 +6,24 @@ module PacketFu
   #
   # ==== Header Definition
   #
-  #  Fixnum   :b0
-  #  Fixnum   :b1
-  #  Fixnum   :b2
-  #  Fixnum   :b3
-  #  Fixnum   :b4
-  #  Fixnum   :b5
-  #  Fixnum   :local
-  #  Fixnum   :multicast
+  #  Integer  :b0
+  #  Integer  :b1
+  #  Integer  :b2
+  #  Integer  :b3
+  #  Integer  :b4
+  #  Integer  :b5
+  #  Integer  :local
+  #  Integer  :multicast
   #  Int16    :oui,       Default: 0x1ac5 :)
   class EthOui < Struct.new(:b5, :b4, :b3, :b2, :b1, :b0, :local, :multicast, :oui)
 
     # EthOui is unusual in that the bit values do not enjoy StructFu typing.
     def initialize(args={})
-      args[:local] ||= 0 
+      args[:local] ||= 0
       args[:oui] ||= 0x1ac # :)
-      args.each_pair {|k,v| args[k] = 0 unless v} 
-      super(args[:b5], args[:b4], args[:b3], args[:b2], 
-            args[:b1], args[:b0], args[:local], args[:multicast], 
+      args.each_pair {|k,v| args[k] = 0 unless v}
+      super(args[:b5], args[:b4], args[:b3], args[:b2],
+            args[:b1], args[:b0], args[:local], args[:multicast],
             args[:oui])
     end
 
@@ -68,15 +68,15 @@ module PacketFu
   #
   # ==== Header Definition
   #
-  #  Fixnum :n1
-  #  Fixnum :n2
-  #  Fixnum :n3
+  #  Integer:n1
+  #  Integer:n2
+  #  Integer:n3
   #
   class EthNic < Struct.new(:n0, :n1, :n2)
 
     # EthNic does not enjoy StructFu typing.
     def initialize(args={})
-      args.each_pair {|k,v| args[k] = 0 unless v} 
+      args.each_pair {|k,v| args[k] = 0 unless v}
       super(args[:n0], args[:n1], args[:n2])
     end
 
@@ -84,7 +84,7 @@ module PacketFu
     def to_s
       [n0,n1,n2].map {|x| x.to_i}.pack("C3")
     end
-    
+
     # Reads a string to populate the object.
     def read(str)
       force_binary(str)
@@ -125,11 +125,11 @@ module PacketFu
 
   end
 
-  # EthHeader is a complete Ethernet struct, used in EthPacket. 
-  # It's the base header for all other protocols, such as IPHeader, 
-  # TCPHeader, etc. 
+  # EthHeader is a complete Ethernet struct, used in EthPacket.
+  # It's the base header for all other protocols, such as IPHeader,
+  # TCPHeader, etc.
   #
-  # For more on the construction on MAC addresses, see 
+  # For more on the construction on MAC addresses, see
   # http://en.wikipedia.org/wiki/MAC_address
   #
   # TODO: Need to come up with a good way of dealing with vlan
@@ -185,7 +185,7 @@ module PacketFu
       self
     end
 
-    # Converts a readable MAC (11:22:33:44:55:66) to a binary string. 
+    # Converts a readable MAC (11:22:33:44:55:66) to a binary string.
     # Readable MAC's may be split on colons, dots, spaces, or underscores.
     #
     # irb> PacketFu::EthHeader.mac2str("11:22:33:44:55:66")
@@ -200,7 +200,7 @@ module PacketFu
       return ret
     end
 
-    # Converts a binary string to a readable MAC (11:22:33:44:55:66). 
+    # Converts a binary string to a readable MAC (11:22:33:44:55:66).
     #
     # irb> PacketFu::EthHeader.str2mac("\x11\x22\x33\x44\x55\x66")
     #
@@ -218,7 +218,7 @@ module PacketFu
       self[:eth_src]
     end
 
-    # Gets the source MAC address in a more readable way. 
+    # Gets the source MAC address in a more readable way.
     def eth_saddr
       EthHeader.str2mac(self[:eth_src].to_s)
     end
@@ -230,7 +230,7 @@ module PacketFu
       self[:eth_dst]
     end
 
-    # Gets the destination MAC address in a more readable way. 
+    # Gets the destination MAC address in a more readable way.
     def eth_daddr
       EthHeader.str2mac(self[:eth_dst].to_s)
     end

data/lib/packetfu/protos/ip/header.rb

@@ -10,7 +10,7 @@ module PacketFu
   class Octets < Struct.new(:ip_addr)
     include StructFu
 
-    IPV4_RE = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/                                                                                                                                                                                        
+    IPV4_RE = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/
     def initialize(args={})
       super(
       Int32.new(args[:ip_addr]))
@@ -46,7 +46,7 @@ module PacketFu
       match = IPV4_RE.match(str)
       if match.nil?
         raise ArgumentError.new("str is not a valid IPV4 address")
-      end 
+      end
         a = match[1].to_i
         b = match[2].to_i
         c = match[3].to_i
@@ -57,7 +57,7 @@ module PacketFu
               d >= 0 && d <= 255)
         raise ArgumentError.new("str is not a valid IPV4 address")
       end
-      
+
       self[:ip_addr].value = (a<<24) + (b<<16) + (c<<8) + d
       self
     end
@@ -65,7 +65,7 @@ module PacketFu
     # Returns the IP address as 4 octets
     def octets
       addr = self.to_i
-      [ 
+      [
         ((addr >> 24) & 0xff),
         ((addr >> 16) & 0xff),
         ((addr >> 8) & 0xff),
@@ -101,21 +101,21 @@ module PacketFu
   #
   # ==== Header Definition
   #
-  #   Fixnum (4 bits)  :ip_v,     Default: 4
-  #   Fixnum (4 bits)  :ip_hl,    Default: 5
+  #   Integer (4 bits) :ip_v,     Default: 4
+  #   Integer (4 bits) :ip_hl,    Default: 5
   #   Int8             :ip_tos,   Default: 0           # TODO: Break out the bits
-  #   Int16            :ip_len,   Default: calculated 
-  #   Int16            :ip_id,    Default: calculated  # IRL, hardly random. 
+  #   Int16            :ip_len,   Default: calculated
+  #   Int16            :ip_id,    Default: calculated  # IRL, hardly random.
   #   Int16            :ip_frag,  Default: 0           # TODO: Break out the bits
   #   Int8             :ip_ttl,   Default: 0xff        # Changes per flavor
   #   Int8             :ip_proto, Default: 0x01        # TCP: 0x06, UDP 0x11, ICMP 0x01
-  #   Int16            :ip_sum,   Default: calculated 
-  #   Octets           :ip_src                       
-  #   Octets           :ip_dst                      
+  #   Int16            :ip_sum,   Default: calculated
+  #   Octets           :ip_src
+  #   Octets           :ip_dst
   #   String           :body
   #
-  # Note that IPPackets will always be somewhat incorrect upon initalization, 
-  # and want an IPHeader#recalc() to become correct before a 
+  # Note that IPPackets will always be somewhat incorrect upon initalization,
+  # and want an IPHeader#recalc() to become correct before a
   # Packet#to_f or Packet#to_w.
   class IPHeader < Struct.new(:ip_v, :ip_hl, :ip_tos, :ip_len,
                               :ip_id, :ip_frag, :ip_ttl, :ip_proto,
@@ -233,7 +233,7 @@ module PacketFu
       (ip_hl * 4) + body.to_s.length
     end
 
-    # Return the claimed header length 
+    # Return the claimed header length
     def ip_hlen
       (ip_hl * 4)
     end
@@ -250,7 +250,7 @@ module PacketFu
       checksum += (self.ip_src & 0xffff)
       checksum += (self.ip_dst >> 16)
       checksum += (self.ip_dst & 0xffff)
-      checksum = checksum % 0xffff 
+      checksum = checksum % 0xffff
       checksum = 0xffff - checksum
       checksum == 0 ? 0xffff : checksum
     end
@@ -260,14 +260,14 @@ module PacketFu
       @random_id
     end
 
-    # Sets a more readable IP address. If you wants to manipulate individual octets, 
-    # (eg, for host scanning in one network), it would be better use ip_src.o1 through 
-    # ip_src.o4 instead. 
+    # Sets a more readable IP address. If you wants to manipulate individual octets,
+    # (eg, for host scanning in one network), it would be better use ip_src.o1 through
+    # ip_src.o4 instead.
     def ip_saddr=(addr)
       self[:ip_src].read_quad(addr)
     end
 
-    # Returns a more readable IP source address. 
+    # Returns a more readable IP source address.
     def ip_saddr
       self[:ip_src].to_x
     end
@@ -286,11 +286,9 @@ module PacketFu
     def self.octet_array(addr)
       if addr.class == String
         oa = addr.split('.').collect {|x| x.to_i}
-      elsif addr.class == Fixnum
-        oa = IPAddr.new(addr, Socket::AF_INET).to_s.split('.')
-      elsif addr.class == Bignum
+      elsif addr.kind_of? Integer
         oa = IPAddr.new(addr, Socket::AF_INET).to_s.split('.')
-      elsif addr.class == Array
+      elsif addr.kind_of? Array
         oa = addr
       else
         raise ArgumentError, "IP Address should be a dotted quad string, an array of ints, or a bignum"
@@ -298,9 +296,9 @@ module PacketFu
     end
 
     # Recalculate the calculated IP fields. Valid arguments are:
-    #   :all 
-    #   :ip_len 
-    #   :ip_sum 
+    #   :all
+    #   :ip_len
+    #   :ip_sum
     #   :ip_id
     def ip_recalc(arg=:all)
       case arg

data/lib/packetfu/protos/ipv6/header.rb

@@ -32,7 +32,7 @@ module PacketFu
       (a1.to_i << 96) + (a2.to_i << 64) + (a3.to_i << 32) + a4.to_i
     end
 
-    # Returns the address as a colon-delimited hex string. 
+    # Returns the address as a colon-delimited hex string.
     def to_x
       IPAddr.new(self.to_i, Socket::AF_INET6).to_s
     end
@@ -60,13 +60,13 @@ module PacketFu
 
   end
 
-  # IPv6Header is complete IPv6 struct, used in IPv6Packet. 
+  # IPv6Header is complete IPv6 struct, used in IPv6Packet.
   #
   # ==== Header Definition
   #
-  #  Fixnum (4 bits)   :ipv6_v      Default: 6     # Versiom
-  #  Fixnum (8 bits)   :ipv6_class  Defualt: 0     # Class
-  #  Fixnum (20 bits)  :ipv6_label  Defualt: 0     # Label
+  #  Integer(4 bits)   :ipv6_v      Default: 6     # Versiom
+  #  Integer(8 bits)   :ipv6_class  Defualt: 0     # Class
+  #  Integer(20 bits)  :ipv6_label  Defualt: 0     # Label
   #  Int16             :ipv6_len    Default: calc  # Payload length
   #  Int8              :ipv6_next                  # Next Header
   #  Int8              :ipv6_hop    Default: 0xff  # Hop limit
@@ -116,9 +116,9 @@ module PacketFu
       self
     end
 
-    # Setter for the version (usually, 6). 
+    # Setter for the version (usually, 6).
     def ipv6_v=(i); self[:ip_v] = i.to_i; end
-    # Getter for the version (usually, 6). 
+    # Getter for the version (usually, 6).
     def ipv6_v; self[:ipv6_v].to_i; end
     # Setter for the traffic class.
     def ipv6_class=(i); self[:ip_class] = i.to_i; end
@@ -164,22 +164,22 @@ module PacketFu
       end
     end
 
-    # Get the source address in a more readable form. 
+    # Get the source address in a more readable form.
     def ipv6_saddr
       self[:ipv6_src].to_x
     end
 
-    # Set the source address in a more readable form. 
+    # Set the source address in a more readable form.
     def ipv6_saddr=(str)
       self[:ipv6_src].read_x(str)
     end
 
-    # Get the destination address in a more readable form. 
+    # Get the destination address in a more readable form.
     def ipv6_daddr
       self[:ipv6_dst].to_x
     end
 
-    # Set the destination address in a more readable form. 
+    # Set the destination address in a more readable form.
     def ipv6_daddr=(str)
       self[:ipv6_dst].read_x(str)
     end

data/lib/packetfu/protos/tcp/ecn.rb

@@ -5,9 +5,9 @@ module PacketFu
   # ==== Header Definition
   #
   #
-  #  Fixnum (1 bit)  :n
-  #  Fixnum (1 bit)  :c
-  #  Fixnum (1 bit)  :e
+  #  Integer(1 bit)  :n
+  #  Integer(1 bit)  :c
+  #  Integer(1 bit)  :e
   class TcpEcn < Struct.new(:n, :c, :e)
 
     include StructFu

data/lib/packetfu/protos/tcp/flags.rb

@@ -4,12 +4,12 @@ module PacketFu
   #
   # ==== Header Definition
   #
-  #  Fixnum (1 bit)  :urg
-  #  Fixnum (1 bit)  :ack
-  #  Fixnum (1 bit)  :psh
-  #  Fixnum (1 bit)  :rst
-  #  Fixnum (1 bit)  :syn
-  #  Fixnum (1 bit)  :fin
+  #  Integer(1 bit)  :urg
+  #  Integer(1 bit)  :ack
+  #  Integer(1 bit)  :psh
+  #  Integer(1 bit)  :rst
+  #  Integer(1 bit)  :syn
+  #  Integer(1 bit)  :fin
   #
   # Flags can typically be set by setting them either to 1 or 0, or to true or false.
   class TcpFlags < Struct.new(:urg, :ack, :psh, :rst, :syn, :fin)
@@ -23,11 +23,11 @@ module PacketFu
         super( 0, 0, 0, 0, 0, 0)
       else
         super(
-          (args[:urg] ? 1 : 0), 
-          (args[:ack] ? 1 : 0), 
-          (args[:psh] ? 1 : 0), 
-          (args[:rst] ? 1 : 0), 
-          (args[:syn] ? 1 : 0), 
+          (args[:urg] ? 1 : 0),
+          (args[:ack] ? 1 : 0),
+          (args[:psh] ? 1 : 0),
+          (args[:rst] ? 1 : 0),
+          (args[:syn] ? 1 : 0),
           (args[:fin] ? 1 : 0)
         )
       end
@@ -36,7 +36,7 @@ module PacketFu
     # Returns the TcpFlags as an integer.
     # Also not a great candidate for to_s due to the short bitspace.
     def to_i
-      (urg.to_i << 5) + (ack.to_i << 4) + (psh.to_i << 3) + 
+      (urg.to_i << 5) + (ack.to_i << 4) + (psh.to_i << 3) +
       (rst.to_i << 2) + (syn.to_i << 1) + fin.to_i
     end
 

data/lib/packetfu/protos/tcp/hlen.rb

@@ -4,7 +4,7 @@ module PacketFu
   #
   # ==== Header Definition
   #
-  #   Fixnum (4 bits)  :hlen
+  #   Integer(4 bits)  :hlen
   class TcpHlen < Struct.new(:hlen)
     
     include StructFu

data/lib/packetfu/protos/tcp/reserved.rb

@@ -5,9 +5,9 @@ module PacketFu
   # ==== Header Definition
   #
   #
-  #  Fixnum (1 bit)  :r1
-  #  Fixnum (1 bit)  :r2
-  #  Fixnum (1 bit)  :r3
+  #  Integer(1 bit)  :r1
+  #  Integer(1 bit)  :r2
+  #  Integer(1 bit)  :r3
   class TcpReserved < Struct.new(:r1, :r2, :r3)
 
     include StructFu

data/lib/packetfu/structfu.rb

@@ -1,9 +1,9 @@
 # -*- coding: binary -*-
 # StructFu, a nifty way to leverage Ruby's built in Struct class
-# to create meaningful binary data. 
+# to create meaningful binary data.
 
 module StructFu
-  
+
   # Normally, self.size and self.length will refer to the Struct
   # size as an array. It's a hassle to redefine, so this introduces some
   # shorthand to get at the size of the resultant string.
@@ -15,7 +15,7 @@ module StructFu
 
   # Typecast is used mostly by packet header classes, such as IPHeader,
   # TCPHeader, and the like. It takes an argument, and casts it to the
-  # expected type for that element. 
+  # expected type for that element.
   def typecast(i)
     c = caller[0].match(/.*`([^']+)='/)[1]
     self[c.intern].read i
@@ -45,17 +45,17 @@ module StructFu
 
   # Ints all have a value, an endianness, and a default value.
   # Note that the signedness of Int values are implicit as
-  # far as the subclasses are concerned; to_i and to_f will 
+  # far as the subclasses are concerned; to_i and to_f will
   # return Integer/Float versions of the input value, instead
   # of attempting to unpack the pack value. (This can be a useful
   # hint to other functions).
   #
   # ==== Header Definition
   #
-  #   Fixnum  :value
+  #   Integer :value
   #   Symbol  :endian
-  #   Fixnum  :width
-  #   Fixnum  :default
+  #   Integer :width
+  #   Integer :default
   class Int < Struct.new(:value, :endian, :width, :default)
     alias :v= :value=
     alias :v :value
@@ -80,7 +80,7 @@ module StructFu
     def to_f
       (self.v || self.d).to_f
     end
-    
+
     def initialize(value=nil, endian=nil, width=nil, default=nil)
       super(value,endian,width,default=0)
     end
@@ -122,7 +122,7 @@ module StructFu
      end
 
   end
-  
+
   # Int16be is a two byte value in big-endian format. The endianness cannot be altered.
   class Int16be < Int16
     undef :endian=
@@ -204,7 +204,7 @@ module StructFu
 
   # Provides a primitive for creating strings, preceeded by
   # an Int type of length. By default, a string of length zero with
-  # a one-byte length is presumed.  
+  # a one-byte length is presumed.
   #
   # Note that IntStrings aren't used for much, but it seemed like a good idea at the time.
   class IntString < Struct.new(:int, :string, :mode)
@@ -240,7 +240,7 @@ module StructFu
     # is calculated upon assignment. If you'd prefer to have
     # an incorrect value, use the syntax, obj[:string]="value"
     # instead. Note, by using the alternate form, you must
-    # #calc before you can trust the int's value. Think of the = 
+    # #calc before you can trust the int's value. Think of the =
     # assignment as "set to equal," while the []= assignment
     # as "boxing in" the value. Maybe.
     def string=(s)
@@ -277,10 +277,10 @@ module StructFu
     # based on the declared length, or the actual length. Which strategy
     # is used is dependant on which :mode is set (with self.mode).
     #
-    # :parse : Read the length, and then read in that many bytes of the string. 
+    # :parse : Read the length, and then read in that many bytes of the string.
     # The string may be truncated or padded out with nulls, as dictated by the value.
     #
-    # :fix   : Skip the length, read the rest of the string, then set the length 
+    # :fix   : Skip the length, read the rest of the string, then set the length
     # to what it ought to be.
     #
     # else   : If neither of these modes are set, just perfom a normal read().
@@ -289,7 +289,7 @@ module StructFu
       unless s[0,int.width].size == int.width
         raise StandardError, "String is too short for type #{int.class}"
       else
-        case mode 
+        case mode
         when :parse
           int.read(s[0,int.width])
           self[:string] = s[int.width,int.value]

data/lib/packetfu/version.rb

@@ -2,7 +2,7 @@
 module PacketFu
 
   # Check the repo's for version release histories
-  VERSION = "1.1.12.pre"
+  VERSION = "1.1.12"
 
   # Returns PacketFu::VERSION
   def self.version

data/packetfu.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split($/)
   s.license     = 'BSD'
   s.required_ruby_version = '>= 2.1.0'
-  s.add_dependency('pcaprub', '~> 0.12')
-  s.add_development_dependency('rake', '~> 10.3')
-  s.add_development_dependency('rspec', '~> 3.0')
-  s.add_development_dependency('rspec-its', '~> 1.2')
-  s.add_development_dependency('sdoc', '~> 0.4.1')
+  s.add_dependency('pcaprub')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec-its')
+  s.add_development_dependency('sdoc')
   s.add_development_dependency('pry')
   s.add_development_dependency('coveralls')
 

data/spec/arp_spec.rb

@@ -17,7 +17,7 @@ describe ARPHeader do
     it "should have the correct classes for initialization values" do
       expect(@arp_header).to be_kind_of(ARPHeader)
       expect(@arp_header[:arp_hw]).to be_kind_of(StructFu::Int16)
-      expect(@arp_header.arp_hw).to be_kind_of(Fixnum)
+      expect(@arp_header.arp_hw).to be_kind_of(Integer)
       expect(@arp_header[:arp_src_ip]).to be_kind_of(Octets)
       expect(@arp_header.arp_src_ip).to be_kind_of(String)
       expect(@arp_header[:arp_dst_mac]).to be_kind_of(EthMac)

data/spec/ip_spec.rb

@@ -17,7 +17,7 @@ describe IPHeader do
       expect(@ip_header.ip_hl).to eql(5)
       expect(@ip_header.ip_tos).to eql(0)
       expect(@ip_header.ip_len).to eql(20)
-      expect(@ip_header.ip_id).to be_kind_of(Fixnum)
+      expect(@ip_header.ip_id).to be_kind_of(Integer)
       expect(@ip_header.ip_frag).to eql(0)
       expect(@ip_header.ip_proto).to eql(0)
       expect(@ip_header.ip_sum).to eql(65535)
@@ -39,7 +39,7 @@ describe IPPacket do
       expect(@ip_packet.ip_hl).to eql(5)
       expect(@ip_packet.ip_tos).to eql(0)
       expect(@ip_packet.ip_len).to eql(20)
-      expect(@ip_packet.ip_id).to be_kind_of(Fixnum)
+      expect(@ip_packet.ip_id).to be_kind_of(Integer)
       expect(@ip_packet.ip_frag).to eql(0)
       expect(@ip_packet.ip_proto).to eql(0)
       expect(@ip_packet.ip_sum).to eql(65535)

data/spec/packetfu_spec.rb

@@ -7,7 +7,7 @@ require 'fake_packets'
 
 describe PacketFu, "version information" do
   it "reports a version number" do
-    PacketFu::VERSION.should match /^1\.[0-9]+\.[0-9]+$/
+    PacketFu::VERSION.should match /^1\.[0-9]+\.[0-9]+(.pre)?$/
   end
   its(:version) {should eq PacketFu::VERSION}
 

metadata

@@ -1,86 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: packetfu
 version: !ruby/object:Gem::Version
-  version: 1.1.12.pre
+  version: 1.1.12
 platform: ruby
 authors:
 - Tod Beardsley
 - Jonathan Claudius
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQ0wCwYDVQQDDAR0b2Ri
+  MRgwFgYKCZImiZPyLGQBGRYIcGFja2V0ZnUxEzARBgoJkiaJk/IsZAEZFgNjb20w
+  HhcNMTcwMjAzMTc1MjAyWhcNMTgwMjAzMTc1MjAyWjA+MQ0wCwYDVQQDDAR0b2Ri
+  MRgwFgYKCZImiZPyLGQBGRYIcGFja2V0ZnUxEzARBgoJkiaJk/IsZAEZFgNjb20w
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDig9ogvD2veEAEcmJt92br
+  5RhDcUv6VobqIazGJKdXhEYU6wk1353IxEfRTEWOwSKlFjJqwuV/Bm+jmZktoTQV
+  ry8IZAfTxdHBSyWiXBGgg5UA3QS5ZH8gJIv7z9YQLWy8XORo76Xjpt0tr33z5+TU
+  8N3hh0ede6CAlM+TtCPJ6/GYvusJ1ThKjTWKMftllBFwFkbxMjrla6tfFu02tw/D
+  bIeaC9kLliH+3exUzVDRqXZjHaD4edUPAId1QiFpLOgQBtqMCSm2aN3Cwdtb/4rc
+  7NSF7js+i+tgeAqNWogimx7P0/SKjE+UJ+qj7PK4bvPDqOxCwBprVzeQACQd/wNJ
+  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBS0hsMH
+  SbakJkxOU8dncu6xO+S/6zAcBgNVHREEFTATgRF0b2RiQHBhY2tldGZ1LmNvbTAc
+  BgNVHRIEFTATgRF0b2RiQHBhY2tldGZ1LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEA
+  JuFlw48r9fmUML3z9e82Ldx+zh8Y5ry6Pf/fgacLpP9fpn62Dc/lZlCE6jYAyHo1
+  hK40RP+CJAm/6pGfCX66nX3+CTWQimZLRMpaBoAvSFEZ6ksBqXnzFH0YZlJccTxe
+  FIyxZQgxjsXfAbmkFfSh8zGGN0Yk1TSjnS54b9sQpmmopRShM2nMFimu6381SmLU
+  LZVT1SzAMqjK5HKaFwBwmb9i+vPycblrL8ngjSg4TWqMt4PLXOTvyiCy2IQRXb+o
+  aNODmav4FDa8Yham3QhPACahVVxZczCpbDHFvojjk127uca93t3gc2IGx1jYO0mv
+  bGMb9KcX7MTVhg4J4u5k6A==
+  -----END CERTIFICATE-----
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pcaprub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -152,9 +174,11 @@ files:
 - examples/oui.txt
 - examples/packetfu-shell.rb
 - examples/pcap2pcapng.rb
+- examples/ping.rb
 - examples/simple-sniffer.rb
 - examples/simple-stats.rb
 - examples/slammer.rb
+- examples/tcp_handshake.rb
 - examples/uniqpcap.rb
 - gem-public_cert.pem
 - lib/packetfu.rb
@@ -376,12 +400,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: packetfu
-rubygems_version: 2.6.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: PacketFu is a mid-level packet manipulation library.