[Gd-chatter] r10856 - trunk/libraries/network-flow

[hannes at gwydiondylan.org]

Author: hannes
Date: Mon Aug 21 16:00:32 2006
New Revision: 10856

Modified:
   trunk/libraries/network-flow/network-flow.dylan
Log:
Bug: 7299
*fix <pcap-file-reader> to just send payload of pcap-packet

Modified: trunk/libraries/network-flow/network-flow.dylan
==============================================================================
--- trunk/libraries/network-flow/network-flow.dylan	(original)
+++ trunk/libraries/network-flow/network-flow.dylan	Mon Aug 21 16:00:32 2006
@@ -144,25 +144,8 @@
 define method toplevel (reader :: <pcap-file-reader>)
   let file = as(<byte-vector>, stream-contents(reader.file-stream));
   let pcap-file = make(unparsed-class(<pcap-file>), packet: file);
-  //  push-data(reader.the-output, pcap-file.header);
-  let push-out = select (get-frame-field(#"linktype", pcap-file.header).value)
-                   $DLT-EN10MB =>
-                     method (r, f)
-                       push-data(r.the-output,
-                                 make(unparsed-class(<ethernet-frame>),
-                                      packet: assemble-frame(f.payload),
-                                      parent: f));
-                     end method;
-                   $DLT-PRISM-HEADER =>
-                     method (r, f)
-                       push-data(r.the-output,
-                                 make(unparsed-class(<prism2-frame>),
-                                      packet: assemble-frame(f.payload),
-                                      parent: f));
-                     end method;
-                 end select;
   for(frame in pcap-file.packets)
-    push-out(reader, frame);
+    push-data(reader.the-output, payload(frame));
   end;
 end;