Packets/80221Bundle: just another fix for DynamicTLVLengthParser

[senf.git] / doclib / pkgdraw

diff --git a/doclib/pkgdraw b/doclib/pkgdraw
index 0102623..efff924 100755 (executable)
--- a/doclib/pkgdraw
+++ b/doclib/pkgdraw
@@ -1,4 +1,33 @@
 #!/usr/bin/python
+#
+# Usage:
+#    pkgdraw <header> <outfile> [<parser names>...] [-- <cpp options>...]
+#
+# Extract packet structure from <header>. Write generated PNG diagram
+# to <outfile>.  If <parser names> is given, it is a list names of
+# parsers to generate diagrams for. All other parsers from the same
+# header file will be skipped.
+#
+# <cpp options> are parsed to the C preprocessor while processing the
+# header file.
+#
+# pkgdraw will interpret most SENF_PARSER statements, it does however
+# *not* understand GOTO statements. Special comments may be added
+# directly before or after a field to pass parameters to pkgdraw
+#
+#    SENF_PARSER_FIELD( id, senf::UInt16Parser ); //<pkgdraw: <option>, <option>...
+#
+# or
+#
+#    //>pkgdraw: <option>, <option>...
+#    SENF_PARSER_FIELD( id, senf::UInt16Parser );
+#
+# <option> is any valid option:
+#
+#   hide                Completely skip this field (Helps with GOTO)
+#   name=<name>         Sets the field name to <name>
+#   size=<min>[-<max>]  Sets the field size in bits.
+#
 
 import sys, re, signal, tempfile, os, os.path, shutil, atexit
 
@@ -275,6 +304,7 @@ def parse_VECTOR(args, flags):
         sys.stderr.write("Failed to aprse VECTOR: %s\n" % args)
         return None
     field = dict(FIELD_TYPES.get(args[-1].split(':')[-1], {}))
+    print args,repr(field);
     field['name'] = args[0]
     field['repeat'] = True
     return field
@@ -371,15 +401,21 @@ def scanPackets(data):
         packetOrder.append(name)
         minsize = maxsize = 0
         for field in packets[name]:
-            if field.get('size', None) is not None:
-                maxsize += field['size']
-            elif field.get('minsize', None) is not None:
-                maxsize += field['maxsize']
+            if maxsize is not None:
+                if field.get('repeat', False):
+                    maxsize = None
+                elif field.get('size', None) is not None:
+                    maxsize += field['size']
+                elif field.get('minsize', None) is not None:
+                    maxsize += field['maxsize']
+                else:
+                    maxsize = None
             if not field.get('optional', False):
                 if field.get('size', None) is not None:
                     minsize += field['size']
                 elif field.get('minsize', None) is not None:
                     minsize += field['minsize']
+        print name,minsize,maxsize
         if minsize is not None and maxsize is not None:
             if minsize == maxsize:
                 FIELD_TYPES[name] = { 'size' : minsize }