packetfu 1.1.5 → 1.1.6

data/test/test_tcp.rb

@@ -302,6 +302,16 @@ class TCPPacketTest < Test::Unit::TestCase
 		pkt.to_f('tcp_test.pcap','a')
 	end
 	
+	def test_tcp_read_strip
+		str = "e0f8472161a600254ba0760608004500004403554000400651d0c0a83207c0a832370224c1d22d94847f0b07c4ba8018ffff30ba00000101080a8731821433564b8c01027165000000000000200000000000".bin
+		str << "0102".bin # Tacking on a couple extra bites tht we'll strip off.
+		not_stripped = TCPPacket.new
+		not_stripped.read(str)
+		assert_equal 18, not_stripped.tcp_header.body.length
+		stripped = TCPPacket.new
+		stripped.read(str, :strip => true)
+		assert_equal 16, stripped.tcp_header.body.length
+	end
 end
 
 class TCPPacketTest < Test::Unit::TestCase

data/test/test_udp.rb

@@ -3,6 +3,12 @@ require 'test/unit'
 $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
 require 'packetfu'
 
+class String
+	def bin
+		self.scan(/../).map {|x| x.to_i(16).chr}.join
+	end
+end
+
 class UDPTest < Test::Unit::TestCase
 	include PacketFu
 
@@ -58,6 +64,17 @@ class UDPTest < Test::Unit::TestCase
 		pkt.to_f('udp_test.pcap','a')
 	end
 
+	def test_udp_read_strip
+		str = "01005e7ffffa100ba9eb63400800450000a12d7c0000011159b446a5fb7ceffffffacdf3076c008d516e4d2d534541524348202a20485454502f312e310d0a486f73743a3233392e3235352e3235352e3235303a313930300d0a53543a75726e3a736368656d61732d75706e702d6f72673a6465766963653a496e7465726e6574476174657761794465766963653a310d0a4d616e3a22737364703a646973636f766572220d0a4d583a330d0a0d0a".bin
+		str << "0102".bin # Tacking on a couple extra bites tht we'll strip off.
+		not_stripped = UDPPacket.new
+		not_stripped.read(str)
+		assert_equal 135, not_stripped.udp_header.body.length
+		stripped = UDPPacket.new
+		stripped.read(str, :strip => true)
+		assert_equal 133, stripped.udp_header.body.length
+	end
+
 	def test_udp_alter
 		sample_packet = PcapFile.new.file_to_array(:f => 'sample.pcap')[0]
 		pkt = Packet.parse(sample_packet)

metadata

@@ -1,65 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: packetfu
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.6
   prerelease: 
-  version: 1.1.5
 platform: ruby
-authors: 
+authors:
 - Tod Beardsley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pcaprub
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &12628060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *12628060
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &12627260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.6.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *12627260
+- !ruby/object:Gem::Dependency
+  name: sdoc
+  requirement: &12626240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :development
-  version_requirements: *id003
-description: PacketFu is a mid-level packet manipulation library for Ruby. With it, users can read, parse, and write network packets with the level of ease and fun they expect from Ruby. Note that this gem does not automatically require pcaprub, since users may install pcaprub through non-gem means.
-email: todb@planb-security.net
+  prerelease: false
+  version_requirements: *12626240
+description: PacketFu is a mid-level packet manipulation library for Ruby. With it,
+  users can read, parse, and write network packets with the level of ease and fun
+  they expect from Ruby. Note that this gem does not automatically require pcaprub,
+  since users may install pcaprub through non-gem means.
+email: todb@packetfu.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - .document
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - INSTALL.rdoc
 - LICENSE.txt
 - README.rdoc
+- bench/after-2012-07-28.txt
+- bench/before-2012-07-28.txt
+- bench/benchit.rb
+- bench/calc_delta.rb
+- bench/octets.rb
+- bench/octets_after.txt
+- bench/octets_after_refactor.txt
+- bench/octets_before.txt
 - examples/100kpackets.rb
 - examples/ackscan.rb
 - examples/arp.rb
@@ -84,14 +92,36 @@ files:
 - lib/packetfu/packet.rb
 - lib/packetfu/pcap.rb
 - lib/packetfu/protos/arp.rb
+- lib/packetfu/protos/arp/header.rb
+- lib/packetfu/protos/arp/mixin.rb
 - lib/packetfu/protos/eth.rb
+- lib/packetfu/protos/eth/header.rb
+- lib/packetfu/protos/eth/mixin.rb
 - lib/packetfu/protos/hsrp.rb
+- lib/packetfu/protos/hsrp/header.rb
+- lib/packetfu/protos/hsrp/mixin.rb
 - lib/packetfu/protos/icmp.rb
+- lib/packetfu/protos/icmp/header.rb
+- lib/packetfu/protos/icmp/mixin.rb
 - lib/packetfu/protos/invalid.rb
 - lib/packetfu/protos/ip.rb
+- lib/packetfu/protos/ip/header.rb
+- lib/packetfu/protos/ip/mixin.rb
 - lib/packetfu/protos/ipv6.rb
+- lib/packetfu/protos/ipv6/header.rb
+- lib/packetfu/protos/ipv6/mixin.rb
 - lib/packetfu/protos/tcp.rb
+- lib/packetfu/protos/tcp/ecn.rb
+- lib/packetfu/protos/tcp/flags.rb
+- lib/packetfu/protos/tcp/header.rb
+- lib/packetfu/protos/tcp/hlen.rb
+- lib/packetfu/protos/tcp/mixin.rb
+- lib/packetfu/protos/tcp/option.rb
+- lib/packetfu/protos/tcp/options.rb
+- lib/packetfu/protos/tcp/reserved.rb
 - lib/packetfu/protos/udp.rb
+- lib/packetfu/protos/udp/header.rb
+- lib/packetfu/protos/udp/mixin.rb
 - lib/packetfu/structfu.rb
 - lib/packetfu/utils.rb
 - lib/packetfu/version.rb
@@ -125,33 +155,31 @@ files:
 - test/test_udp.rb
 - test/vlan-pcapr.cap
 homepage: https://github.com/todb/packetfu
-licenses: 
+licenses:
 - BSD
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: packetfu
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: PacketFu is a mid-level packet manipulation library.
-test_files: 
+test_files:
 - test/test_arp.rb
 - test/test_eth.rb
 - test/test_hsrp.rb
@@ -166,3 +194,4 @@ test_files:
 - test/test_structfu.rb
 - test/test_tcp.rb
 - test/test_udp.rb
+has_rdoc: