Adapt to new binary-data defaults of the type-function of variably-ty…

…ped-fields
dylan-hackers · Jan 19, 2014 · d546b28 · d546b28
1 parent deea070
commit d546b28
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 28 deletions.
diff --git a/ext/binary-data b/ext/binary-data
diff --git a/protocols/ethernet.dylan b/protocols/ethernet.dylan
@@ -59,7 +59,7 @@ define binary-data <ethernet-frame> (<header-frame>)
   layering field type-code :: <2byte-big-endian-unsigned-integer>;
   variably-typed field payload,
     type-function: if (frame.type-code > 1500)
-                     payload-type(frame)
+                     frame.payload-type
                    else
                      <llc-frame>
                    end;
@@ -82,8 +82,7 @@ end;
 define binary-data <snap-frame> (<header-frame>)
   field organization-code :: <3byte-big-endian-unsigned-integer> = 0;
   layering field type-code :: <2byte-big-endian-unsigned-integer>;
-  variably-typed field payload,
-    type-function: lookup-layer(<ethernet-frame>, frame.type-code) | <raw-frame>;
+  variably-typed field payload;
 end;
 
 define binary-data <vlan-tag> (<header-frame>)
@@ -93,7 +92,7 @@ define binary-data <vlan-tag> (<header-frame>)
   field canonical-format-indicator :: <1bit-unsigned-integer> = 0;
   field vlan-id :: <12bit-unsigned-integer>;
   layering field type-code :: <2byte-big-endian-unsigned-integer>;
-  variably-typed field payload, type-function: frame.payload-type;
+  variably-typed field payload;
 end;
 
 define method source-address (frame :: <vlan-tag>) => (res :: <mac-address>)

diff --git a/protocols/hdlc.dylan b/protocols/hdlc.dylan
@@ -12,8 +12,7 @@ define binary-data <cisco-hdlc-frame> (<header-frame>)
                 #x8f <=> #"multicast" };
   field control :: <unsigned-byte> = 0;
   layering field protocol :: <2byte-big-endian-unsigned-integer> = #x800;
-  variably-typed field payload,
-    type-function: payload-type(frame);
+  variably-typed field payload;
 end;
 
 // Serial Line Address Resolution Protocol

diff --git a/protocols/ipv4.dylan b/protocols/ipv4.dylan
@@ -81,8 +81,7 @@ define binary-data <ipv4-frame> (<header-frame>)
     reached-end?: instance?(frame, <end-of-option-ip-option>);
   variably-typed field payload,
     start: frame.header-length * 4 * 8,
-    end: frame.total-length * 8,
-    type-function: payload-type(frame);
+    end: frame.total-length * 8;
 end;
 
 
@@ -97,25 +96,19 @@ define binary-data <udp-frame> (<header-frame>)
   field checksum :: <2byte-big-endian-unsigned-integer> = 0;
   variably-typed field payload,
     end: frame.payload-size * 8,
-    type-function: my-payload-type(frame);
+    type-function:
+      lookup-layer(frame.object-class, frame.layer-magic) |
+        lookup-layer(frame.object-class, frame.source-port) |
+          <raw-frame>
 end;
 
-define function my-payload-type (frame :: <udp-frame>)
-  let res = payload-type(frame);
-  if (res == <raw-frame>)
-    lookup-layer(frame.object-class, frame.source-port) | <raw-frame>;
-  else
-    res;
-  end;
-end;
-
 define binary-data <arp-frame> (<container-frame>)
   over <ethernet-frame> #x806;
   over <link-control> #x806;
   field mac-address-type :: <2byte-big-endian-unsigned-integer> = 1;
   field protocol-address-type :: <2byte-big-endian-unsigned-integer> = #x800;
   field mac-address-size :: <unsigned-byte> = byte-offset(field-size(<mac-address>));
-  field protocol-address-size :: <unsigned-byte> 
+  field protocol-address-size :: <unsigned-byte>
     = byte-offset(field-size(<ipv4-address>));
   enum field operation :: <2byte-big-endian-unsigned-integer>,
     mappings: { #x1 <=> #"arp-request",

diff --git a/protocols/ipv6.dylan b/protocols/ipv6.dylan
@@ -62,9 +62,8 @@ define binary-data <ipv6-frame> (<header-frame>)
   field source-address :: <ipv6-address>;
   field destination-address :: <ipv6-address>;
   variably-typed field payload,
-    type-function: payload-type(frame),
     length: frame.payload-length * 8;
-end; 
+end;
 
 define binary-data <ipv6-extension-header> (<container-frame>)
   field option-type :: <unsigned-byte>;

diff --git a/protocols/logical-link.dylan b/protocols/logical-link.dylan
@@ -9,7 +9,6 @@ define binary-data <link-control> (<header-frame>)
   field control :: <unsigned-byte>;
   field organisation-code :: <3byte-big-endian-unsigned-integer>;
   layering field type-code :: <2byte-big-endian-unsigned-integer>;
-  variably-typed field payload,
-    type-function: payload-type(frame);
+  variably-typed field payload;
 end;
 
diff --git a/protocols/openpgp.dylan b/protocols/openpgp.dylan
@@ -8,7 +8,7 @@ define binary-data <multi-precision-integer> (<container-frame>)
   field mpi-length :: <2byte-big-endian-unsigned-integer>;
   field real-mpi :: <raw-frame>, length: byte-offset(frame.mpi-length + 7);
 end;
-  
+
 define binary-data <string-to-key> (<variably-typed-container-frame>)
   layering field type :: <unsigned-byte>;
   field hash-algorithm :: <hash-algorithm>;

diff --git a/protocols/pcap.dylan b/protocols/pcap.dylan
@@ -66,7 +66,7 @@ define binary-data <pcap-packet> (<header-frame>)
                      $DLT-EN10MB => <ethernet-frame>;
                      $DLT-C-HDLC => <cisco-hdlc-frame>;
                      $DLT-PRISM-HEADER => <prism2-frame>;
-                     $DLT-80211-BSD-RADIO => <bsd-80211-radio-frame>; 
+                     $DLT-80211-BSD-RADIO => <bsd-80211-radio-frame>;
                      otherwise => <raw-frame>;
                    end,
     length: frame.capture-length * 8;

diff --git a/protocols/ppp.dylan b/protocols/ppp.dylan
@@ -5,8 +5,7 @@ license: see license.txt in this distribution
 
 define binary-data <ppp> (<header-frame>)
   layering field protocol :: <2byte-big-endian-unsigned-integer>;
-  variably-typed field payload,
-    type-function: payload-type(frame);
+  variably-typed field payload;
 end;
 
 define abstract binary-data <link-control-protocol> (<variably-typed-container-frame>)
+8 −15		binary-data.dylan
+0 −56		documentation/source/efficiency.rst
+12 −12		documentation/source/index.rst
+56 −0		documentation/source/internals.rst
+966 −247		documentation/source/reference.rst
+205 −160		documentation/source/usage.rst
+6 −1		fields.dylan
+1 −55		leaf-frames.dylan
+1 −1		library.dylan