Tidy up debug output

This commit is contained in:
Tony Garnock-Jones 2014-06-19 23:17:59 -04:00
parent ea9660d83d
commit 82c5ea71ed
2 changed files with 14 additions and 10 deletions

19
arp.rkt
View File

@ -142,13 +142,18 @@
[(1) ;; request [(1) ;; request
(if (set-member? (state-assertions s) (if (set-member? (state-assertions s)
(cache-key ptype target-protocol-address)) (cache-key ptype target-protocol-address))
(send (build-packet sender-hardware-address (begin
ptype (log-info "~a ARP answering request for ~a/~a"
2 ;; reply interface-name
hwaddr ptype
target-protocol-address (pretty-bytes target-protocol-address))
sender-hardware-address (send (build-packet sender-hardware-address
sender-protocol-address)) ptype
2 ;; reply
hwaddr
target-protocol-address
sender-hardware-address
sender-protocol-address)))
'())] '())]
[(2) '()] ;; reply [(2) '()] ;; reply
[else '()]) [else '()])

5
ip.rkt
View File

@ -174,9 +174,8 @@
[(message (? ip-packet? p) _ _) [(message (? ip-packet? p) _ _)
(define gw-if (gateway-route-state-gateway-interface s)) (define gw-if (gateway-route-state-gateway-interface s))
(when (not gw-if) (when (not gw-if)
(log-warning "Gateway hwaddr for ~a not known, packet dropped: ~v" (log-warning "Gateway hwaddr for ~a not known, packet dropped."
(ip-address->hostname gateway-addr) (ip-address->hostname gateway-addr)))
p))
(and gw-if (and gw-if
(not (equal? (ip-packet-source-interface p) (ethernet-interface-name gw-if))) (not (equal? (ip-packet-source-interface p) (ethernet-interface-name gw-if)))
(not (covered-by-some-other-route? (ip-packet-destination p) (not (covered-by-some-other-route? (ip-packet-destination p)