5 files changed, 89 insertions, 15 deletions

diff --git a/dht-client.cabal b/dht-client.cabal
index 796844a1..e668dccc 100644
--- a/dht-client.cabal
+++ b/dht-client.cabal
@@ -108,6 +108,11 @@ library
                     Network.Tox.NodeId
                     Network.Tox.Avahi
                     Network.UPNP
+                    Network.QueryResponse.TCP
+                    Network.Tox.Relay
+                    Network.Tox.TCP
+                    Data.Tox.Msg
+                    Data.Tox.Relay
                     Control.TriadCommittee
                     Crypto.Tox
                     Text.XXD
@@ -148,6 +153,7 @@ library
                     Presence
                     PingMachine
                     Connection
+                    ToxChat
                     ToxToXMPP
                     ToxManager
                     XMPPToTox
@@ -183,6 +189,7 @@ library
                     , bencoding
                     , contravariant
                     , xml-types
+                    , rank2classes
 
                     , memory
                     , time
@@ -194,14 +201,10 @@ library
                     , http-types
 
                     , process
-                    , split
                     , pretty
                     , convertible
                     , data-default
 
-                    , bifunctors
-                    , lens
-                    , lifted-async
                     , lifted-base
                     , monad-control
                     , transformers-base
@@ -218,7 +221,6 @@ library
                     , blaze-builder
                     , exceptions
                     , hinotify
-                    , reference
                     , avahi >= 0.2.0
                     , hslogger
 
@@ -241,7 +243,6 @@ library
   cpp-options:   -DBENCODE_AESON -DRENDERFLUSH
   if flag(thread-debug)
     exposed-modules: Control.Concurrent.Lifted.Instrument
-                     Control.Concurrent.Async.Lifted.Instrument
     cpp-options:   -DTHREAD_DEBUG
 
   if flag(builder)
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index a746b54c..69461488 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -42,15 +42,19 @@ module Data.Torrent
        , FileOffset
        , FileSize
        , FileInfo (..)
+#ifdef VERSION_lens
        , fileLength
        , filePath
        , fileMD5Sum
+#endif
 
          -- ** Layout info
        , LayoutInfo (..)
+#ifdef VERSION_lens
        , singleFile
        , multiFile
        , rootDirName
+#endif
        , joinFilePath
        , isSingleFile
        , isMultiFile
@@ -86,8 +90,10 @@ module Data.Torrent
          -- ** Piece control
        , HashList (..)
        , PieceInfo (..)
+#ifdef VERSION_lens
        , pieceLength
        , pieceHashes
+#endif
        , pieceCount
 
          -- ** Validation
@@ -96,10 +102,12 @@ module Data.Torrent
 
          -- * Info dictionary
        , InfoDict (..)
+#ifdef VERSION_lens
        , infohash
        , layoutInfo
        , pieceInfo
        , isPrivate
+#endif
 #ifdef VERSION_bencoding
        , infoDictionary
 #endif
@@ -107,6 +115,7 @@ module Data.Torrent
          -- * Torrent file
        , Torrent(..)
 
+#ifdef VERSION_lens
          -- ** Lenses
        , announce
        , announceList
@@ -118,6 +127,7 @@ module Data.Torrent
        , publisher
        , publisherURL
        , signature
+#endif
 
          -- ** Utils
        , nullTorrent
@@ -151,7 +161,7 @@ import Prelude hiding ((<>))
 import Control.Applicative
 import Control.DeepSeq
 import Control.Exception
-import Control.Lens
+-- import Control.Lens
 import Control.Monad
 import Crypto.Hash
 #ifdef VERSION_bencoding
@@ -368,12 +378,14 @@ data FileInfo a = FileInfo {
                , Functor, Foldable
                )
 
+#ifdef VERSION_lens
 makeLensesFor
   [ ("fiLength", "fileLength")
   , ("fiMD5Sum", "fileMD5Sum")
   , ("fiName"  , "filePath"  )
   ]
   ''FileInfo
+#endif
 
 instance NFData a => NFData (FileInfo a) where
   rnf FileInfo {..} = rnf fiName
@@ -455,12 +467,14 @@ data LayoutInfo
     , liDirName  :: !BS.ByteString
     } deriving (Show, Read, Eq, Typeable)
 
+#ifdef VERSION_lens
 makeLensesFor
   [ ("liFile"   , "singleFile" )
   , ("liFiles"  , "multiFile"  )
   , ("liDirName", "rootDirName")
   ]
   ''LayoutInfo
+#endif
 
 instance NFData LayoutInfo where
   rnf SingleFile {..} = ()
