XMPP: Type-checking on various uses of SockAddr.

1 files changed, 11 insertions, 9 deletions

diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index e3c6fb36..3a732b43 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -278,6 +278,16 @@ b64digit '-' = True
 b64digit '/' = True
 b64digit c = ('0' <= c && c <= '9') || ( 'a' <= c && c <= 'z') || ( 'A' <= c && c <= 'Z')
 
+ip_w_port :: Int -> RP.ReadP (IP, PortNumber)
+ip_w_port i = do
+            ip <- RP.between (RP.char '[') (RP.char ']')
+                         (IPv6 <$> RP.readS_to_P (readsPrec i))
+                  RP.+++ (IPv4 <$> RP.readS_to_P (readsPrec i))
+            _    <- RP.char ':'
+            port <- toEnum <$> RP.readS_to_P (readsPrec i)
+            return (ip, port)
+
+
 instance Read NodeInfo where
   readsPrec i = RP.readP_to_S $ do
     RP.skipSpaces
@@ -292,15 +302,7 @@ instance Read NodeInfo where
                               _                              -> fail "Bad node id."
                       return (nid,addrstr)
     (nid,addrstr) <- ( nodeidAt RP.+++ ( (zeroID,) <$> parseAddr) )
-    let raddr = do
-            ip <- RP.between (RP.char '[') (RP.char ']')
-                         (IPv6 <$> RP.readS_to_P (readsPrec i))
-                  RP.+++ (IPv4 <$> RP.readS_to_P (readsPrec i))
-            _    <- RP.char ':'
-            port <- toEnum <$> RP.readS_to_P (readsPrec i)
-            return (ip, port)
-
-    (ip,port) <- case RP.readP_to_S raddr addrstr of
+    (ip,port) <- case RP.readP_to_S (ip_w_port i) addrstr of
                     [] -> fail "Bad address."
                     ((ip,port),_):_ -> return (ip,port)
     return $ NodeInfo nid ip port