1 files changed, 2 insertions, 51 deletions

diff --git a/xmppServer.hs b/xmppServer.hs
index 3752218a..f7f7fb36 100644
--- a/xmppServer.hs
+++ b/xmppServer.hs
@@ -7,14 +7,7 @@ import Control.Concurrent.STM.TMVar
 import Control.Monad.Trans.Resource (runResourceT)
 import Control.Monad.Trans
 import Control.Monad.IO.Class (MonadIO, liftIO)
-import Network.Socket
-    ( addrAddress
-    , getAddrInfo
-    , defaultHints
-    , addrFlags
-    , AddrInfoFlag(AI_CANONNAME,AI_V4MAPPED,AI_NUMERICHOST)
-    , SockAddr(..)
-    )
+import Network.Socket ( SockAddr(..) )
 import System.Endian (fromBE32)
 import Data.List (nub, (\\), intersect, groupBy, sort )
 import Data.Monoid ( (<>) )
@@ -40,6 +33,7 @@ import TraversableT
 import UTmp (ProcessID,users)
 import LocalPeerCred
 import XMPPServer
+import PeerResolve
 
 type UserName = Text
 type ResourceName = Text
@@ -142,42 +136,6 @@ data PresenceState = PresenceState
     }
 
 
-make6mapped4 addr@(SockAddrInet6 {}) = addr
-make6mapped4 addr@(SockAddrInet port a) = SockAddrInet6 port 0 (0,0,0xFFFF,fromBE32 a) 0
-
-resolvePeer :: Text -> IO [SockAddr]
-resolvePeer addrtext = do
-    r <- atomically newEmptyTMVar
-    mvar <- atomically newEmptyTMVar
-    rt <- forkOS $ resolver r mvar
-    tt <- forkIO $ timer r rt
-    atomically $ putTMVar mvar tt
-    atomically $ readTMVar r
- where
-    resolver r mvar = do
-      xs <- handle (\e -> let _ = isDoesNotExistError e in return [])
-            $ do fmap (map $ make6mapped4 . addrAddress) $ 
-                  getAddrInfo (Just $ defaultHints { addrFlags = [ AI_CANONNAME, AI_V4MAPPED ]})
-                    (Just $ Text.unpack $ strip_brackets addrtext)
-                    (Just "5269")
-      did <- atomically $ tryPutTMVar r xs
-      when did $ do
-      tt <- atomically $ readTMVar mvar
-      throwTo tt (ErrorCall "Interrupted delay")
-      return ()
-    timer r rt = do
-      handle (\(ErrorCall _)-> return ()) $ do
-      threadDelay 1000000
-      did <- atomically $ tryPutTMVar r []
-      when did $ do
-      putStrLn $ "timeout resolving: "++show addrtext
-      killThread rt
-
-strip_brackets s = 
-    case Text.uncons s of
-      Just ('[',t) -> Text.takeWhile (/=']') t
-      _            -> s
-
 
 getConsolePids :: PresenceState -> IO [(Text,ProcessID)]
 getConsolePids state = do
@@ -376,13 +334,6 @@ rewriteJIDForClient1 jid = do
         return $ Just ((n,h',r), addr)
 -}
 
-parseAddress :: Text -> IO (Maybe SockAddr)
-parseAddress addr_str = do
-    info <- getAddrInfo (Just $ defaultHints { addrFlags = [ AI_NUMERICHOST ] }) 
-                        (Just . Text.unpack $ addr_str) 
-                        (Just "0")
-    return . listToMaybe $ map addrAddress info
-
 todo = error "Unimplemented"