5 files changed, 53 insertions, 46 deletions

diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index d418f504..a7f1ae83 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -24,6 +24,7 @@ module Crypto.Tox
     , toPublic
     , SymmetricKey(..)
     , TransportCrypto(..)
+    , newCrypto
     , SecretsCache
     , newSecretsCache
     , Encrypted
@@ -105,6 +106,7 @@ import Crypto.Error.Types                     (CryptoFailable (..), throwCryptoE
 import Crypto.ECC
 import Crypto.Error
 #endif
+import Crypto.Random
 import Network.Socket (SockAddr)
 import GHC.Exts (Word(..),inline)
 import GHC.Generics (Generic)
@@ -118,6 +120,8 @@ import System.IO.Unsafe (unsafeDupablePerformIO)
 import Data.Functor.Compose
 import qualified Rank2
 import Data.Functor.Identity
+import DPut
+import DebugTag
 
 -- | A 16-byte mac and an arbitrary-length encrypted stream.
 newtype Encrypted a = Encrypted ByteString
@@ -658,3 +662,48 @@ xorsum bs = unsafeDupablePerformIO $ BA.withByteArray bs $ \ptr16 -> do
     loop (wcnt - 1) $ case r of
         0 -> 0
         _ -> 256 * fromIntegral (BA.index bs (BA.length bs - 1))
+
+showHex :: BA.ByteArrayAccess ba => ba -> String
+showHex bs = C8.unpack $ Base16.encode $ BA.convert bs
+
+newCrypto :: IO TransportCrypto
+newCrypto = do
+    secret <- generateSecretKey
+    alias <- generateSecretKey
+    ralias <- generateSecretKey
+    let pubkey    = toPublic secret
+        aliaspub  = toPublic alias
+        raliaspub = toPublic ralias
+    ukeys <- atomically $ newTVar []
+    (symkey, drg) <- do
+        drg0 <- getSystemDRG
+        return $ randomBytesGenerate 32 drg0 :: IO (ByteString, SystemDRG)
+    noncevar <- atomically $ newTVar $ fst $ withDRG drg drgNew
+    cookieKeys <- atomically $ newTVar []
+    cache <- newSecretsCache
+    dput XNetCrypto $ "secret(tox) = " ++ showHex secret
+    dput XNetCrypto $ "public(tox) = " ++ showHex pubkey
+    dput XNetCrypto $ "symmetric(tox) = " ++ showHex symkey
+    return TransportCrypto
+        { transportSecret = secret
+        , transportPublic = pubkey
+        , onionAliasSecret = alias
+        , onionAliasPublic = aliaspub
+        , rendezvousSecret = ralias
+        , rendezvousPublic = raliaspub
+        , transportSymmetric = return $ SymmetricKey symkey
+        , transportNewNonce = do
+            drg1 <- readTVar noncevar
+            let (nonce, drg2) = withDRG drg1 (Nonce24 <$> getRandomBytes 24)
+            writeTVar noncevar drg2
+            return nonce
+        , transportNewKey = do
+            drg1 <- readTVar noncevar
+            let (k, drg2) = withDRG drg1 generateSecretKey
+            writeTVar noncevar drg2
+            return k
+        , userKeys = return []
+        , pendingCookies = cookieKeys
+        , secretsCache = cache
+        }
+
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 30efefa8..37762eb8 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -66,51 +66,11 @@ import DPut
 import DebugTag
 import Network.Tox.Avahi
 import Network.Tox.Session
+import Network.Tox.Relay
 import Network.SessionTransports
 import Network.Kademlia.Search
 import HandshakeCache
 
-newCrypto :: IO TransportCrypto
-newCrypto = do
-    secret <- generateSecretKey
-    alias <- generateSecretKey
-    ralias <- generateSecretKey
-    let pubkey    = toPublic secret
-        aliaspub  = toPublic alias
-        raliaspub = toPublic ralias
-    ukeys <- atomically $ newTVar []
-    (symkey, drg) <- do
-        drg0 <- getSystemDRG
-        return $ randomBytesGenerate 32 drg0 :: IO (ByteString, SystemDRG)
-    noncevar <- atomically $ newTVar $ fst $ withDRG drg drgNew
-    cookieKeys <- atomically $ newTVar []
-    cache <- newSecretsCache
-    dput XNetCrypto $ "secret(tox) = " ++ DHT.showHex secret
-    dput XNetCrypto $ "public(tox) = " ++ DHT.showHex pubkey
-    dput XNetCrypto $ "symmetric(tox) = " ++ DHT.showHex symkey
-    return TransportCrypto
-        { transportSecret = secret
-        , transportPublic = pubkey
-        , onionAliasSecret = alias
-        , onionAliasPublic = aliaspub
-        , rendezvousSecret = ralias
-        , rendezvousPublic = raliaspub
-        , transportSymmetric = return $ SymmetricKey symkey
-        , transportNewNonce = do
-            drg1 <- readTVar noncevar
-            let (nonce, drg2) = withDRG drg1 (Nonce24 <$> getRandomBytes 24)
-            writeTVar noncevar drg2
-            return nonce
-        , transportNewKey = do
-            drg1 <- readTVar noncevar
-            let (k, drg2) = withDRG drg1 generateSecretKey
-            writeTVar noncevar drg2
-            return k
-        , userKeys = return []
-        , pendingCookies = cookieKeys
-        , secretsCache = cache
-        }
-
 updateIP :: TVar (R.BucketList NodeInfo) -> SockAddr -> STM ()
 updateIP tblvar a = do
     bkts <- readTVar tblvar
@@ -286,7 +246,8 @@ newTox keydb bindspecs onsess suppliedDHTKey tcp = do
             throwIO $ userError "Tox UDP listen port?"
     (udp,sock) <- foldr tryBind failedBind addrs Nothing
     addr <- getSocketName sock
-    tox <- newToxOverTransport keydb addr onsess suppliedDHTKey udp tcp
+    (relay,sendTCP) <- tcpRelay addr (\a x -> sendMessage udp a $ S.runPut $ Onion.putRequest x)
+    tox <- newToxOverTransport keydb addr onsess suppliedDHTKey udp sendTCP
     return tox { toxAnnounceToLan = announceToLan sock (key2id $ transportPublic $ toxCryptoKeys tox) }
 
 -- | This version of 'newTox' is useful for automated tests using 'testPairTransport'.
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index d7f05dbc..2062b51d 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -340,9 +340,6 @@ unpong :: Message -> Maybe (Asymm (Nonce8,Pong))
 unpong (DHTPong asymm) = Just asymm
 unpong _               = Nothing
 
-showHex :: BA.ByteArrayAccess ba => ba -> String
-showHex bs = C8.unpack $ Base16.encode $ BA.convert bs
-
 ping :: Client -> NodeInfo -> IO Bool
 ping client addr = do
     dput XPing $ show addr ++ " <-- ping"
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index f6d9ca31..3d8a9e93 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -51,6 +51,7 @@ module Network.Tox.Onion.Transport
     , RouteId(..)
     , routeId
     , rewrap
+    , putRequest
     ) where
 
 import Network.Address (fromSockAddr,toSockAddr,setPort,either4or6,sockAddrPort)
diff --git a/src/Network/Tox/Relay.hs b/src/Network/Tox/Relay.hs
index 17bbc379..7af14ed6 100644
--- a/src/Network/Tox/Relay.hs
+++ b/src/Network/Tox/Relay.hs
@@ -28,7 +28,6 @@ import Data.Tox.Relay
 import Network.Address (getBindAddress)
 import Network.SocketLike
 import Network.StreamServer
-import Network.Tox (newCrypto)
 import Network.Tox.Onion.Transport hiding (encrypt,decrypt)