1 files changed, 11 insertions, 0 deletions

diff --git a/dht/src/Network/Tox/Onion/Transport.hs b/dht/src/Network/Tox/Onion/Transport.hs
index e746c414..407cd387 100644
--- a/dht/src/Network/Tox/Onion/Transport.hs
+++ b/dht/src/Network/Tox/Onion/Transport.hs
@@ -38,15 +38,19 @@ module Network.Tox.Onion.Transport
     , wrapSymmetric
     , wrapOnion
     , wrapOnionPure
+    , unwrapAnnounceResponse
     ) where
 
 import Data.ByteString (ByteString)
+import Data.Maybe
 import Data.Serialize
 import Network.Socket
 
 import Crypto.Tox hiding (encrypt,decrypt)
+import Network.Tox.TCP.NodeId (udpNodeInfo)
 import qualified Data.Tox.Relay as TCP
 import Data.Tox.Onion
+import Network.Tox.DHT.Transport (SendNodes(..))
 import Network.Tox.NodeId
 
 {-
@@ -117,3 +121,10 @@ wrapForRoute crypto msg ni r@OnionRoute{routeRelayPort = Just tcpport} = do
                              (nodeAddr ni)
                              (NotForwarded msg)
     return $ Left $ TCP.OnionPacket nonce $ Addressed (nodeAddr $ routeNodeB r) fwd
+
+unwrapAnnounceResponse :: Maybe NodeId -> NodeInfo -> AnnounceResponse -> ([NodeInfo], [Rendezvous], Maybe Nonce32)
+unwrapAnnounceResponse alias ni (AnnounceResponse is_stored (SendNodes ns0)) | let ns = map udpNodeInfo ns0
+    = case is_stored of
+        NotStored n32    -> ( ns , []                                                        , Just n32)
+        SendBackKey k    -> ( ns , [Rendezvous k ni]                                         , Nothing )
+        Acknowledged n32 -> ( ns , maybeToList $ fmap (\k -> Rendezvous (id2key k) ni) alias , Just n32)