@@ -681,11 +695,13 @@ data PieceInfo = PieceInfo
     -- ^ Concatenation of all 20-byte SHA1 hash values.
   } deriving (Show, Read, Eq, Typeable)
 
+#ifdef VERSION_lens
 -- | Number of bytes in each piece.
 makeLensesFor [("piPieceLength", "pieceLength")] ''PieceInfo
 
 -- | Concatenation of all 20-byte SHA1 hash values.
 makeLensesFor [("piPieceHashes", "pieceHashes")] ''PieceInfo
+#endif
 
 instance NFData PieceInfo where
   rnf (PieceInfo a (HashList b)) = rnf a `seq` rnf b
@@ -766,6 +782,7 @@ data InfoDict = InfoDict
     --   BEP 27: <http://www.bittorrent.org/beps/bep_0027.html>
   } deriving (Show, Read, Eq, Typeable)
 
+#ifdef VERISON_lens
 makeLensesFor
   [ ("idInfoHash"  , "infohash"  )
   , ("idLayoutInfo", "layoutInfo")
@@ -773,6 +790,7 @@ makeLensesFor
   , ("idPrivate"   , "isPrivate" )
   ]
   ''InfoDict
+#endif
 
 instance NFData InfoDict where
   rnf InfoDict {..} = rnf idLayoutInfo
@@ -884,6 +902,7 @@ data Torrent = Torrent
     --   encrypted SHA-1 hash of the info dictionary).
     } deriving (Show, Eq, Typeable)
 
+#ifdef VERSION_lens
 makeLensesFor
   [ ("tAnnounce"    , "announce"    )
   , ("tAnnounceList", "announceList")
@@ -897,6 +916,7 @@ makeLensesFor
   , ("tSignature"   , "signature"   )
   ]
   ''Torrent
+#endif
 
 instance NFData Torrent where
   rnf Torrent {..} = rnf tInfoDict
diff --git a/src/Network/Address.hs b/src/Network/Address.hs
index 246463c0..e1cec34d 100644
--- a/src/Network/Address.hs
+++ b/src/Network/Address.hs
@@ -84,6 +84,9 @@ module Network.Address
        , sockAddrPort
        , setPort
        , getBindAddress
+       , localhost4
+       , localhost6
+       , linesBy
        ) where
 
 import Control.Applicative
@@ -109,7 +112,6 @@ import Data.IP hiding (fromSockAddr)
 import Data.IP
 #endif
 import Data.List as L
-import Data.List.Split as L
 import Data.Maybe       (fromMaybe, catMaybes)
 import Data.Monoid
 import Data.Hashable
@@ -212,7 +214,8 @@ instance Serialize a => Serialize (NodeAddr a) where
 --
 instance IsString (NodeAddr IPv4) where
   fromString str
-    | [hostAddrStr, portStr] <- splitWhen (== ':') str
+    | (hostAddrStr, portStr0) <- L.break (== ':') str
+    , let portStr = L.drop 1 portStr0
     , Just hostAddr <- readMaybe hostAddrStr
     , Just portNum  <- toEnum <$> readMaybe portStr
                 = NodeAddr hostAddr portNum
@@ -540,7 +543,8 @@ instance Default PeerAddr where
 --
 instance IsString PeerAddr where
   fromString str
-    | [hostAddrStr, portStr] <- splitWhen (== ':') str
+    | (hostAddrStr, portStr0) <- L.break (== ':') str
+    , let portStr = L.drop 1 portStr0
     , Just hostAddr <- readMaybe hostAddrStr
     , Just portNum  <- toEnum <$> readMaybe portStr
                 = PeerAddr Nothing (IPv4 hostAddr) portNum
