1 files changed, 12 insertions, 4 deletions

diff --git a/dht/src/Network/Tox/NodeId.hs b/dht/src/Network/Tox/NodeId.hs
index 9a9c893a..e0169199 100644
--- a/dht/src/Network/Tox/NodeId.hs
+++ b/dht/src/Network/Tox/NodeId.hs
@@ -39,6 +39,7 @@ module Network.Tox.NodeId
     , ToxProgress(..)
     , parseToken32
     , showToken32
+    , nodeInfoFromJSON
     ) where
 
 import Control.Applicative
@@ -52,7 +53,7 @@ import Crypto.Error
 #endif
 
 import Crypto.PubKey.Curve25519
-import qualified Data.Aeson                   as JSON
+import qualified Data.Aeson.Types             as JSON
          ;import Data.Aeson                   (FromJSON, ToJSON, (.=))
 import Data.Bits.ByteString                   ()
 import qualified Data.ByteArray               as BA
@@ -251,13 +252,20 @@ instance ToJSON NodeInfo where
                         , "port" .= (fromIntegral port :: Int)
                         ]
 instance FromJSON NodeInfo where
-    parseJSON (JSON.Object v) = do
+    parseJSON = nodeInfoFromJSON False
+
+nodeInfoFromJSON :: Bool -> JSON.Value
+                         -> JSON.Parser NodeInfo
+nodeInfoFromJSON prefer4 (JSON.Object v) = do
         nidstr <- v JSON..: "public_key"
         ip6str <- v JSON..:? "ipv6"
         ip4str <- v JSON..:? "ipv4"
         portnum <- v JSON..: "port"
-        ip <- maybe empty (return . IPv6) (ip6str >>= readMaybe)
-              <|> maybe empty (return . IPv4) (ip4str >>= readMaybe)
+        ip <- if prefer4
+                then maybe empty (return . IPv4) (ip4str >>= readMaybe)
+                      <|> maybe empty (return . IPv6) (ip6str >>= readMaybe)
+                else maybe empty (return . IPv6) (ip6str >>= readMaybe)
+                      <|> maybe empty (return . IPv4) (ip4str >>= readMaybe)
         let (bs,_) = Base16.decode (C8.pack nidstr)
             enid   = Base64.decode (C8.pack $ 'A' : map (nmtoken64 False) nidstr)
         idbs <- (guard (B.length bs == 32) >> return bs)