;;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
(defnet distorted.org.uk 172.29.198.0/23
- (untrusted 256
- (wireless 64))
+ (untrusted 256)
(trusted 256
(fretwank 128
(unsafe 32)
(defhost obsidian (safe 2))
;; Wireless network.
-(defhost evolution.wireless (wireless 1))
+(defhost evolution.untrusted (untrusted 1))
+(defhost vampire.untrusted (untrusted 2))
;; Virtual private network.
-(defhost fuzzface (virtual 1))
+(defhost crybaby (virtual 1))
;; Special network for ITS.
;; It doesn't understand point-to-point links, so we need a little net.
(guvnor (inet :a guvnor.demon) (fretwank :a guvnor))
;;
;; Wireless gateway
- (wireless :net wireless)
- (evolution (fretwank :a evolution) (wireless :a evolution.wireless))
+ (untrusted :net untrusted)
+ (evolution (fretwank :a evolution) (untrusted :a evolution.untrusted))
;;
;; Local services
(@ :svc www-frontend)
;; Wired ethernet
(fretwank :net fretwank)
(metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
- (vampire (fretwank :a vampire))
- (tubescreamer (fretwank :a tubescreamer))
+ (vampire (fretwank :a vampire) (untrusted :a vampire.untrusted))
(obsidian (fretwank :a obsidian))
;;
;; Virtual network
(virtual :net virtual)
- (fuzzface (virtual :a fuzzface))
+ (crybaby (virtual :a crybaby))
;;
;; ITS
(its :net its)
(defrevzone untrusted
:ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
- #+subnet/fretwank (wireless :ns (metalzone.ns vampire.ns))
- #+subnet/fretwank (@ :cidr-delegation
- (wireless
- (wireless
- 198.29.172.wireless.198.29.172.in-addr.arpa))))
+ :reverse untrusted)
(defzone dhcp.distorted.org.uk
:ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
(defzone dhcp.199.29.172.in-addr.arpa
:ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire)))
-(defzone wireless.198.29.172.in-addr.arpa
- :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
- :reverse ((wireless :bytes 4)))
-
;;;----- That's all, folks --------------------------------------------------