Do-nothing tox-to-xmpp conversion conduits.

1 files changed, 5 insertions, 10 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 6a7695d2..553146f7 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -1495,29 +1495,26 @@ toxman announcer toxbkts tox presence = ToxManager
         _ -> return () -- Remove contact.
     }
 
-#ifdef XMPP
-
 -- | Called upon a new Tox friend-connection session with a remote peer in
 -- order to set up translating conduits that simulate a remote XMPP server.
-announceToxJabberPeer :: TChan ((ConnectionKey,SockAddr), Tcp.ConnectionEvent XML.Event)
+announceToxJabberPeer :: PublicKey -- ^ Remote tox node's long-term user key.
+                      -> TChan ((ConnectionKey,SockAddr), Tcp.ConnectionEvent XML.Event)
                       -> SockAddr -- ^ Local bind address for incoming Tox packets.
                       -> SockAddr -- ^ Remote address for this connection.
                       -> STM Bool
                       -> C.Source IO Tox.CryptoMessage
                       -> C.Sink (Flush Tox.CryptoMessage) IO ()
                       -> IO (Maybe (Tox.NetCryptoSession -> Tox.NetCryptoSession))
-announceToxJabberPeer echan laddr saddr pingflag tsrc tsnk
+announceToxJabberPeer them echan laddr saddr pingflag tsrc tsnk
     = do
      atomically $ writeTChan echan
         ( (PeerKey saddr, laddr )
         , Tcp.Connection pingflag xsrc xsnk )
      return Nothing
  where
-    xsrc = tsrc =$= toxToXmpp
+    xsrc = tsrc =$= toxToXmpp (T.pack $ show them ++ ".tox")
     xsnk = flushPassThrough xmppToTox =$= tsnk
 
-#endif
-
 vShowMe :: Tox.ViewSnapshot -> Int -> B.ByteString
 vShowMe (Tox.ViewSnapshot { vNick, vStatus, vStatusMsg, vTyping }) indent
     = B.unlines
@@ -1898,14 +1895,12 @@ main = runResourceT $ liftBaseWith $ \resT -> do
             let Just pingMachine = Tox.ncPingMachine netcrypto
                 pingflag         = readTVar (pingFlag pingMachine)
                 receiveCrypto    = atomically $ readTMChan tmchan
-#ifdef XMPP
                 onEOF            = return () -- TODO: Update toxContactInfo, not connected.
                 xmppSrc          = ioToSource receiveCrypto onEOF
                 xmppSink         = newXmmpSink netcrypto
             forM_ msv $ \sv -> do
-                announceToxJabberPeer (xmppEventChannel sv) addrTox (Tox.ncSockAddr netcrypto) pingflag xmppSrc xmppSink
+                announceToxJabberPeer (Tox.ncTheirPublicKey netcrypto) (xmppEventChannel sv) addrTox (Tox.ncSockAddr netcrypto) pingflag xmppSrc xmppSink
             -- TODO: Update toxContactInfo, connected.
-#endif
             atomically $ do
                 supply <- readTVar (Tox.listenerIDSupply netCryptoSessionsState)
                 let (listenerId,supply') = freshId supply