Ability to send onion messages when given a path.

1 files changed, 14 insertions, 4 deletions

diff --git a/src/Network/Tox/Transport.hs b/src/Network/Tox/Transport.hs
index d99b6713..d441dc0a 100644
--- a/src/Network/Tox/Transport.hs
+++ b/src/Network/Tox/Transport.hs
@@ -6,7 +6,7 @@
 {-# LANGUAGE ScopedTypeVariables        #-}
 {-# LANGUAGE TupleSections              #-}
 {-# LANGUAGE TypeOperators              #-}
-module Network.Tox.Transport (toxTransport) where
+module Network.Tox.Transport (toxTransport, RouteId) where
 
 import Network.QueryResponse
 import Crypto.Tox
@@ -16,16 +16,26 @@ import Network.Tox.Crypto.Transport
 
 import Network.Socket
 
+type RouteId = () -- todo
+
+lookupSender :: SockAddr -> Nonce8 -> IO (Maybe (NodeInfo, RouteId))
+lookupSender _ _ = return Nothing -- todo
+
+lookupRoute :: NodeInfo -> RouteId -> IO (Maybe OnionRoute)
+lookupRoute _ _ = return Nothing -- todo
+
 toxTransport ::
       TransportCrypto
           -> (PublicKey -> IO (Maybe NodeInfo))
           -> UDPTransport
           -> IO ( Transport String NodeInfo (DHTMessage Encrypted8)
-                , Transport String OnionDestination (OnionMessage Encrypted)
+                , Transport String (OnionDestination RouteId) (OnionMessage Encrypted)
                 , Transport String SockAddr NetCrypto )
 toxTransport crypto closeLookup udp = do
-    (dht,udp1) <- partitionTransport parseDHTAddr encodeDHTAddr id $ forwardOnions crypto udp
-    (onion,udp2) <- partitionTransport parseOnionAddr encodeOnionAddr id udp1
+    (dht,udp1) <- partitionTransport parseDHTAddr (Just . encodeDHTAddr) $ forwardOnions crypto udp
+    (onion,udp2) <- partitionTransportM (parseOnionAddr lookupSender)
+                                        (encodeOnionAddr lookupRoute)
+                                        udp1
     let netcrypto = layerTransport parseNetCrypto encodeNetCrypto udp2
     return ( forwardDHTRequests crypto closeLookup dht
            , onion