1 files changed, 8 insertions, 7 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 306433c1..fc90d01a 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -77,7 +77,8 @@ data NetCryptoSession = NCrypto { ncState          :: TVar NetCryptoSessionStatu
                                 , ncSockAddr      :: SockAddr
                                 , ncHooks         :: TVar (Map.Map MessageType [NetCryptoHook])
                                 , ncUnrecognizedHook :: TVar (MessageType -> NetCryptoHook)
-                                , ncMessageTypes :: TVar MsgTypeArray -- ^ supported messages, 0 for unsupported,
+                                , ncIncomingTypeArray :: TVar MsgTypeArray
+                                                                      -- ^ supported messages, 0 for unsupported,
                                                                       --   otherwise the messageType, some message types
                                                                       --   may not be in ncHooks yet, but they should appear
                                                                       --   here if ncUnrecognizedHook will add them to ncHooks
@@ -245,7 +246,7 @@ freshCryptoSession  sessions
     newsession <- generateSecretKey
     ncHooks0 <- atomically $ newTVar (defaultHooks sessions)
     ncUnrecognizedHook0 <- atomically $ newTVar (defaultUnrecognizedHook sessions)
-    ncMessageTypes0 <- atomically $ newTVar (msgTypeArray sessions)
+    ncIncomingTypeArray0 <- atomically $ newTVar (msgTypeArray sessions)
     ncView0 <- atomically $ newTVar (sessionView sessions)
     pktq <- atomically $ PQ.new (inboundQueueCapacity sessions) 0
     bufstart <- atomically $ newTVar 0
@@ -264,7 +265,7 @@ freshCryptoSession  sessions
                     , ncHooks         = ncHooks0
                     , ncUnrecognizedHook = ncUnrecognizedHook0
                     , ncAllSessions = sessions
-                    , ncMessageTypes = ncMessageTypes0
+                    , ncIncomingTypeArray = ncIncomingTypeArray0
                     , ncView = ncView0
                     , ncPacketQueue        = pktq
                     , ncBufferStart        = bufstart
@@ -367,7 +368,7 @@ cryptoNetHandler sessions addr (NetCrypto (CryptoPacket nonce16 encrypted)) = do
     -- Handle Encrypted Message
     case Map.lookup addr sessionsmap of
         Nothing -> return Nothing -- drop packet, we have no session
-        Just session@(NCrypto {ncMessageTypes, ncState, ncPacketQueue, ncHooks,ncSessionSecret,ncTheirSessionPublic,ncTheirBaseNonce}) -> do
+        Just session@(NCrypto {ncIncomingTypeArray, ncState, ncPacketQueue, ncHooks,ncSessionSecret,ncTheirSessionPublic,ncTheirBaseNonce}) -> do
             theirBaseNonce <- atomically $ readTVar ncTheirBaseNonce
             -- Try to decrypt message
             let diff :: Word16
@@ -396,7 +397,7 @@ cryptoNetHandler sessions addr (NetCrypto (CryptoPacket nonce16 encrypted)) = do
                             writeTVar ncTheirBaseNonce y
                     -- then set session confirmed,
                     atomically $ writeTVar ncState Confirmed
-                    msgTypes <- atomically $ readTVar ncMessageTypes
+                    msgTypes <- atomically $ readTVar ncIncomingTypeArray
                     let msgTyp = cd ^. messageType
                         msgTypMapped16 = msgTypes A.! fromEnum8 (msgID cm)
                         msgTypMapped = fromWord16 $ msgTypMapped16
@@ -417,12 +418,12 @@ cryptoNetHandler sessions addr (NetCrypto (CryptoPacket nonce16 encrypted)) = do
 
 -- | TODO: make this accept CrytpoMessage instead
 runCryptoHook :: NetCryptoSession -> CryptoData -> IO (Maybe (x -> x))
-runCryptoHook session@(NCrypto {ncState, ncHooks,ncSessionSecret,ncTheirSessionPublic,ncTheirBaseNonce,ncMessageTypes})
+runCryptoHook session@(NCrypto {ncState, ncHooks,ncSessionSecret,ncTheirSessionPublic,ncTheirBaseNonce,ncIncomingTypeArray})
               cd@(CryptoData {bufferStart, bufferEnd, bufferData=cm}) = do
     hookmap <- atomically $ readTVar ncHooks
     -- run hook
     flip fix (cd,hookmap) $ \lookupAgain (cd,hookmap) -> do
-        msgTypes <- atomically $ readTVar ncMessageTypes
+        msgTypes <- atomically $ readTVar ncIncomingTypeArray
         let msgTyp = cd ^. messageType
             msgTypMapped16 = msgTypes A.! fromEnum8 (msgID cm)
             msgTypMapped = fromWord16 $ msgTypMapped16