Added bootstrap and uninstall target

[ocaml-bitstring.git] / examples / ipv4_header.ml

diff --git a/examples/ipv4_header.ml b/examples/ipv4_header.ml
index c5d6945..e47de03 100644 (file)
--- a/examples/ipv4_header.ml
+++ b/examples/ipv4_header.ml
@@ -1,20 +1,20 @@
 (* Parse and display an IPv4 header from a file.
- * $Id: ipv4_header.ml,v 1.1 2008-03-31 22:52:17 rjones Exp $
+ * $Id$
  *)
 
 open Printf
 
-let header = Bitmatch.bitstring_of_file "ipv4_header.dat"
+let header = Bitstring.bitstring_of_file "ipv4_header.dat"
 
 let () =
   bitmatch header with
-  | version : 4; hdrlen : 4; tos : 8; length : 16;
-    identification : 16; flags : 3; fragoffset : 13;
-    ttl : 8; protocol : 8; checksum : 16;
-    source : 32;
-    dest : 32;
-    options : (hdrlen-5)*32 : bitstring;
-    payload : -1 : bitstring
+  | { version : 4; hdrlen : 4; tos : 8; length : 16;
+      identification : 16; flags : 3; fragoffset : 13;
+      ttl : 8; protocol : 8; checksum : 16;
+      source : 32;
+      dest : 32;
+      options : (hdrlen-5)*32 : bitstring;
+      payload : -1 : bitstring }
       when version = 4 ->
 
     printf "IPv%d:\n" version;
@@ -29,50 +29,13 @@ let () =
     printf "  checksum: %d\n" checksum;
     printf "  source: %lx  dest: %lx\n" source dest;
     printf "  header options + padding:\n";
-    Bitmatch.hexdump_bitstring stdout options;
+    Bitstring.hexdump_bitstring stdout options;
     printf "  packet payload:\n";
-    Bitmatch.hexdump_bitstring stdout payload
+    Bitstring.hexdump_bitstring stdout payload
 
-  | version : 4 ->
+  | { version : 4 } ->
     eprintf "cannot parse IP version %d\n" version
 
-  | _ as header ->
+  | { _ } as header ->
     eprintf "data is smaller than one nibble:\n";
-    Bitmatch.hexdump_bitstring stderr header
-
-
-(* converted into:
-
-   let (data, off, len) = header in
-   let result = ref None in
-   try
-   if len >= 4 then (
-     let version, off, len = Bitmatch.extract_unsigned_be data off len 4 in
-     if len >= 4 then (
-       let hdrlen, off, len = Bitmatch.extract_unsigned_be data off len 4 in
-       (* ... *)
-       if (hdrlen-5)*32 >= 0 && len >= (hdrlen-5)*32 then (
-         let options, off, len =
-           Bitmatch.extract_bitstring data off len ((hdrlen-5)*32) in
-         let payload, off, len =
-           Bitmatch.extract_remainder data off len in
-
-         if version = 4 then (
-           ...
-           raise Exit
-         )
-       )
-     )
-   )
-   if len >= 4 then (
-     let version, off, len = Bitmatch.extract_unsigned_be data off len 4 in
-     ...;
-     raise Exit
-   )
-   ...
-   with Exit -> ();
-   match !result with
-   | Some x -> x
-   | None -> raise Match_failure _loc
-
-*)
+    Bitstring.hexdump_bitstring stderr header