1 files changed, 12 insertions, 8 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 3f9685cf..35035372 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -1009,10 +1009,14 @@ clientSession s@Session{..} sock cnum h = do
                                                       (const method)
                                                       announceSendData)
                                               dhtQuery
-                            doit :: Char -> Announcer -> AnnounceKey -> AnnounceMethod r -> r -> IO ()
-                            doit '+' = schedule
-                            doit '-' = \a k _ _ -> cancel a k
-                            doit _   = \_ _ _ _ -> hPutClientChunk h "Starting(+) or canceling(-)?"
+                            doitR :: Char -> Announcer -> AnnounceKey -> AnnounceMethod r -> r -> IO ()
+                            doitR '+' = scheduleAnnounce
+                            doitR '-' = \a k _ _ -> cancel a k
+                            doitR _   = \_ _ _ _ -> hPutClientChunk h "Starting(+) or canceling(-)?"
+                            doitL :: Char -> Announcer -> AnnounceKey -> SearchMethod r -> r -> IO ()
+                            doitL '+' = scheduleSearch
+                            doitL '-' = \a k _ _ -> cancel a k
+                            doitL _   = \_ _ _ _ -> hPutClientChunk h "Starting(+) or canceling(-)?"
                             matchingResult ::
                                 ( Typeable stok
                                 , Typeable ptok
@@ -1046,9 +1050,9 @@ clientSession s@Session{..} sock cnum h = do
                                 dta <- either (const Nothing) Just $ announceParseData dtastr
                                 return $ do
                                     akey <- atomically $ packAnnounceKey announcer (method ++ ":" ++ dtastr)
-                                    doit op announcer
+                                    doitR op announcer
                                             akey
-                                            (AnnounceMethod qsearch (Right asend)
+                                            (AnnounceMethod qsearch asend
                                                             (\nid -> R.kclosest (searchSpace qsearch)
                                                                                 searchK
                                                                                 nid
@@ -1072,9 +1076,9 @@ clientSession s@Session{..} sock cnum h = do
                                 pub <- selectedKey
                                 return $ do
                                     akey <- atomically $ packAnnounceKey announcer (method ++ ":" ++ dtastr)
-                                    doit op announcer
+                                    doitL op announcer
                                             akey
-                                            (AnnounceMethod qsearch (Left $ asend pub)
+                                            (SearchMethod qsearch (asend pub)
                                                             (\nid -> R.kclosest (searchSpace qsearch)
                                                                                 searchK
                                                                                 nid