Missed one file from dfilter-test.py

Updated license in ancient tool.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52137 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/tools/dftestlib/tvb.py b/tools/dftestlib/tvb.py
new file mode 100644 (file)
index 0000000..872f56e
--- /dev/null
+++ b/tools/dftestlib/tvb.py
@@ -0,0 +1,58 @@
+# Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
+
+import unittest
+from dftestlib import dftest
+
+class testTVB(dftest.DFTest):
+    trace_file = "http.cap"
+
+    def test_eq_1(self):
+        # We expect 0 because even though this byte
+        # string matches the 'eth' protocol, protocols cannot
+        # work in an '==' comparison yet.
+        dfilter = "eth == 00:e0:81:00:b0:28:00:09:6b:88:f6:c9:08:00"
+        self.assertDFilterCount(dfilter, 0)
+
+    def test_slice_1(self):
+        dfilter = "ip[0:2] == 45:00"
+        self.assertDFilterCount(dfilter, 1)
+
+    def test_slice_2(self):
+        dfilter = "ip[0:2] == 00:00"
+        self.assertDFilterCount(dfilter, 0)
+
+    def test_slice_3(self):
+        dfilter = "ip[2:2] == 00:c1"
+        self.assertDFilterCount(dfilter, 1)
+
+    @unittest.skip("This doesn't work yet in Wireshark")
+    def test_slice_4(self):
+        dfilter = "ip[-5] == 0x86"
+        self.assertDFilterCount(dfilter, 0)
+
+    @unittest.skip("This doesn't work yet in Wireshark")
+    def test_slice_5(self):
+        dfilter = "ip[-1] == 0x86"
+        self.assertDFilterCount(dfilter, 1)
+
+    def test_contains_1(self):
+        dfilter = "eth contains 6b"
+        self.assertDFilterCount(dfilter, 1)
+
+    def test_contains_2(self):
+        dfilter = "eth contains 09:6b:88"
+        self.assertDFilterCount(dfilter, 1)
+
+    def test_contains_3(self):
+        dfilter = "eth contains 00:e0:81:00:b0:28:00:09:6b:88:f5:c9:08:00"
+        self.assertDFilterCount(dfilter, 1)
+
+    def test_contains_4(self):
+        dfilter = "eth contains ff:ff:ff"
+        self.assertDFilterCount(dfilter, 0)
+
+    def test_contains_5(self):
+        dfilter = 'http contains "HEAD"'
+        self.assertDFilterCount(dfilter, 1)
+
+

diff --git a/tools/pkt-from-core.py b/tools/pkt-from-core.py
index 9cd996f6890d6849c0b009cd80542d357d8b0343..58934f4ffcf52293115766386b11f94b171c1d63 100755 (executable)
--- a/tools/pkt-from-core.py
+++ b/tools/pkt-from-core.py
@@ -4,6 +4,25 @@ Retrieve a packet from a wireshark/tshark core file
 and save it in a packet-capture file.
 """
 
+#
+# $Id$
+#
+# Copyright (C) 2013 by Gilbert Ramirez <gram@alumni.rice.edu>
+#  
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 import getopt
 import os
 import re