From d6af03bf020a32e2fa815c55631dc8d0cf2f422b Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 31 May 2013 13:16:28 -0400 Subject: [PATCH] Fix up patterns for new stricter TR checking. --- driver.rkt | 4 ++-- network-query.rkt | 6 +++--- proxy.rkt | 2 +- tk-dns.rkt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/driver.rkt b/driver.rkt index 5f0c108..cccbf06 100644 --- a/driver.rkt +++ b/driver.rkt @@ -64,10 +64,10 @@ (spawn: #:parent : Void #:child : Void (dns-spy)) (spawn: #:parent : Void #:child : Void (dns-read-driver local-addr)) (spawn: #:parent : Void #:child : Void (dns-write-driver local-addr)) - (endpoint: : Void #:subscriber (bad-dns-packet (wild) (wild) (wild) (wild)) + (endpoint: : Void #:subscriber (bad-dns-packet-pattern (wild) (wild) (wild) (wild)) [p (begin (log-error (pretty-format p)) '())]) - (endpoint: : Void #:subscriber (dns-request (wild) (wild) (wild)) + (endpoint: : Void #:subscriber (dns-request-pattern (wild) (wild) (wild)) [(? dns-request? r) (begin (define reply (handle-request soa-rr zone r)) (when reply (send-message reply)))])))) diff --git a/network-query.rkt b/network-query.rkt index 4e3fbd6..d9789e8 100644 --- a/network-query.rkt +++ b/network-query.rkt @@ -285,7 +285,7 @@ [remaining-names remaining-names]) : NetworkQueryState (send-message subq) (endpoint: w : NetworkQueryState - #:subscriber (answered-question subq (wild)) + #:subscriber (answered-question-pattern subq (wild)) #:let-name subq-id [(answered-question (== subq) ans) (let ((ips (map make-dns-address @@ -357,7 +357,7 @@ (send-message (set-timer timeout-id (* timeout 1000) 'relative)) ;; TODO: Restore this to a "join" when proper pattern-unions are implemented (endpoint: w : NetworkQueryState - #:subscriber (timer-expired timeout-id (wild)) + #:subscriber (timer-expired-pattern timeout-id (wild)) #:name timeout-id [(timer-expired (== timeout-id) _) (begin @@ -370,7 +370,7 @@ (delete-endpoint reply-wait-id) (send-message (list 'release-query-id query-id))))]) (endpoint: w : NetworkQueryState - #:subscriber (dns-reply (wild) (wild) s) + #:subscriber (dns-reply-pattern (wild) (wild) s) #:name reply-wait-id [(dns-reply reply-message source (== s)) ;; TODO: maybe receive only specifically from the queried IP address? diff --git a/proxy.rkt b/proxy.rkt index 7ff7251..e0420d4 100644 --- a/proxy.rkt +++ b/proxy.rkt @@ -256,7 +256,7 @@ (let-values (((new-zone timers) (incorporate-complete-answer answer zone #t))) (transition-and-set-timers new-zone timers))]) (endpoint: zone : CompiledZone - #:subscriber (timer-expired (list 'check-dns-expiry (wild)) (wild)) + #:subscriber (timer-expired-pattern (list 'check-dns-expiry (wild)) (wild)) [(timer-expired (list 'check-dns-expiry (? domain? name)) (? number? now-msec)) (transition: (zone-expire-name zone name (/ now-msec 1000.0)) : CompiledZone)]))) diff --git a/tk-dns.rkt b/tk-dns.rkt index 194dfff..37d53c9 100644 --- a/tk-dns.rkt +++ b/tk-dns.rkt @@ -101,10 +101,10 @@ (send-message (udp-packet s sink (dns-message->packet message)))))) (transition: (void) : Void (endpoint: : Void - #:subscriber (dns-request (wild) s (wild)) + #:subscriber (dns-request-pattern (wild) s (wild)) [(dns-request message (== s) sink) (translate message sink)]) (endpoint: : Void - #:subscriber (dns-reply (wild) s (wild)) + #:subscriber (dns-reply-pattern (wild) s (wild)) [(dns-reply message (== s) sink) (translate message sink)]))) (: dns-spy : -> (Transition Void))