1 files changed, 0 insertions, 63 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index f607989d..ff50ab1c 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -67,9 +67,6 @@ import qualified Data.Set as Set
 import GetHostByAddr
 import XMPPTypes
 
-is_remote (RemotePeer _) = True
-is_remote _              = False
-
 getNamesForPeer :: Peer -> IO [ByteString]
 getNamesForPeer LocalHost = fmap ((:[]) . pack) getHostName
 getNamesForPeer peer@(RemotePeer addr) = do
@@ -85,10 +82,6 @@ getNamesForPeer peer@(RemotePeer addr) = do
     return . map pack $ names
 
 
-peerAddr :: Peer -> SockAddr
-peerAddr (RemotePeer addr) = addr
--- peerAddr LocalHost = throw exception
-
 
 xmlifyPresenceForPeer sock (Presence jid stat) = do
     -- TODO: accept socket argument and determine local ip address
@@ -587,62 +580,6 @@ connect_to_server chan peer = (>> return ()) . runMaybeT $ do
         L.putStrLn $ "OUT peer: </stream>"
 
 
-splitJID :: ByteString -> (Maybe ByteString,ByteString,Maybe ByteString)
-splitJID bjid = 
-    let xs = L.splitWith (=='@') bjid
-        ys = L.splitWith (=='/') (last xs)
-        server = head ys
-        name
-            = case xs of
-                (n:s:_) -> Just n
-                (s:_)   -> Nothing
-        rsrc = case ys of
-                (s:_:_) -> Just $ last ys
-                _       -> Nothing
-    in (name,server,rsrc)
-
-strip_brackets s = 
-    case L.uncons s of
-      Just ('[',t) -> L.takeWhile (/=']') t
-      _            -> s
-
-parseAddressJID :: ByteString -> IO JID
-parseAddressJID jid = do
-    let (name,peer_string,rsc) = splitJID jid
-        hints = Just $ defaultHints { addrFlags = [ {- AI_NUMERICHOST, -} AI_CANONNAME ] }
-        peer_string' = unpack . strip_brackets $ peer_string
-    peer <- do
-        -- putStrLn $ "getAddrInfo 2 " ++ Prelude.show ( Just (unpack peer_string))
-        info <- getAddrInfo hints (Just peer_string') Nothing -- (Just "xmpp-server")
-        let info0 = head info
-        return . RemotePeer . addrAddress $ info0
-    return $ JID name peer rsc
-
-parseHostNameJID :: ByteString -> IO JID
-parseHostNameJID jid = do
-    let (name,peer_string,rsc) = splitJID jid
-        hints = Just $ defaultHints { addrFlags = [ AI_CANONNAME ] }
-    peer <- do
-        if peer_string=="localhost"
-          then return LocalHost
-          else do
-            -- putStrLn $ "getAddrInfo 3 " ++ Prelude.show ( Just (unpack peer_string))
-            info <- getAddrInfo hints (Just (unpack peer_string)) Nothing -- (Just "xmpp-server")
-            let info0 = head info
-                cname = addrCanonName info0
-            if cname==Just "localhost"
-              then return LocalHost
-              else do
-                self <- getHostName
-                return $ if Just self==cname
-                          then LocalHost 
-                          else RemotePeer (addrAddress info0)
-    return $ JID name peer rsc
-
-socketFamily (SockAddrInet _ _)      = AF_INET
-socketFamily (SockAddrInet6 _ _ _ _) = AF_INET6
-socketFamily (SockAddrUnix _)        = AF_UNIX
-
 connect' :: SockAddr -> Int -> IO (Maybe Socket)
 connect' addr port = do
     proto <- getProtocolNumber "tcp"