From c1fff94d244d6754a0976d0385d4333249fc5ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Thu, 16 Dec 2021 21:30:06 +0100
Subject: Remove unnecessary self identity parameters

---
 src/Discovery.hs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/Discovery.hs')

diff --git a/src/Discovery.hs b/src/Discovery.hs
index aedfda4..f419eab 100644
--- a/src/Discovery.hs
+++ b/src/Discovery.hs
@@ -121,11 +121,10 @@ instance Service DiscoveryService where
         DiscoveryAcknowledged addr -> do
             when (addr == T.pack "ICE") $ do
                 -- keep-alive packet from behind NAT
-                self <- svcSelf
                 peer <- asks svcPeer
                 liftIO $ void $ forkIO $ do
                     threadDelay (keepaliveSeconds * 1000 * 1000)
-                    res <- runExceptT $ sendToPeer self peer $ DiscoverySelf addr 0
+                    res <- runExceptT $ sendToPeer peer $ DiscoverySelf addr 0
                     case res of
                         Right _ -> return ()
                         Left err -> putStrLn $ "Discovery: failed to send keep-alive: " ++ err
@@ -146,7 +145,7 @@ instance Service DiscoveryService where
                     peer <- asks svcPeer
                     ice <- liftIO $ iceCreate PjIceSessRoleControlling $ \ice -> do
                         rinfo <- iceRemoteInfo ice
-                        res <- runExceptT $ sendToPeer self peer $
+                        res <- runExceptT $ sendToPeer peer $
                             DiscoveryConnectionRequest (emptyConnection (storedRef $ idData self) ref) { dconnIceSession = Just rinfo }
                         case res of
                             Right _ -> return ()
@@ -175,7 +174,7 @@ instance Service DiscoveryService where
                     peer <- asks svcPeer
                     liftIO $ void $ iceCreate PjIceSessRoleControlled $ \ice -> do
                         rinfo <- iceRemoteInfo ice
-                        res <- runExceptT $ sendToPeer self peer $ DiscoveryConnectionResponse rconn { dconnIceSession = Just rinfo }
+                        res <- runExceptT $ sendToPeer peer $ DiscoveryConnectionResponse rconn { dconnIceSession = Just rinfo }
                         case res of
                             Right _ -> do
                                 case dconnIceSession conn of
@@ -191,7 +190,7 @@ instance Service DiscoveryService where
                         Just dp | Just addr <- dpAddress dp -> do
                                     replyPacket $ DiscoveryConnectionResponse rconn { dconnAddress = Just addr }
                                 | Just dpeer <- dpPeer dp -> do
-                                    sendToPeer self dpeer $ DiscoveryConnectionRequest conn
+                                    sendToPeer dpeer $ DiscoveryConnectionRequest conn
                                 | otherwise -> svcPrint $ "Discovery: failed to relay connection request"
 
         DiscoveryConnectionResponse conn -> do
@@ -219,5 +218,5 @@ instance Service DiscoveryService where
                     -- response to relayed request
                     case M.lookup (refDigest $ dconnSource conn) dpeers of
                         Just dp | Just dpeer <- dpPeer dp -> do
-                            sendToPeer self dpeer $ DiscoveryConnectionResponse conn
+                            sendToPeer dpeer $ DiscoveryConnectionResponse conn
                         _ -> svcPrint $ "Discovery: failed to relay connection response"
-- 
cgit v1.2.3