diff options
author | joe <joe@jerkface.net> | 2017-10-01 05:26:36 -0400 |
---|---|---|
committer | joe <joe@jerkface.net> | 2017-10-01 05:26:36 -0400 |
commit | d408e6c3148106c6dbc8afe24a1488619adf34e1 (patch) | |
tree | ca2d7a66b07dba82b6bf236fb234cac75bf87da6 /src/Network/Tox.hs | |
parent | f6f70dcfa25ddf10e3cf16745bdd082cc26b2fd6 (diff) |
Ability to send onion messages when given a path.
Diffstat (limited to 'src/Network/Tox.hs')
-rw-r--r-- | src/Network/Tox.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs index 8df1a09d..3c5fc955 100644 --- a/src/Network/Tox.hs +++ b/src/Network/Tox.hs | |||
@@ -192,7 +192,7 @@ newClient drg net classify selfAddr handlers modifynet = do | |||
192 | 192 | ||
193 | data Tox = Tox | 193 | data Tox = Tox |
194 | { toxDHT :: DHT.Client | 194 | { toxDHT :: DHT.Client |
195 | , toxOnion :: Onion.Client | 195 | , toxOnion :: Onion.Client RouteId |
196 | , toxCrypto :: Transport String SockAddr NetCrypto | 196 | , toxCrypto :: Transport String SockAddr NetCrypto |
197 | , toxRouting :: DHT.Routing | 197 | , toxRouting :: DHT.Routing |
198 | , toxTokens :: TVar SessionTokens | 198 | , toxTokens :: TVar SessionTokens |
@@ -237,7 +237,10 @@ newTox keydb addr = do | |||
237 | oniondrg <- drgNew | 237 | oniondrg <- drgNew |
238 | let onionnet = layerTransport (Onion.decrypt crypto) (Onion.encrypt crypto) onioncrypt | 238 | let onionnet = layerTransport (Onion.decrypt crypto) (Onion.encrypt crypto) onioncrypt |
239 | onionclient <- newClient oniondrg onionnet Onion.classify | 239 | onionclient <- newClient oniondrg onionnet Onion.classify |
240 | (const $ return $ either (const $ error "bad sockaddr") Onion.OnionDestination $ nodeInfo zeroID addr) | 240 | (const $ return |
241 | $ either (const $ error "bad sockaddr") | ||
242 | (flip Onion.OnionDestination Nothing) | ||
243 | $ nodeInfo zeroID addr) | ||
241 | (Onion.handlers onionnet routing toks keydb) | 244 | (Onion.handlers onionnet routing toks keydb) |
242 | (const id) | 245 | (const id) |
243 | return Tox | 246 | return Tox |