X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=ExampleDNSServer.hs;h=1aae098bc93e93dcaa1dc582deb164fba202bc2a;hb=f3ad40fd6916408dde9b9e6237b41828d90c1e34;hp=428f261856dd892fa8d8a2862996239eb8b91f9d;hpb=826401d22c87d6c5d77ad4f427d28d6b97a9d12f;p=haskell-dns.git

diff --git a/ExampleDNSServer.hs b/ExampleDNSServer.hs
index 428f261..1aae098 100644
--- a/ExampleDNSServer.hs
+++ b/ExampleDNSServer.hs
@@ -1,12 +1,12 @@
+import           Network.DNS.DomainMap (DomainMap)
 import           Network.DNS.Message
 import           Network.DNS.Named
 import           Network.DNS.Named.Config
 import           Network.DNS.Named.Zone
-import           Network.Socket
-import           System.IO.Unsafe
+import           Network.Socket.IsString ()
 
 main :: IO ()
-main = runNamed cnf (return . findZone)
+main = runNamed cnf zones
     where
       cnf :: Config
       cnf = Config {
@@ -14,62 +14,70 @@ main = runNamed cnf (return . findZone)
             , cnfAllowTransfer = True
             }
 
-      findZone :: DomainName -> Maybe Zone
-      findZone name
-          | name `isInZone` zone = Just zone
-          | otherwise            = Nothing
-
-      zone :: Zone
-      zone = Zone {
-               zoneName = mkDN "cielonegro.org."
-             , zoneSOA  = Just SOAFields {
-                            soaMasterNameServer   = mkDN "ns.cielonegro.org."
-                          , soaResponsibleMailbox = mkDN "root.ns.cielonegro.org."
-                          , soaSerialNumber       = 2008022148
-                          , soaRefreshInterval    = 3600
-                          , soaRetryInterval      = 900
-                          , soaExpirationLimit    = 3600000
-                          , soaMinimumTTL         = 3600
-                          }
-             , zoneRecordNames = return [ mkDN "ns.cielonegro.org."
-                                        , mkDN "www.cielonegro.org."
-                                        , mkDN "git.cielonegro.org."
-                                        ]
-             , zoneResponder   = return . responder
-             }
+      zones :: DomainMap Zone
+      zones = fromZones
+              [ Zone {
+                  zoneName = "cielonegro.org."
+                , zoneSOA  = Just SOAFields {
+                               soaMasterNameServer   = "ns.cielonegro.org."
+                             , soaResponsibleMailbox = "root.ns.cielonegro.org."
+                             , soaSerialNumber       = 2008022148
+                             , soaRefreshInterval    = 3600
+                             , soaRetryInterval      = 900
+                             , soaExpirationLimit    = 3600000
+                             , soaMinimumTTL         = 3600
+                             }
+                , zoneRecordNames = return [ "ns.cielonegro.org."
+                                           , "www.cielonegro.org."
+                                           , "git.cielonegro.org."
+                                           ]
+                , zoneResponder   = return . responder
+                }
+              ]
 
       responder :: DomainName -> [SomeRR]
       responder name
-          | name == mkDN "ns.cielonegro.org."
+          | name == "ns.cielonegro.org."
               = [ wrapRecord ResourceRecord {
                                    rrName  = name
                                  , rrType  = A
                                  , rrClass = IN
                                  , rrTTL   = 9600
-                                 , rrData  = inetAddr "127.0.0.1"
+                                 , rrData  = "127.0.0.1"
+                                 }
+                , wrapRecord ResourceRecord {
+                                   rrName  = name
+                                 , rrType  = AAAA
+                                 , rrClass = IN
+                                 , rrTTL   = 9600
+                                 , rrData  = "::1"
                                  }
                 ]
-          | name == mkDN "www.cielonegro.org."
+          | name == "www.cielonegro.org."
               = [ wrapRecord ResourceRecord {
                                    rrName  = name
                                  , rrType  = A
                                  , rrClass = IN
                                  , rrTTL   = 9600
-                                 , rrData  = inetAddr "127.0.0.2"
+                                 , rrData  = "127.0.0.2"
+                                 }
+                , wrapRecord ResourceRecord {
+                                   rrName  = name
+                                 , rrType  = AAAA
+                                 , rrClass = IN
+                                 , rrTTL   = 9600
+                                 , rrData  = "fe80::216:cbff:fe39:56a4"
                                  }
                 ]
-          | name == mkDN "git.cielonegro.org."
+          | name == "git.cielonegro.org."
               = [ wrapRecord ResourceRecord {
                                    rrName  = name
                                  , rrType  = CNAME
                                  , rrClass = IN
                                  , rrTTL   = 9600
-                                 , rrData  = mkDN "www.cielonegro.org."
+                                 , rrData  = "www.cielonegro.org."
                                  }
                 ]
           | otherwise
               = [] -- This means NXDOMAIN.
 
-
-inetAddr :: String -> HostAddress
-inetAddr = unsafePerformIO . inet_addr