ebus-raket: decoder for byte, dumper: output l2+l7

1 files changed, 10 insertions, 16 deletions

diff --git a/ebus-racket/dumper.rkt b/ebus-racket/dumper.rkt
index 95081d1..285261b 100755
--- a/ebus-racket/dumper.rkt
+++ b/ebus-racket/dumper.rkt
@@ -10,13 +10,10 @@
 ;(define verbose? (make-parameter #f))
 (define connect-host? (make-parameter null))
 (define connect-port? (make-parameter null))
-(define layer7? (make-parameter #f))
 
 (define greeting
   (command-line
    #:once-each
-   [("-a" "--layer7")
-    "Parse Layer7" (layer7? #t)]
    [("-c" "--connect") 
     host port
     "Connect to server <host> <port>"
@@ -35,19 +32,16 @@
 (define (read-ebus-loop2 input-port)
   (let ([paket (layer2-read-ebus (current-input-port))])
     (pretty-print paket)
+	(pretty-print (layer7-paket-parse paket))
     (cond ((not (eof-object? paket)) (read-ebus-loop2 input-port)))))
 
-(define (read-ebus-loop7 input-port)
-  (let ([fields (layer7-read-ebus (current-input-port))])
-    (if (not (void? fields))
-	(pretty-print fields)
-	(display ""))
-    (cond ((not (eof-object? fields)) (read-ebus-loop7 input-port)))))
+;(define (read-ebus-loop7 input-port)
+;  (let ([fields (layer7-read-ebus (current-input-port))])
+;    (if (not (void? fields))
+;	(pretty-print fields)
+;	(display ""))
+;    (cond ((not (eof-object? fields)) (read-ebus-loop7 input-port)))))
 
-(if (layer7?)
-    (let ()
-      (display "Layer 7\n")
-      (read-ebus-loop7 (current-input-port)))
-    (let ()
-      (display "Layer 2\n")
-      (read-ebus-loop2 (current-input-port))))
+(let ()
+  (display "Layer 2\n")
+  (read-ebus-loop2 (current-input-port)))