@@ -958,6 +962,20 @@ instance Default Version where
   def = Version [0] []
   {-# INLINE def #-}
 
+dropLastIf :: (a -> Bool) -> [a] -> [a]
+dropLastIf pred []                 =  []
+dropLastIf pred (x:xs)             =  init' x xs
+  where init' y [] | pred y = []
+        init' y []          = [y]
+        init' y (z:zs)      = y : init' z zs
+
+linesBy :: (a -> Bool) -> [a] -> [[a]]
+linesBy pred ys = dropLastIf L.null $ L.map dropDelim $ L.groupBy (\_ x -> not $ pred x) ys
+ where
+    dropDelim []                 = []
+    dropDelim (x:xs) | pred x    = xs
+                     | otherwise = x:xs
+
 -- | For dot delimited version strings.
 --   Example: @fromString \"0.1.0.2\" == Version [0, 1, 0, 2]@
 --
@@ -966,7 +984,7 @@ instance IsString Version where
     | Just nums <- chunkNums str = Version nums []
     | otherwise = error $ "fromString: invalid version string " ++ str
     where
-      chunkNums = sequence . L.map readMaybe . L.linesBy ('.' ==)
+      chunkNums = sequence . L.map readMaybe . linesBy ('.' ==)
 
 instance Pretty Version where
   pPrint = text . showVersion
@@ -1120,7 +1138,7 @@ fingerprint pid = either (const def) id $ runGet getCI (getPeerId pid)
 
     getMainlineVersion = do
       str <- BC.unpack <$> getByteString 7
-      let mnums = L.filter (not . L.null) $ L.linesBy ('-' ==) str
+      let mnums = L.filter (not . L.null) $ linesBy ('-' ==) str
       return $ Version (fromMaybe [] $ sequence $ L.map readMaybe mnums) []
 
     getAzureusImpl    = parseSoftware <$> getByteString 2
@@ -1227,3 +1245,9 @@ either4or6 a6@(SockAddrInet6 port _ addr _)
 data WantIP = Want_IP4 | Want_IP6 | Want_Both
  deriving (Eq, Enum, Ord, Show)
 
+localhost6 :: SockAddr
+localhost6 = SockAddrInet6 0 0 (0,0,0,1) 0 -- [::1]:0
+
+localhost4 :: SockAddr
+localhost4 = SockAddrInet 0 16777343 -- 127.0.0.1:0
+
diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 6e2ab60b..2c13e168 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                #-}
 {-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE FlexibleInstances  #-}
 {-# LANGUAGE GADTs              #-}
@@ -43,8 +44,10 @@ module Network.Tox.Crypto.Transport
     , HasMessage(..)
     , HasMessageType(..)
     -- lenses
+#ifdef VERSION_lens
     , groupNumber, groupNumberToJoin, peerNumber, messageNumber
     , messageName, messageData, name, title, message, messageType
+#endif
     -- constructor
     -- utils
     , sizedN
@@ -77,7 +80,8 @@ import Data.Monoid
 import Data.Word
 import Data.Bits
 import Crypto.Hash
-import Control.Lens
+import Data.Functor.Contravariant
+import Data.Functor.Identity
 import Data.Text as T
 import Data.Text.Encoding as T
 import Data.Serialize as S
@@ -284,8 +288,10 @@ putCryptoMessage seqno (Pkt t :=> Identity x) = do
     putPacket seqno x
 
 
+#ifdef VERSION_lens
 erCompat :: String -> a
 erCompat lens = error $ "Use of '" ++ lens ++ "'  lens on incompatible CryptoMessage type"
+#endif
 
 
 newtype GroupChatId = GrpId ByteString -- 33 bytes
@@ -330,8 +336,10 @@ instance HasGroupChatID CryptoMessage where
     setGroupChatID _ _= error "setGroupChatID on non-groupchat message."
 -}
 
+#ifdef VERSION_lens
 groupChatID :: (Functor f, HasGroupChatID x) => (GroupChatId -> f GroupChatId) -> (x -> f x)
 groupChatID = lens getGroupChatID setGroupChatID
+#endif
 
 type GroupNumber = Word16
 type PeerNumber = Word16
@@ -362,8 +370,10 @@ instance HasGroupNumber CryptoMessage where
     setGroupNumber _ _ = error "setGroupNumber on CryptoMessage without group number field."
 -}
 
+#ifdef VERSION_lens
 groupNumber :: (Functor f, HasGroupNumber x) => (Word16 -> f Word16) -> (x -> f x)
 groupNumber = lens getGroupNumber setGroupNumber
+#endif
 
 class HasGroupNumberToJoin x where
     getGroupNumberToJoin :: x -> GroupNumber
@@ -384,8 +394,10 @@ instance HasGroupNumberToJoin CryptoMessage where
     setGroupNumberToJoin _ _ = error "setGroupNumberToJoin on CryptoMessage without group number (to join) field."
 -}
 
+#ifdef VERSION_lens
 groupNumberToJoin :: (Functor f, HasGroupNumberToJoin x) => (GroupNumber -> f GroupNumber) -> (x -> f x)
 groupNumberToJoin = lens getGroupNumberToJoin setGroupNumberToJoin
+#endif
 
 class HasPeerNumber x where
     getPeerNumber :: x -> PeerNumber
@@ -406,8 +418,10 @@ instance HasPeerNumber CryptoMessage where
     setPeerNumber _ _ = error "setPeerNumber on CryptoMessage without peer number field."
 -}
 
+#ifdef VERSION_lens
 peerNumber :: (Functor f, HasPeerNumber x) => (Word16 -> f Word16) -> (x -> f x)
 peerNumber = lens getPeerNumber setPeerNumber
