wip reorg responsibilities

diff --git a/PowerDns.hs b/PowerDns.hs
index d93214f98d33352cfc2702ea8ba9e4e1889c7bb8..6800143dcd243b8d595f1a78d329509b9fbdb3bc 100644 (file)
--- a/PowerDns.hs
+++ b/PowerDns.hs
@@ -61,7 +61,7 @@ pdnsParse ver s =
                                             , localIpAddress = getLIp ver xs
                                             , ednsSubnetAddress = getRIp ver xs
                                             })
-      _                         -> Left s
+      _                         -> Left $ "Unparseable PDNS Request: " ++ s
 
-pdnsOut :: NmcDom -> String
-pdnsOut d = show d
+pdnsOut :: RRType -> NmcDom -> String
+pdnsOut _ d = show d

diff --git a/pdns-pipe-nmc.hs b/pdns-pipe-nmc.hs
index a933c9ca70ade2f57d3c3a46b91b80923bf41d90..ee5bd3771a900dd880f2add5c7dcacff6a100ae9 100644 (file)
--- a/pdns-pipe-nmc.hs
+++ b/pdns-pipe-nmc.hs
@@ -49,9 +49,9 @@ qRsp rsp =
 
 -- NMC interface
 
-queryNmc :: Manager -> Config -> String -> RRType -> String
+queryNmc :: Manager -> Config -> String -> String
          -> IO (Either String NmcDom)
-queryNmc mgr cfg fqdn qtype qid = do
+queryNmc mgr cfg fqdn qid = do
   case reverse (splitOn "." fqdn) of
     "bit":dn:xs -> do
       rsp <- runResourceT $
@@ -89,11 +89,11 @@ main = do
       Left e -> putStrLn $ "ERROR\t" ++ e
       Right preq -> do
         case preq of
-          PdnsRequestQ qn qt id lip rip eip -> do
-            ncres <- queryNmc mgr cfg (qName preq) (qType preq) (iD preq)
+          PdnsRequestQ qname qtype id _ _ _ -> do
+            ncres <- queryNmc mgr cfg qname id
             case ncres of
               Left  e   -> putStrLn $ "ERROR\t" ++ e
-              Right dom -> putStrLn $ pdnsOut dom
+              Right dom -> putStrLn $ pdnsOut qtype dom
           PdnsRequestAXFR xfrreq ->
-            putStrLn ("ERROR\t No support for AXFR " ++ xfrreq)
+            putStrLn ("ERROR\tNo support for AXFR " ++ xfrreq)
           PdnsRequestPing -> putStrLn "OK"