X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcJson.hs;h=69e693ff000e7ea5aafb986e5c45f017a1c60d05;hp=14a2f6322d39d913a20a67be222e955b0faad7e5;hb=3296cbcefa4b9d7a3b80ef8aef5fc59a830dd97f;hpb=5f1986b7cb4f20796429433b03205f750a611271

diff --git a/NmcJson.hs b/NmcJson.hs
index 14a2f63..69e693f 100644
--- a/NmcJson.hs
+++ b/NmcJson.hs
@@ -8,6 +8,8 @@ module NmcJson  ( NmcRes(..)
 
 import Data.ByteString.Lazy (ByteString)
 import Data.Text as T (unpack)
+import Data.List.Split
+import Data.Char
 import Data.Map as M (Map, lookup)
 import Control.Applicative ((<$>), (<*>), empty)
 import Data.Aeson
@@ -66,9 +68,19 @@ data NmcDom = NmcDom    { domService     :: Maybe [[String]] -- [NmcRRService]
                         } deriving (Show, Eq)
 
 instance FromJSON NmcDom where
-        -- Some just put the IP address in the value, especially in the map.
-        -- As an ugly hack, try to interpret string as IP (v4) address.
-        parseJSON (String s) = return emptyNmcDom { domIp = Just [T.unpack s] }
+        -- Wherever we expect a domain object, there may be a string
+        -- containing IPv4 address. Interpret it as such.
+        -- Question: shall we try to recognize IPv6 addresses too?
+        parseJSON (String s) =
+                 return $ if isIPv4 s'
+                            then emptyNmcDom { domIp = Just [s'] }
+                            else emptyNmcDom
+                          where
+                            s' = T.unpack s
+                            isIPv4 x = all isNibble $ splitOn "." x
+                            isNibble x =
+                              if all isDigit x then (read x :: Int) < 256
+                              else False
         parseJSON (Object o) = NmcDom
                 <$> o .:? "service"
                 <*> o .:? "ip"