- release 2: radiotap.patch

Changed files:
    ferret.spec -> 1.2
    radiotap.patch -> 1.1

diff --git a/ferret.spec b/ferret.spec
index 923595af3f2601734dae533007455efb70f5a89e..6df597d21b9dfa30dc0e85cbf76423d9809f17f5 100644 (file)
--- a/ferret.spec
+++ b/ferret.spec
@@ -2,11 +2,12 @@ Summary:      FERRET - a broadcast analysis tool
 #Summary(pl.UTF-8):    -
 Name:          ferret
 Version:       1.1
 #Summary(pl.UTF-8):    -
 Name:          ferret
 Version:       1.1

-Release:       1
+Release:       2

 License:       "all rights reserved"
 Group:         Applications
 Source0:       http://www.erratasec.com/Ferret-1_1.zip
 # NoSource0-md5:       f9fbd4eb5eb178589584a59052b35d02
 License:       "all rights reserved"
 Group:         Applications
 Source0:       http://www.erratasec.com/Ferret-1_1.zip
 # NoSource0-md5:       f9fbd4eb5eb178589584a59052b35d02

+Patch0:                radiotap.patch

 URL:           http://www.erratasec.com/ferret.html
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 URL:           http://www.erratasec.com/ferret.html
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -21,6 +22,7 @@ network where that machine comes from.
 
 %prep
 %setup -q -n Ferret
 
 %prep
 %setup -q -n Ferret

+%patch0 -p1

 rm -rf bin/*/ bin/ferret tmp/*
 
 %build
 rm -rf bin/*/ bin/ferret tmp/*
 
 %build

diff --git a/radiotap.patch b/radiotap.patch
new file mode 100644 (file)
index 0000000..bfb9c4a
--- /dev/null
+++ b/radiotap.patch
@@ -0,0 +1,20 @@
+--- Ferret/src/parser/layer1.c.orig    2007-03-27 20:53:02.000000000 +0200
++++ Ferret/src/parser/layer1.c 2010-06-20 02:37:35.357468557 +0200
+@@ -116,6 +116,17 @@
+               }
+               break;
+ 
++      case 127: /* radiotap, DLT_IEEE802_11_RADIO */
++              {
++                      unsigned header_length = ex16le(px+2);
++                      if (header_length >= length) {
++                              FRAMERR(frame, "radiotap header too large: %d\n", header_length);
++                              return;
++                      }
++                      process_wifi_frame(ferret, frame, px+header_length, length-header_length);
++              }
++              break;
++
+       default:
+               FRAMERR(frame, "unknown linktype = %d (expected Ethernet or wifi)\n", frame->protocol);
+               break;