3 files changed, 29 insertions, 10 deletions

diff --git a/avahi.hs b/avahi.hs
index 2db3be71..aeb8138f 100644
--- a/avahi.hs
+++ b/avahi.hs
@@ -9,6 +9,6 @@ exampleNodeId = read $ replicate 43 'a'
 main :: IO ()
 main = do
   [hostname, port, nodeId] <- getArgs
-  void $ announceToxService hostname (fromMaybe 54321 $ readMaybe port) (fromMaybe exampleNodeId $ readMaybe nodeId)
-  void $ queryToxService print
+  void $ forkIO $ announceToxServiceWithHostname hostname (fromMaybe 54321 $ readMaybe port) (fromMaybe exampleNodeId $ readMaybe nodeId)
+  void $ forkIO $ queryToxService print
   void $ getLine
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 3c3bce49..170a07e8 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE DeriveFoldable             #-}
@@ -19,7 +20,11 @@ import Debug.Trace
 import Control.Exception hiding (Handler)
 import Control.Applicative
 import Control.Arrow
-import Control.Concurrent                     (MVar,killThread)
+#ifdef THREAD_DEBUG
+import Control.Concurrent.Lifted.Instrument
+#else
+import Control.Concurrent.Lifted
+#endif
 import Control.Concurrent.STM
 import Control.Monad
 import Control.Monad.Fix
@@ -113,7 +118,7 @@ import Data.HashMap.Strict (HashMap)
 import qualified Data.Map.Strict as Map
 import Control.Concurrent (threadDelay)
 import DPut
-
+import Network.Tox.Avahi
 
 newCrypto :: IO TransportCrypto
 newCrypto = do
@@ -476,6 +481,17 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
 onionTimeout :: Tox -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)
 onionTimeout Tox { toxOnionRoutes = or } (DHT.TransactionId n8 _) od = lookupTimeout or n8 od
 
+routing4nodeInfo :: DHT.Routing -> IO NodeInfo
+routing4nodeInfo (DHT.routing4 -> tv) = R.thisNode <$> readTVarIO tv
+
+dnssdAnnounce :: Tox -> IO ()
+dnssdAnnounce (toxRouting -> r) = do
+    ni <- routing4nodeInfo r
+    announceToxService (nodePort ni) (nodeId ni)
+
+dnssdDiscover :: Tox -> NodeInfo -> IO ()
+dnssdDiscover (toxDHT -> client) ni = void $ DHT.ping client ni
+
 forkTox :: Tox -> IO (IO (), [NodeInfo] -> [NodeInfo] -> IO (), [NodeInfo] -> [NodeInfo] -> IO ())
 forkTox tox = do
     _ <- forkListener "toxHandshakes" (toxHandshakes tox)
@@ -485,6 +501,8 @@ forkTox tox = do
     quit <- forkListener "toxCrypto" (toxCrypto tox)
     forkPollForRefresh (DHT.refresher4 $ toxRouting tox)
     forkPollForRefresh (DHT.refresher6 $ toxRouting tox)
+    dnssdIn <- forkIO $ queryToxService (dnssdDiscover tox)
+    dnssdOut <- forkIO $ dnssdAnnounce tox
     keygc <- Onion.forkAnnouncedKeysGC (toxAnnouncedKeys tox)
     return ( killThread keygc >> quit
            , bootstrap (DHT.refresher4 $ toxRouting tox)
diff --git a/src/Network/Tox/Avahi.hs b/src/Network/Tox/Avahi.hs
index ba5138bc..ed52de74 100644
--- a/src/Network/Tox/Avahi.hs
+++ b/src/Network/Tox/Avahi.hs
@@ -5,12 +5,11 @@ module Network.Tox.Avahi
   , NodeInfo(..)
   , NodeId(..)
   ) where
+
 import           Data.Foldable
-import           GHC.Conc.Sync
 import           GHC.Word           (Word16)
 import           Network.Address
 import           Network.Avahi
-import           Network.Avahi
 import           Network.Socket
 import           Network.Tox.NodeId
 import           Text.Read
@@ -37,12 +36,14 @@ toxService hostname (fromIntegral -> port) (show -> extra) =
     serviceText     = extra
   }
 
-announceToxService :: String -> PortNumber -> NodeId -> IO ThreadId
-announceToxService = ((.).(.).(.)) (forkIO . announce) toxService
+announceToxServiceWithHostname :: String -> PortNumber -> NodeId -> IO ()
+announceToxServiceWithHostname  = ((.).(.).(.)) announce toxService
+
+announceToxService :: PortNumber -> NodeId -> IO ()
+announceToxService = announceToxServiceWithHostname ""
 
-queryToxService :: (NodeInfo -> IO ()) -> IO ThreadId
+queryToxService :: (NodeInfo -> IO ()) -> IO ()
 queryToxService cb =
-  forkIO $
   browse $
   BrowseQuery
   { lookupProtocol    = PROTO_UNSPEC