[Gd-chatter] r10984 - in trunk/libraries: gui-sniffer packetizer

[andreas at gwydiondylan.org]

Author: andreas
Date: Wed Nov 22 00:42:15 2006
New Revision: 10984

Modified:
   trunk/libraries/gui-sniffer/gui-sniffer.dylan
   trunk/libraries/gui-sniffer/hex-view.dylan
   trunk/libraries/packetizer/packetizer.dylan
   trunk/libraries/packetizer/protocol-definer-macro.dylan
Log:
job: 7299

Make it compile in tight mode, and run standalone.

Modified: trunk/libraries/gui-sniffer/gui-sniffer.dylan
==============================================================================
--- trunk/libraries/gui-sniffer/gui-sniffer.dylan	(original)
+++ trunk/libraries/gui-sniffer/gui-sniffer.dylan	Wed Nov 22 00:42:15 2006
@@ -217,6 +217,7 @@
   frame.number;
 end;
 
+define generic print-time (gui :: <gui-sniffer-frame>, frame :: <frame-with-metadata>);
 define method print-time (gui :: <gui-sniffer-frame>, frame :: <frame-with-metadata>)
   let diff = frame.receive-time - gui.first-packet-arrived;
   let (days, hours, minutes, seconds, microseconds)
@@ -225,6 +226,7 @@
   concatenate(integer-to-string(secs), ".", integer-to-string(truncate/(microseconds, 1000), size: 3));
 end;
 
+define generic apply-filter (frame :: <gui-sniffer-frame>);
 define method apply-filter (frame :: <gui-sniffer-frame>)
   let filter-string = gadget-value(frame.filter-field);
   let old = frame.filter-expression;

Modified: trunk/libraries/gui-sniffer/hex-view.dylan
==============================================================================
--- trunk/libraries/gui-sniffer/hex-view.dylan	(original)
+++ trunk/libraries/gui-sniffer/hex-view.dylan	Wed Nov 22 00:42:15 2006
@@ -60,8 +60,6 @@
     let start-pos2 = start-rest + 57 + if (start-rest >= 8) 1 else 0 end;
     let end-pos2 = end-rest + 58 + if (end-rest >= 8) 1 else 0 end;
 
-    format-out("%= %=, %= %=, %= %=\n", start-offset, end-offset, start-line, start-pos, end-line, end-pos);
-
     For (i from 0,
         line = buffer.buffer-start-node.node-section.section-start-line then line.line-next,
         while: line)

Modified: trunk/libraries/packetizer/packetizer.dylan
==============================================================================
--- trunk/libraries/packetizer/packetizer.dylan	(original)
+++ trunk/libraries/packetizer/packetizer.dylan	Wed Nov 22 00:42:15 2006
@@ -416,14 +416,14 @@
       let real-frame-start = field.dynamic-start(frame);
       if (real-frame-start ~= offset)
         //pad!
-        format-out("Need dynamic padding at start of %s : %d ~= %d\n",
-                   field.field-name, real-frame-start, offset);
+        //format-out("Need dynamic padding at start of %s : %d ~= %d\n",
+        //           field.field-name, real-frame-start, offset);
       end;
       offset := real-frame-start;
     end;
     if ((field.static-start ~= $unknown-at-compile-time) & (field.static-start ~= offset))
-      format-out("Need static padding at start of %s : %d ~= %d\n",
-                 field.field-name, field.static-start, offset);
+      //format-out("Need static padding at start of %s : %d ~= %d\n",
+      //           field.field-name, field.static-start, offset);
       offset := field.static-start;
     end;
     let length = offset + assemble-field-into(field, frame, subsequence(packet, start: offset));
@@ -439,14 +439,14 @@
       let real-frame-end = field.dynamic-end(frame);
       if (real-frame-end ~= length)
         //pad!
-        format-out("Need dynamic padding at end of %s : %d ~= %d\n",
-                   field.field-name, real-frame-end, length);
+        //format-out("Need dynamic padding at end of %s : %d ~= %d\n",
+        //           field.field-name, real-frame-end, length);
       end;
       length := real-frame-end;
     end;
     if ((field.static-end ~= $unknown-at-compile-time) & (field.static-end ~= length))
-      format-out("Need static padding at end of %s : %d ~= %d\n",
-                 field.field-name, field.static-end, length);
+      //format-out("Need static padding at end of %s : %d ~= %d\n",
+      //           field.field-name, field.static-end, length);
       offset := field.static-end;
     end;
     offset := length;

Modified: trunk/libraries/packetizer/protocol-definer-macro.dylan
==============================================================================
--- trunk/libraries/packetizer/protocol-definer-macro.dylan	(original)
+++ trunk/libraries/packetizer/protocol-definer-macro.dylan	Wed Nov 22 00:42:15 2006
@@ -283,8 +283,8 @@
      end;
 
   if (end-of-field > full-frame-size)
-    format-out("Wanted to read beyond frame, field %s start %d end %d frame-size %d\n",
-               frame-field.field.field-name, start, end-of-field, full-frame-size);
+    //format-out("Wanted to read beyond frame, field %s start %d end %d frame-size %d\n",
+    //           frame-field.field.field-name, start, end-of-field, full-frame-size);
     end-of-field := full-frame-size;
   end;
   let (value, length)
@@ -297,8 +297,8 @@
     let real-end = length + start;
     unless (real-end = end-of-field)
       if (real-end < end-of-field)
-        format-out("estimated end in %s at %d (%d bytes), but parser was done after %d (%d bytes)\n",
-                   frame-field.field.field-name, end-of-field, byte-offset(end-of-field), real-end, byte-offset(real-end));
+        //format-out("estimated end in %s at %d (%d bytes), but parser was done after %d (%d bytes)\n",
+        //           frame-field.field.field-name, end-of-field, byte-offset(end-of-field), real-end, byte-offset(real-end));
         //padding? only if end-of-field ~= end-of-frame!?
         end-of-field := real-end;
       else