From 630d0e29bd60b489c7ddb0585b3bbdb7092f68c0 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Mon, 16 Jun 2014 17:51:37 -0400 Subject: [PATCH] Tweaks to logging --- checksum.rkt | 8 ++++---- ethernet.rkt | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/checksum.rkt b/checksum.rkt index a56ffb3..e34fc13 100644 --- a/checksum.rkt +++ b/checksum.rkt @@ -27,18 +27,18 @@ ([ (prefix :: binary bytes offset) (:: binary bytes 2) (suffix :: binary) ] - (log-info "Packet pre checksum:\n~a" (dump-bytes->string blob)) + ;; (log-info "Packet pre checksum:\n~a" (dump-bytes->string blob)) (define result (ones-complement-+16 (ones-complement-sum16 pseudo-header) (ones-complement-+16 (ones-complement-sum16 prefix) (ones-complement-sum16 suffix)))) - (log-info "result: ~a" (number->string result 16)) + ;; (log-info "result: ~a" (number->string result 16)) (define checksum (ones-complement-negate16-safely result)) - (log-info "Checksum ~a" (number->string checksum 16)) + ;; (log-info "Checksum ~a" (number->string checksum 16)) (define final-packet (bit-string (prefix :: binary) (checksum :: integer bytes 2) (suffix :: binary))) - (log-info "Packet with checksum:\n~a" (dump-bytes->string final-packet)) + ;; (log-info "Packet with checksum:\n~a" (dump-bytes->string final-packet)) final-packet))) (module+ test diff --git a/ethernet.rkt b/ethernet.rkt index ffef106..1390023 100644 --- a/ethernet.rkt +++ b/ethernet.rkt @@ -56,20 +56,20 @@ (begin (async-channel-put control-ch 'unblock) #f))] [(message (? ethernet-packet? p) 1 #f) ;; from metalevel 1 - (log-info "Interface ~a inbound packet ~a -> ~a (type 0x~a):\n~a" + (log-info "Interface ~a inbound packet ~a -> ~a (type 0x~a)" (ethernet-interface-name (ethernet-packet-interface p)) (pretty-bytes (ethernet-packet-source p)) (pretty-bytes (ethernet-packet-destination p)) - (number->string (ethernet-packet-ethertype p) 16) - (dump-bytes->string (ethernet-packet-body p))) + (number->string (ethernet-packet-ethertype p) 16)) + (log-info "~a" (dump-bytes->string (ethernet-packet-body p))) (transition h (send p))] [(message (? ethernet-packet? p) 0 #f) ;; from metalevel 0 - (log-info "Interface ~a OUTBOUND packet ~a -> ~a (type 0x~a):\n~a" + (log-info "Interface ~a OUTBOUND packet ~a -> ~a (type 0x~a)" (ethernet-interface-name (ethernet-packet-interface p)) (pretty-bytes (ethernet-packet-source p)) (pretty-bytes (ethernet-packet-destination p)) - (number->string (ethernet-packet-ethertype p) 16) - (dump-bytes->string (ethernet-packet-body p))) + (number->string (ethernet-packet-ethertype p) 16)) + (log-info "~a" (dump-bytes->string (ethernet-packet-body p))) (raw-interface-write h (encode-ethernet-packet p)) #f] [_ #f]))