Removed obsolete Connection.Tox.

1 files changed, 2 insertions, 73 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 07c033b6..3269f5dd 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -52,80 +52,9 @@ import Data.InOrOut
 import DPut
 import Text.Printf
 import Data.Bool
-import Connection (Status(..), Policy(..))
 import Network.Tox.Handshake
 
--- | This type indicates the progress of a tox encrypted friend link
--- connection.  Two scenarios are illustrated below.  The parenthesis show the
--- current 'G.Status' 'ToxProgress' of the session.
---
---
--- Perfect handshake scenario:
---
---  Peer 1                                  Peer 2
---  (InProgress AcquiringCookie)            (Dormant/InProgress AcquiringCookie)
---                     Cookie request ->
---                                       <- Cookie response
---  (InProgress AwaitingHandshake)          (Dormant/InProgress AcquiringCookie)
---                   Handshake packet ->
---                                          * accepts connection
---                                          (InProgress AwaitingSessionPacket)
---                                       <- Handshake packet
---  *accepts connection
---  (InProgress AwaitingSessionPacket)
---                   Encrypted packet -> <- Encrypted packet
---  *confirms connection                    *confirms connection
---  (Established)                           (Established)
---
---                           Connection successful.
---
---                  Encrypted packets -> <- Encrypted packets
---
---
---
---
---  More realistic handshake scenario:
---  Peer 1                                  Peer 2
---  (InProgress AcquiringCookie)            (Dormant/InProgress AcquiringCookie)
---                      Cookie request ->   *packet lost*
---                      Cookie request ->
---                                        <- Cookie response
---  (InProgress AwaitingHandshake)           (Dormant/InProgress AcquiringCookie)
---
---                                           *Peer 2 randomly starts new connection to peer 1
---                                           (InProgress AcquiringCookie)
---                                        <- Cookie request
---                     Cookie response ->
---                                           (InProgress AwaitingHandshake)
---
---                    Handshake packet -> <- Handshake packet
---  *accepts connection                      * accepts connection
---  (InProgress AwaitingSessionPacket)      (InProgress AwaitingSessionPacket)
---
---                    Encrypted packet -> <- Encrypted packet
---  *confirms connection                     *confirms connection
---  (Established)                           (Established)
---
---                              Connection successful.
---
---                   Encrypted packets -> <- Encrypted packets
-data ToxProgress
-    = AwaitingDHTKey        -- ^ Waiting to receive their DHT key.
-    | AcquiringIPAddress    -- ^ Searching DHT to obtain their node's IP & port.
-    | AcquiringCookie       -- ^ Attempting to obtain a cookie.
-    | AwaitingHandshake     -- ^ Waiting to receive a handshake.
-    | AwaitingSessionPacket -- ^ Connection is "accepted" but not yet "confirmed".
-    deriving (Eq,Ord,Enum,Show)
-
-type LookupPolicyFunction = Key -> STM Policy
-
-data Key = Key NodeId{-me-} NodeId{-them-}
- deriving (Eq,Ord)
-
-instance Show Key where show = show . showKey_
-
-showKey_ :: Key -> String
-showKey_ (Key me them) = show me ++ ":" ++ show them
+type LookupPolicyFunction = ToxContact -> STM Policy
 
 -- * These types are isomorphic to Maybe, but have the advantage of documenting
 --   when an item is expected to become known.
@@ -1075,7 +1004,7 @@ handshakeH sessions addrRaw hshake@(Handshake (Cookie n24 ecookie) nonce24 encry
                     case Map.lookup addr sessionsmap of
                         Nothing -> do
                             dmsg $ "sockaddr(" ++ show addr ++ ") not in session map(" ++ show (map (second ncSessionId) (Map.assocs sessionsmap)) ++ "), so freshCryptoSession"
-                            let k = Key (key2id . toPublic $ key) (key2id remotePublicKey)
+                            let k = ToxContact (key2id . toPublic $ key) (key2id remotePublicKey)
                             policy <- netCryptoPolicyByKey sessions k
                             case policy of
                                 x | x `elem` [OpenToConnect,TryingToConnect] ->