1 files changed, 15 insertions, 15 deletions

diff --git a/Presence/Presence.hs b/Presence/Presence.hs
index 678a5c99..daa93716 100644
--- a/Presence/Presence.hs
+++ b/Presence/Presence.hs
@@ -369,7 +369,7 @@ rosterGetSubscribers :: PresenceState -> ConnectionKey -> IO [Text]
 rosterGetSubscribers = rosterGetStuff ConfigFiles.getSubscribers
 
 data Conn = Conn { connChan :: TChan Stanza
-                 , auxAddr :: SockAddr }
+                 , auxData  :: ConnectionData }
 
 -- Read config file as Text content rather than UTF8 bytestrings.
 configText :: Functor f =>
@@ -448,13 +448,13 @@ sendProbesAndSolicitations state k laddr chan = do
         atomically $ writeTChan chan stanza
     -- reverse xs `seq` return ()
 
-newConn :: PresenceState -> ConnectionKey -> SockAddr -> TChan Stanza -> IO ()
-newConn state k addr outchan = do
+newConn :: PresenceState -> ConnectionKey -> ConnectionData -> TChan Stanza -> IO ()
+newConn state k cdta outchan = do
     atomically $ modifyTVar' (keyToChan state)
         $ Map.insert k Conn { connChan = outchan
-                            , auxAddr  = addr }
+                            , auxData = cdta }
     when (isPeerKey k)
-        $ sendProbesAndSolicitations state k addr outchan
+        $ sendProbesAndSolicitations state k (cdAddr cdta) outchan
 
 delclient :: (Alternative m, Monad m) =>
            ConnectionKey -> m LocalPresence -> m LocalPresence
@@ -582,8 +582,8 @@ deliverMessage state fail msg =
         fromMaybe fail {- reverse lookup failure -} $ mto <&> \(to',addr) -> do
         let k = PeerKey addr
         chans <- atomically $ readTVar (keyToChan state)
-        fromMaybe fail $ (Map.lookup k chans) <&> \(Conn { connChan=chan
-                                                        , auxAddr=laddr }) -> do
+        fromMaybe fail $ (Map.lookup k chans) <&> \(Conn { connChan = chan
+                                                        , auxData = ConnectionData laddr ctyp }) -> do
         (n,r) <- forClient state senderk (return (Nothing,Nothing))
                         $ \c -> return (Just (clientUser c), Just (clientResource c))
         -- original 'from' address is discarded.
@@ -594,8 +594,8 @@ deliverMessage state fail msg =
       NetworkOrigin senderk@(PeerKey {}) _ -> do
         key_to_chan <- atomically $ readTVar (keyToChan state)
         fromMaybe fail $ (Map.lookup senderk key_to_chan)
-            <&> \(Conn { connChan=sender_chan
-                       , auxAddr=laddr }) -> do
+            <&> \(Conn { connChan = sender_chan
+                       , auxData  = ConnectionData laddr ctyp }) -> do
         fromMaybe fail $ (stanzaTo msg) <&> \to -> do
         (mine,(n,h,r)) <- rewriteJIDForClient laddr to []
         if not mine then fail else do
@@ -669,7 +669,7 @@ subscribedPeers user profile = do
 -- | this JID is suitable for peers, not clients.
 clientJID :: Conn -> ClientState -> Text
 clientJID con client = unsplitJID ( Just $ clientUser client
-                                  , addrToText $ auxAddr con
+                                  , addrToText $ cdAddr $ auxData con
                                   , Just $ clientResource client)
 
 -- | Send presence notification to subscribed peers.
@@ -790,9 +790,9 @@ answerProbe state mto k chan = do
         conn <- liftT $ Map.lookup k ktc
         let (mu,h,_) = splitJID to -- TODO: currently resource-id is ignored on presence
                                    --  probes.  Is this correct? Check the spec.
-        liftMT $ guardPortStrippedAddress h (auxAddr conn)
+        liftMT $ guardPortStrippedAddress h (cdAddr $ auxData conn)
         u <- liftT mu
-        let ch      = addrToText (auxAddr conn)
+        let ch      = addrToText (cdAddr $ auxData conn)
             profile = fromMaybe "." $ clientProfile <$> Map.lookup k cmap
         return (u,profile,conn,ch)
 
@@ -1004,7 +1004,7 @@ clientSubscriptionRequest state fail k stanza chan = do
             -- if already connected, send solicitation ...
             -- let from = clientJID con client
             let from = unsplitJID ( Just $ clientUser client
-                                  , addrToText $ auxAddr con
+                                  , addrToText $ cdAddr $ auxData con
                                   , Nothing )
             mb <- rewriteJIDForPeer to
             forM_ mb $ \(to',addr) -> do
@@ -1061,7 +1061,7 @@ peerSubscriptionRequest state fail k stanza chan = do
     (ktc,cmap) <- atomically $ (,) <$> readTVar (keyToChan state)
                                    <*> readTVar (clients state)
     fromMaybe fail $ (Map.lookup k ktc)
-        <&> \Conn { auxAddr=laddr } -> do
+        <&> \Conn { auxData=ConnectionData laddr ctyp } -> do
     (mine,totup) <- rewriteJIDForClient laddr to []
     if not mine then fail else do
     (_,fromtup) <- rewriteJIDForClient laddr from []
@@ -1205,7 +1205,7 @@ peerInformSubscription state fail k stanza = do
                                    <*> readTVar (clients state)
     fromMaybe fail $ (Map.lookup k ktc)
         <&> \(Conn { connChan=sender_chan
-                   , auxAddr=laddr }) -> do
+                   , auxData =ConnectionData laddr ctyp }) -> do
     (_,(from_u,from_h,_)) <- rewriteJIDForClient laddr from []
     let from'' = unsplitJID (from_u,from_h,Nothing)
         muser = do