1 files changed, 25 insertions, 3 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 74e08073..4b79b132 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -861,10 +861,32 @@ clientSession s@Session{..} sock cnum h = do
                 Just mypubkey -> do
                     let nidstr = strp s
                         goParse = either
-                                         (hPutClient h . ("Bad netcrypto target: "++))
-                                         (goTarget . Tox.id2key)
+                                         (\_ -> either (hPutClient h . ("Bad netcrypto target: "++))
+                                                 (goTarget . Left)
+                                                 (readEither nidstr))
+                                         (goTarget . Right  . Tox.id2key)
                                          $ readEither nidstr
-                        goTarget nid = do
+                        goTarget (Left nodeinfo) = do
+                            msec <- atomically $ do
+                                ks <- map swap <$> readKeys userkeys (accounts roster)
+                                return $ Data.List.lookup mypubkey ks
+                            case mbTox of
+                                Nothing -> hPutClient h "Requires Tox enabled."
+                                Just tox-> do
+                                    case msec of
+                                        Nothing -> hPutClient h "Error getting secret key"
+                                        Just sec -> do
+                                            let nid = Tox.nodeId nodeinfo
+                                                naddr = Tox.nodeAddr nodeinfo
+                                            let acsVar = accounts (Tox.toxContactInfo tox)
+                                            acsmap <- atomically $ readTVar acsVar
+                                            case HashMap.lookup (Tox.key2id mypubkey) acsmap of
+                                                Nothing -> hPutClient h "Unable to find account for selected key"
+                                                Just account -> do
+                                                    atomically $ setContactAddr (Tox.id2key nid) naddr account
+                                                    Tox.netCrypto tox sec (Tox.id2key nid)
+                                                    hPutClient h "Handshake sent"
+                        goTarget (Right nid) = do
                             msec <- atomically $ do
                                 ks <- map swap <$> readKeys userkeys (accounts roster)
                                 return $ Data.List.lookup mypubkey ks