X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=pdns-pipe-nmc.hs;h=4d47e5045bcc10c70b5d8c3bfcd56d99f432a669;hp=b010bac1cfd9ebfa0472eec64c3e68ca2c1317fe;hb=35cea210f8d3a22afd24848441b5d34702d83239;hpb=b0c8a2dae29482014bcb8794a18c0aef24abe683

diff --git a/pdns-pipe-nmc.hs b/pdns-pipe-nmc.hs
index b010bac..4d47e50 100644
--- a/pdns-pipe-nmc.hs
+++ b/pdns-pipe-nmc.hs
@@ -2,6 +2,7 @@
 
 module Main where
 
+import System.IO
 import Control.Monad
 import qualified Data.ByteString.Char8 as C (pack, unpack)
 import qualified Data.ByteString.Lazy.Char8 as L (pack, unpack)
@@ -15,7 +16,8 @@ import Network.HTTP.Conduit
 import JsonRpcClient
 import Config
 import PowerDns
-import NmcJson
+import NmcRpc
+import NmcDom
 
 confFile = "/etc/namecoin.conf"
 
@@ -55,8 +57,6 @@ qRsp rsp =
 
 -- NMC interface
 
-descend subdom dom = dom
-
 queryNmc :: Manager -> Config -> String -> String
          -> IO (Either String NmcDom)
 queryNmc mgr cfg fqdn qid = do
@@ -66,7 +66,7 @@ queryNmc mgr cfg fqdn qid = do
              httpLbs (qReq cfg (L.pack ("d/" ++ dn)) (L.pack qid)) mgr
       return $ case qRsp rsp of
         Left  err -> Left err
-        Right dom -> Right $ descend xs dom
+        Right dom -> Right $ descendNmc xs dom
     _           ->
       return $ Left "Only \".bit\" domain is supported"
 
@@ -76,6 +76,8 @@ main = do
 
   cfg <- readConfig confFile
 
+  hSetBuffering stdin  LineBuffering
+  hSetBuffering stdout LineBuffering
   ver <- do
     let
       loopErr e = forever $ do
@@ -96,13 +98,13 @@ main = do
   forever $ do
     l <- getLine
     case pdnsParse ver l of
-      Left e -> putStrLn $ "FAIL\t" ++ e
+      Left e -> putStr $ pdnsReport e
       Right preq -> do
         case preq of
           PdnsRequestQ qname qtype id _ _ _ ->
-            queryNmc mgr cfg qname id >>= putStr . (pdnsOut ver qtype)
+            queryNmc mgr cfg qname id >>= putStr . (pdnsOut ver id qname qtype)
           PdnsRequestAXFR xfrreq ->
-            putStrLn ("FAIL\tNo support for AXFR " ++ xfrreq)
+            putStr $ pdnsReport ("No support for AXFR " ++ xfrreq)
           PdnsRequestPing -> putStrLn "END"
 
 -- for testing
@@ -110,4 +112,4 @@ main = do
 ask str = do
   cfg <- readConfig confFile
   mgr <- newManager def
-  queryNmc mgr cfg str "test-req-id" >>= putStr . (pdnsOut 1 RRTypeANY)
+  queryNmc mgr cfg str "askid" >>= putStr . (pdnsOut 1 "askid" str RRTypeANY)