reimplement SRV handling

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

diff --git a/NmcDom.hs b/NmcDom.hs
index 90c7966064afe24cfba4321d405aed70f0535de6..8153a1dd7dad2d0b3128b455cf465bf0a93aa381 100644 (file)
--- a/NmcDom.hs
+++ b/NmcDom.hs
@@ -153,6 +153,7 @@ data NmcDom = NmcDom    { domService     :: Maybe [NmcRRService]
                                                     (Map String [NmcRRTls]))
                         , domDs          :: Maybe [NmcRRDs]
                         , domMx          :: Maybe [String] -- Synthetic
                                                     (Map String [NmcRRTls]))
                         , domDs          :: Maybe [NmcRRDs]
                         , domMx          :: Maybe [String] -- Synthetic

+                        , domSrv         :: Maybe [String] -- Synthetic

                         } deriving (Show, Eq)
 
 instance FromJSON NmcDom where
                         } deriving (Show, Eq)
 
 instance FromJSON NmcDom where


@@ -189,6 +190,7 @@ instance FromJSON NmcDom where
                 <*> o .:? "tls"
                 <*> o .:? "ds"
                 <*> return Nothing -- domMx not parsed
                 <*> o .:? "tls"
                 <*> o .:? "ds"
                 <*> return Nothing -- domMx not parsed

+                <*> return Nothing -- domSrv not parsed

         parseJSON _ = empty
 
 instance Mergeable NmcDom where
         parseJSON _ = empty
 
 instance Mergeable NmcDom where


@@ -211,6 +213,7 @@ instance Mergeable NmcDom where
                                 , domTls =         mergelm domTls
                                 , domDs =          mergelm domDs
                                 , domMx =          mergelm domMx
                                 , domTls =         mergelm domTls
                                 , domDs =          mergelm domDs
                                 , domMx =          mergelm domMx

+                                , domSrv =         mergelm domSrv

                                 }
           where
                 mergelm x = merge (x sub) (x dom)
                                 }
           where
                 mergelm x = merge (x sub) (x dom)


@@ -227,4 +230,4 @@ mergeNmcDom = merge
 emptyNmcDom = NmcDom Nothing Nothing Nothing Nothing Nothing Nothing
                      Nothing Nothing Nothing Nothing Nothing Nothing
                      Nothing Nothing Nothing Nothing Nothing Nothing
 emptyNmcDom = NmcDom Nothing Nothing Nothing Nothing Nothing Nothing
                      Nothing Nothing Nothing Nothing Nothing Nothing
                      Nothing Nothing Nothing Nothing Nothing Nothing

-                     Nothing
+                     Nothing Nothing