From: Eugene Crosser <crosser@average.org>
Date: Wed, 30 Apr 2014 19:38:43 +0000 (+0400)
Subject: Revert "wip TLSA"
X-Git-Tag: 0.9.0.0~3
X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=commitdiff_plain;h=0288e756cf28a0229c03a946e54cda94252526c1

Revert "wip TLSA"

This reverts commit 518fb5e9066cb2f77cd3291289d85c00cbee0ffb.
The approach of delayed conversion will be abandoned, and the
conversion of both SRV and TLSA into the final format in the
"map" will be moved to the JSON parser.
---

diff --git a/NmcTransform.hs b/NmcTransform.hs
index 64210eb..cf93db3 100644
--- a/NmcTransform.hs
+++ b/NmcTransform.hs
@@ -102,30 +102,6 @@ expandSrv base =
                    && srvPort sr == 25
                 then Just [(show (srvPrio sr)) ++ "\t" ++ (srvHost sr)]
                 else Nothing
-{-
--- | replace Tls with Tlsa down in the Map
---   This function is almost, but not quite, entirely unlike expandSrv.
-expandTls :: NmcDom -> NmcDom
-expandTls base =
-  let
-    base' = base { domTls = Nothing }
-  in
-    case domTls base of
-      Nothing -> base'
-      Just sl -> foldr addTlsa base' sl
-        where
-          addTlsa sr acc = sub1 `mergeNmcDom` acc
-            where
-              sub1 = def { domMap = Just (singleton proto sub2) }
-              sub2 = def { domMap = Just (singleton port sub3) }
-              sub3 = def { domTlsa = Just [tlsStr] }
-              proto = "_" ++ (tlsProto sr)
-              port = "_" ++ (tlsName sr)
-              tlsStr =  (show (tlsPrio sr)) ++ "\t"
-                     ++ (show (tlsWeight sr)) ++ " "
-                     ++ (show (tlsPort sr)) ++ " "
-                     ++ (tlsHost sr)
--}
 
 -- | Convert map elements of the form "subN...sub2.sub1.dom.bit"
 --   into nested map and merge it