summaryrefslogtreecommitdiff
path: root/src/Network
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2017-11-01 13:57:59 -0400
committerjoe <joe@jerkface.net>2017-11-01 13:57:59 -0400
commitf4b3d84c81d962d5ff15dd99ee1815e5734b596d (patch)
tree386ffbff6ddfd35f2cb9938a83723a9631740b46 /src/Network
parent5e9273477eadb124ec984f0363c9e253b907d328 (diff)
parentaf3bb88ee1805d19264ff6f1e2c0874effac7d26 (diff)
Merge branch 'dht-rewrite' of jerkface.net:repo/bittorrent into dht-rewrite
Diffstat (limited to 'src/Network')
-rw-r--r--src/Network/Tox.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index f73de4e9..0400f14a 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -219,6 +219,7 @@ data Tox = Tox
219 , toxOnion :: Onion.Client RouteId 219 , toxOnion :: Onion.Client RouteId
220 , toxToRoute :: Transport String Onion.AnnouncedRendezvous (PublicKey,Onion.OnionData) 220 , toxToRoute :: Transport String Onion.AnnouncedRendezvous (PublicKey,Onion.OnionData)
221 , toxCrypto :: Transport String SockAddr NetCrypto 221 , toxCrypto :: Transport String SockAddr NetCrypto
222 , toxCryptoSessions :: NetCryptoSessions
222 , toxCryptoKeys :: TransportCrypto 223 , toxCryptoKeys :: TransportCrypto
223 , toxRouting :: DHT.Routing 224 , toxRouting :: DHT.Routing
224 , toxTokens :: TVar SessionTokens 225 , toxTokens :: TVar SessionTokens
@@ -319,6 +320,7 @@ newTox keydb addr mbSessionsState = do
319 , toxOnion = onionclient 320 , toxOnion = onionclient
320 , toxToRoute = onInbound (updateRoster roster) dtacrypt 321 , toxToRoute = onInbound (updateRoster roster) dtacrypt
321 , toxCrypto = addHandler (hPutStrLn stderr) (cryptoNetHandler sessionsState) cryptonet 322 , toxCrypto = addHandler (hPutStrLn stderr) (cryptoNetHandler sessionsState) cryptonet
323 , toxCryptoSessions = sessionsState
322 , toxCryptoKeys = crypto 324 , toxCryptoKeys = crypto
323 , toxRouting = routing 325 , toxRouting = routing
324 , toxTokens = toks 326 , toxTokens = toks