+#endif
 
 class HasMessageNumber x where
     getMessageNumber :: x -> MessageNumber
@@ -428,9 +442,10 @@ instance HasMessageNumber CryptoMessage where
     setMessageNumber _ _ = error "setMessageNumber on CryptoMessage without message number field."
 -}
 
+#ifdef VERSION_lens
 messageNumber :: (Functor f, HasMessageNumber x) => (Word32 -> f Word32) -> (x -> f x)
 messageNumber = lens getMessageNumber setMessageNumber
-
+#endif
 
 class HasMessageName x where
     getMessageName :: x -> MessageName
@@ -453,8 +468,10 @@ instance HasMessageName CryptoMessage where
     setMessageName _ _ = error "setMessageName on CryptoMessage without message name field."
 -}
 
+#ifdef VERSION_lens
 messageName :: (Functor f, HasMessageName x) => (MessageName -> f MessageName) -> (x -> f x)
 messageName = lens getMessageName setMessageName
+#endif
 
 data KnownLossyness = KnownLossy | KnownLossless
     deriving (Eq,Ord,Show,Enum)
@@ -497,8 +514,10 @@ instance AsWord64 MessageType where
     fromWord64 x | x < 1024, x .|. 0x0200 == 0x0200 = GrpMsg (toEnum8 ((x - 512) `div` 256)) (toEnum8 x)
     fromWord64 x = error "Not clear how to convert Word64 to MessageType"
 
+#ifdef VERSION_lens
 word16 :: (Functor f, AsWord16 x) => (Word16 -> f Word16) -> (x -> f x)
 word16  = lens toWord16 (\_ x -> fromWord16 x)
+#endif
 
 instance Ord MessageType where
     compare (Msg x) (Msg y) = compare x y
@@ -540,9 +559,11 @@ instance HasMessageType CryptoData where
     setMessageType cd@(CryptoData { bufferData=bd }) typ = cd { bufferData=setMessageType bd typ }
 -}
 
+#ifdef VERSION_lens
 -- | This lens should always succeed on CryptoMessage
 messageType :: (Functor f, HasMessageType x) => (MessageType -> f MessageType) -> (x -> f x)
 messageType = lens getMessageType setMessageType
+#endif
 
 type MessageData = B.ByteString
 
@@ -568,8 +589,10 @@ instance HasMessageData CryptoMessage where
     setMessageData _ _ = error "setMessageData on CryptoMessage without message data field."
 -}
 
+#ifdef VERSION_lens
 messageData :: (Functor f, HasMessageData x) => (MessageData -> f MessageData) -> (x -> f x)
 messageData = lens getMessageData setMessageData
+#endif
 
 class HasTitle x where
     getTitle :: x -> Text
@@ -598,8 +621,10 @@ instance HasTitle CryptoMessage where
     setTitle _ _ = error "setTitle on CryptoMessage without title field."
 -}
 
+#ifdef VERSION_lens
 title :: (Functor f, HasTitle x) => (Text -> f Text) -> (x -> f x)
 title = lens getTitle setTitle
+#endif
 
 class HasMessage x where
     getMessage :: x -> Text
@@ -628,8 +653,10 @@ instance HasMessage CryptoMessage where
     setMessage _ _ = error "setMessage on CryptoMessage without message field."
 -}
 
+#ifdef VERSION_lens
 message :: (Functor f, HasMessage x) => (Text -> f Text) -> (x -> f x)
 message = lens getMessage setMessage
+#endif
 
 class HasName x where
     getName :: x -> Text
@@ -648,8 +675,10 @@ instance HasName CryptoMessage where
     setName _ _ = error "setName on CryptoMessage without name field."
 -}
 
+#ifdef VERSION_lens
 name :: (Functor f, HasTitle x) => (Text -> f Text) -> (x -> f x)
 name = lens getTitle setTitle
+#endif
 
 data PeerInfo
       = PeerInfo
diff --git a/src/Network/Tox/Handshake.hs b/src/Network/Tox/Handshake.hs
index 6df9edab..c48b7415 100644
--- a/src/Network/Tox/Handshake.hs
+++ b/src/Network/Tox/Handshake.hs
@@ -8,10 +8,10 @@ module Network.Tox.Handshake where
 
 import Control.Arrow
 import Control.Concurrent.STM
-import Control.Lens
 import Control.Monad
 import Crypto.Hash
 import Crypto.Tox
+import Data.Functor.Identity
 import Data.Time.Clock.POSIX
 import Network.Tox.Crypto.Transport
 import Network.Tox.DHT.Handlers     (createCookieSTM)