cleanup pdns response generator

[pdns-pipe-nmc.git] / PowerDns.hs

diff --git a/PowerDns.hs b/PowerDns.hs
index b9c809340fd7160e48ee0ce39eeb0b884572068b..796d97c5fa15a74445a05c600335098caa3f29c7 100644 (file)
--- a/PowerDns.hs
+++ b/PowerDns.hs
@@ -5,11 +5,11 @@ module PowerDns ( RRType(..)
                 , pdnsOut
                 ) where
 
-import NmcJson
+import NmcDom
 
 data RRType = RRTypeSRV   | RRTypeA   | RRTypeAAAA | RRTypeCNAME
             | RRTypeDNAME | RRTypeSOA | RRTypeRP   | RRTypeLOC
-            | RRTypeNS    | RRTypeDS
+            | RRTypeNS    | RRTypeDS  | RRTypeMX
             | RRTypeANY   | RRTypeError String 
         deriving (Show)
 
@@ -38,6 +38,7 @@ pdnsParse ver s =
       "LOC"     -> RRTypeLOC
       "NS"      -> RRTypeNS    
       "DS"      -> RRTypeDS
+      "MX"      -> RRTypeMX
       "ANY"     -> RRTypeANY
       _         -> RRTypeError qt
     getLIp ver xs
@@ -71,7 +72,7 @@ pdnsReport err =
 pdnsOut :: Int -> String -> String -> RRType -> Either String NmcDom -> String
 pdnsOut ver id name rrtype edom =
   case edom of
-    Left  err -> pdnsReport err
+    Left  err -> pdnsReport $ err ++ " in a query for " ++ name
     Right dom -> foldr addLine "END\n" $ nmc2pdns name rrtype dom
       where
         addLine (nm, ty, dt) accum =
@@ -84,34 +85,46 @@ pdnsOut ver id name rrtype edom =
 
 nmc2pdns :: String -> RRType -> NmcDom -> [(String, String, String)]
 nmc2pdns name RRTypeANY   dom =
-  foldr (\r accum -> (nmc2pdns name r dom) ++ accum) []
-    [RRTypeA, RRTypeAAAA, RRTypeCNAME, RRTypeDNAME, -- no SRV here!
-     RRTypeSOA, RRTypeRP, RRTypeLOC, RRTypeNS, RRTypeDS]
-nmc2pdns name RRTypeSRV   dom = [] -- FIXME
-nmc2pdns name RRTypeA     dom = mapto name "A" $ domIp dom
-nmc2pdns name RRTypeAAAA  dom = mapto name "AAAA" $ domIp6 dom
-nmc2pdns name RRTypeCNAME dom = takejust name "CNAME" $ domAlias dom
-nmc2pdns name RRTypeDNAME dom = takejust name "DNAME" $ domTranslate dom
-nmc2pdns name RRTypeSOA   dom =
-  let
-    email = case domEmail dom of
-      Nothing   -> "hostmaster." ++ name
-      Just addr ->
-        let (aname, adom) = break (== '@') addr
-        in case adom of
-          "" -> aname
-          _  -> aname ++ "." ++ (tail adom)
-  in
-    [(name, "SOA", email ++ " 99999999 10800 3600 604800 86400")]
-nmc2pdns name RRTypeRP    dom = [] --FIXME
-nmc2pdns name RRTypeLOC   dom = takejust name "LOC" $ domLoc dom
-nmc2pdns name RRTypeNS    dom = mapto name "NS" $ domNs dom
-nmc2pdns name RRTypeDS    dom = [] --FIXME
-
-mapto name rrstr maybel = case maybel of
-  Nothing  -> []
-  Just l   -> map (\x -> (name, rrstr, x)) l
-
-takejust name rrstr maybestr = case maybestr of
-  Nothing  -> []
-  Just str -> [(name, rrstr, str)]
+  foldr (\r accum -> (nmc2pdns r) ++ accum) []
+    [RRTypeSRV, RRTypeA, RRTypeAAAA, RRTypeCNAME, RRTypeDNAME,
+     RRTypeSOA, RRTypeRP, RRTypeLOC, RRTypeNS, RRTypeDS, RRTypeMX]
+  where
+    nmc2pdns RRTypeSRV   = makesrv  "SRV"   $ domService dom
+    nmc2pdns RRTypeMX    = mapto    "MX"    $ domMx dom
+    nmc2pdns RRTypeA     = mapto    "A"     $ domIp dom
+    nmc2pdns RRTypeAAAA  = mapto    "AAAA"  $ domIp6 dom
+    nmc2pdns RRTypeCNAME = takejust "CNAME" $ domAlias dom
+    nmc2pdns RRTypeDNAME = takejust "DNAME" $ domTranslate dom
+    nmc2pdns RRTypeSOA   = -- FIXME generate only for top domain
+      if dom == emptyNmcDom then []
+      else
+        let
+          email = case domEmail dom of
+            Nothing   -> "hostmaster." ++ name
+            Just addr ->
+              let (aname, adom) = break (== '@') addr
+              in case adom of
+                "" -> aname
+                _  -> aname ++ "." ++ (tail adom)
+        in [(name, "SOA", email ++ " 99999999 10800 3600 604800 86400")]
+    nmc2pdns RRTypeRP    = [] --FIXME
+    nmc2pdns RRTypeLOC   = takejust "LOC"  $ domLoc dom
+    nmc2pdns RRTypeNS    = mapto    "NS"   $ domNs dom
+    nmc2pdns RRTypeDS    = [] --FIXME
+    
+    mapto rrstr maybel = case maybel of
+      Nothing  -> []
+      Just l   -> map (\x -> (name, rrstr, x)) l
+    
+    takejust rrstr maybestr = case maybestr of
+      Nothing  -> []
+      Just str -> [(name, rrstr, str)]
+    
+    makesrv rrstr mayberl = case mayberl of
+      Nothing  -> []
+      Just srl  -> map (\x -> (name, rrstr, fmtsrv x)) srl
+        where
+          fmtsrv rl = (show (srvPrio rl)) ++ " "
+                    ++ (show (srvWeight rl)) ++ " "
+                    ++ (show (srvPort rl)) ++ " "
+                    ++ (srvHost rl)