diff options
Diffstat (limited to 'dht/src/Network/Tox/Transport.hs')
-rw-r--r-- | dht/src/Network/Tox/Transport.hs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/dht/src/Network/Tox/Transport.hs b/dht/src/Network/Tox/Transport.hs index 55e31e2a..b017f7be 100644 --- a/dht/src/Network/Tox/Transport.hs +++ b/dht/src/Network/Tox/Transport.hs | |||
@@ -43,7 +43,6 @@ toxTransport :: | |||
43 | -> IO ( Transport String Multi.SessionAddress (CryptoPacket Encrypted) | 43 | -> IO ( Transport String Multi.SessionAddress (CryptoPacket Encrypted) |
44 | , Transport String Multi.NodeInfo (DHTMessage Encrypted8) | 44 | , Transport String Multi.NodeInfo (DHTMessage Encrypted8) |
45 | , Transport String (OnionDestination RouteId) (OnionMessage Encrypted) | 45 | , Transport String (OnionDestination RouteId) (OnionMessage Encrypted) |
46 | , Transport String AnnouncedRendezvous (PublicKey,OnionData) | ||
47 | , Transport String Multi.SessionAddress (Handshake Encrypted)) | 46 | , Transport String Multi.SessionAddress (Handshake Encrypted)) |
48 | toxTransport crypto orouter closeLookup addr udp relaynet _ tcp2client = do | 47 | toxTransport crypto orouter closeLookup addr udp relaynet _ tcp2client = do |
49 | (netcrypto, udp0) <- partitionTransport parseCrypto encodeCrypto udp | 48 | (netcrypto, udp0) <- partitionTransport parseCrypto encodeCrypto udp |
@@ -61,11 +60,10 @@ toxTransport crypto orouter closeLookup addr udp relaynet _ tcp2client = do | |||
61 | [ Multi.UDP :=> ByAddress dhtUDP | 60 | [ Multi.UDP :=> ByAddress dhtUDP |
62 | , Multi.TCP :=> ByAddress dhtTCP | 61 | , Multi.TCP :=> ByAddress dhtTCP |
63 | ] | 62 | ] |
64 | (onion1,udp2) <- partitionTransportM | 63 | (onion,udp2) <- partitionTransportM |
65 | (parseOnionAddr $ lookupSender orouter) | 64 | (parseOnionAddr $ lookupSender orouter) |
66 | (encodeOnionAddr crypto $ lookupRoute orouter) | 65 | (encodeOnionAddr crypto $ lookupRoute orouter) |
67 | udp1 | 66 | udp1 |
68 | (dta,onion) <- partitionTransportM (parseDataToRoute crypto) (encodeDataToRoute crypto) onion1 | ||
69 | multi_netcrypto <- mergeTransports $ DMap.fromList | 67 | multi_netcrypto <- mergeTransports $ DMap.fromList |
70 | [ Multi.SessionUDP :=> ByAddress netcrypto | 68 | [ Multi.SessionUDP :=> ByAddress netcrypto |
71 | , Multi.SessionTCP :=> ByAddress netcryptoTCP ] | 69 | , Multi.SessionTCP :=> ByAddress netcryptoTCP ] |
@@ -77,7 +75,6 @@ toxTransport crypto orouter closeLookup addr udp relaynet _ tcp2client = do | |||
77 | return ( multi_netcrypto | 75 | return ( multi_netcrypto |
78 | , forwardDHTRequests crypto (fmap (fmap (Multi.UDP ==>)) . closeLookup) dht | 76 | , forwardDHTRequests crypto (fmap (fmap (Multi.UDP ==>)) . closeLookup) dht |
79 | , onion | 77 | , onion |
80 | , dta | ||
81 | , multi_handshakes | 78 | , multi_handshakes |
82 | ) | 79 | ) |
83 | 80 | ||