[Gd-chatter] r11605 - trunk/libraries/protocols

[hannes at gwydiondylan.org]

Author: hannes
Date: Fri Jan  4 06:37:48 2008
New Revision: 11605

Modified:
   trunk/libraries/protocols/ieee80211.dylan
   trunk/libraries/protocols/logical-link.dylan
Log:
Job: 7299
some more fixes to see actual data in data frames


Modified: trunk/libraries/protocols/ieee80211.dylan
==============================================================================
--- trunk/libraries/protocols/ieee80211.dylan	(original)
+++ trunk/libraries/protocols/ieee80211.dylan	Fri Jan  4 06:37:48 2008
@@ -336,7 +336,7 @@
       select (frame.frame-control.subtype)
         // XXX: split up (inheritance)
         $data, $data-cf-ack, $data-cf-poll, $data-cf-ack-cf-poll
-          => <ieee80211-data>;
+          => <link-control>;
         $data-null-function, $cf-poll-no-data, $cf-ack-no-data, $cf-ack-cf-poll-no-data
           => <ieee80211-null-function>;
           otherwise signal(make(<malformed-packet-error>));
@@ -348,10 +348,12 @@
   field no-data :: <raw-frame> = $empty-raw-frame; // there should be no data
 end;
 
-define protocol ieee80211-data (container-frame)
+/*
+define protocol ieee80211-data (header-frame)
   summary "%s", compose(summary, payload);
-  field actual-data :: <link-control>;
+  field payload :: <link-control>;
 end;
+*/
 
 // ieee80211 control frames
 define protocol ieee80211-control-frame (ieee80211-frame)

Modified: trunk/libraries/protocols/logical-link.dylan
==============================================================================
--- trunk/libraries/protocols/logical-link.dylan	(original)
+++ trunk/libraries/protocols/logical-link.dylan	Fri Jan  4 06:37:48 2008
@@ -7,7 +7,7 @@
   field ssap :: <unsigned-byte>;
   field control :: <unsigned-byte>;
   field organisation-code :: <3byte-big-endian-unsigned-integer>;
-  field type-code :: <2byte-big-endian-unsigned-integer>;
+  layering field type-code :: <2byte-big-endian-unsigned-integer>;
   variably-typed-field payload,
     type-function: payload-type(frame);
 end;