4 files changed, 25 insertions, 18 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 2c13e168..a18b550d 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -44,7 +44,7 @@ module Network.Tox.Crypto.Transport
     , HasMessage(..)
     , HasMessageType(..)
     -- lenses
-#ifdef VERSION_lens
+#ifdef USE_lens
     , groupNumber, groupNumberToJoin, peerNumber, messageNumber
     , messageName, messageData, name, title, message, messageType
 #endif
@@ -288,7 +288,7 @@ putCryptoMessage seqno (Pkt t :=> Identity x) = do
     putPacket seqno x
 
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 erCompat :: String -> a
 erCompat lens = error $ "Use of '" ++ lens ++ "'  lens on incompatible CryptoMessage type"
 #endif
@@ -336,7 +336,7 @@ instance HasGroupChatID CryptoMessage where
     setGroupChatID _ _= error "setGroupChatID on non-groupchat message."
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 groupChatID :: (Functor f, HasGroupChatID x) => (GroupChatId -> f GroupChatId) -> (x -> f x)
 groupChatID = lens getGroupChatID setGroupChatID
 #endif
@@ -370,7 +370,7 @@ instance HasGroupNumber CryptoMessage where
     setGroupNumber _ _ = error "setGroupNumber on CryptoMessage without group number field."
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 groupNumber :: (Functor f, HasGroupNumber x) => (Word16 -> f Word16) -> (x -> f x)
 groupNumber = lens getGroupNumber setGroupNumber
 #endif
@@ -394,7 +394,7 @@ instance HasGroupNumberToJoin CryptoMessage where
     setGroupNumberToJoin _ _ = error "setGroupNumberToJoin on CryptoMessage without group number (to join) field."
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 groupNumberToJoin :: (Functor f, HasGroupNumberToJoin x) => (GroupNumber -> f GroupNumber) -> (x -> f x)
 groupNumberToJoin = lens getGroupNumberToJoin setGroupNumberToJoin
 #endif
@@ -418,7 +418,7 @@ instance HasPeerNumber CryptoMessage where
     setPeerNumber _ _ = error "setPeerNumber on CryptoMessage without peer number field."
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 peerNumber :: (Functor f, HasPeerNumber x) => (Word16 -> f Word16) -> (x -> f x)
 peerNumber = lens getPeerNumber setPeerNumber
 #endif
@@ -442,7 +442,7 @@ instance HasMessageNumber CryptoMessage where
     setMessageNumber _ _ = error "setMessageNumber on CryptoMessage without message number field."
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 messageNumber :: (Functor f, HasMessageNumber x) => (Word32 -> f Word32) -> (x -> f x)
 messageNumber = lens getMessageNumber setMessageNumber
 #endif
@@ -468,7 +468,7 @@ instance HasMessageName CryptoMessage where
     setMessageName _ _ = error "setMessageName on CryptoMessage without message name field."
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 messageName :: (Functor f, HasMessageName x) => (MessageName -> f MessageName) -> (x -> f x)
 messageName = lens getMessageName setMessageName
 #endif
@@ -514,7 +514,7 @@ 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
+#ifdef USE_lens
 word16 :: (Functor f, AsWord16 x) => (Word16 -> f Word16) -> (x -> f x)
 word16  = lens toWord16 (\_ x -> fromWord16 x)
 #endif
@@ -559,7 +559,7 @@ instance HasMessageType CryptoData where
     setMessageType cd@(CryptoData { bufferData=bd }) typ = cd { bufferData=setMessageType bd typ }
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 -- | This lens should always succeed on CryptoMessage
 messageType :: (Functor f, HasMessageType x) => (MessageType -> f MessageType) -> (x -> f x)
 messageType = lens getMessageType setMessageType
@@ -589,7 +589,7 @@ instance HasMessageData CryptoMessage where
     setMessageData _ _ = error "setMessageData on CryptoMessage without message data field."
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 messageData :: (Functor f, HasMessageData x) => (MessageData -> f MessageData) -> (x -> f x)
 messageData = lens getMessageData setMessageData
 #endif
@@ -621,7 +621,7 @@ instance HasTitle CryptoMessage where
     setTitle _ _ = error "setTitle on CryptoMessage without title field."
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 title :: (Functor f, HasTitle x) => (Text -> f Text) -> (x -> f x)
 title = lens getTitle setTitle
 #endif
@@ -653,7 +653,7 @@ instance HasMessage CryptoMessage where
     setMessage _ _ = error "setMessage on CryptoMessage without message field."
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 message :: (Functor f, HasMessage x) => (Text -> f Text) -> (x -> f x)
 message = lens getMessage setMessage
 #endif
@@ -675,7 +675,7 @@ instance HasName CryptoMessage where
     setName _ _ = error "setName on CryptoMessage without name field."
 -}
 
-#ifdef VERSION_lens
+#ifdef USE_lens
 name :: (Functor f, HasTitle x) => (Text -> f Text) -> (x -> f x)
 name = lens getTitle setTitle
 #endif
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index 2fbac5d3..afdf2cc3 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -195,6 +195,8 @@ newRouting addr crypto update4 update6 = do
                 { searchSpace       = toxSpace
                 , searchNodeAddress = nodeIP &&& nodePort
                 , searchQuery       = \_ _ -> return Nothing
+                , searchAlpha       = 1
+                , searchK           = 2
                 }
         tbl4 <- newTVar $ R.nullTable (comparing nodeId) (\s -> hashWithSalt s . nodeId) tentative_info4 R.defaultBucketCount
         tbl6 <- newTVar $ R.nullTable (comparing nodeId) (\s -> hashWithSalt s . nodeId) tentative_info6 R.defaultBucketCount
@@ -524,4 +526,7 @@ nodeSearch client cbvar = Search
     { searchSpace       = toxSpace
     , searchNodeAddress = nodeIP &&& nodePort
     , searchQuery       = getNodes client cbvar
+    , searchAlpha       = 8
+    , searchK           = 16
+
     }
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index a16508cd..52cc298d 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -219,6 +219,8 @@ toxidSearch getTimeout crypto client = Search
     { searchSpace       = toxSpace
     , searchNodeAddress = nodeIP &&& nodePort
     , searchQuery       = getRendezvous getTimeout crypto client
+    , searchAlpha = 3
+    , searchK     = 6
     }
 
 announceSerializer :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
diff --git a/src/Network/Tox/TCP.hs b/src/Network/Tox/TCP.hs
index 1111d3b8..a7881c24 100644
--- a/src/Network/Tox/TCP.hs
+++ b/src/Network/Tox/TCP.hs
@@ -191,15 +191,15 @@ getUDPNodes' tcp seeking dst0 = do
             n24 <- transportNewNonce (tcpCrypto tcp)
             return (b,c,n24)
         let (dst,gateway') = if UDP.nodeId dst0 == nodeId gateway
-                                then ( dst0 { UDP.nodeIP = fromJust $ fromSockAddr localhost4 }
+                                then ( dst0 { UDP.nodeIP = fromJust $ Network.Address.fromSockAddr localhost4 }
                                      , gateway { udpNodeInfo = (udpNodeInfo gateway)
-                                                    { UDP.nodeIP = fromJust $ fromSockAddr localhost4 }})
+                                                    { UDP.nodeIP = fromJust $ Network.Address.fromSockAddr localhost4 }})
                                 else (dst0,gateway)
         wrap2 <- lookupNonceFunction (tcpCrypto tcp) b (UDP.id2key $ UDP.nodeId dst)
         wrap1 <- lookupNonceFunction (tcpCrypto tcp) c (UDP.id2key $ nodeId gateway)
         wrap0 <- lookupNonceFunction (tcpCrypto tcp) (transportSecret $ tcpCrypto tcp) (UDP.id2key $ UDP.nodeId dst)
         let meth = MethodSerializer -- MethodSerializer Nonce8 NodeInfo RelayPacket meth AnnounceRequest (Either String AnnounceResponse)
-                    { methodTimeout = \tid addr -> return (addr,8000000) -- 8 second timeout
+                    { methodTimeout = \tid addr -> return (addr,12000000) -- 12 second timeout
                     , method = () -- meth
                     , wrapQuery = \n8 src gateway x ->
                         OnionPacket n24 $ Addressed (UDP.nodeAddr dst)
@@ -274,7 +274,7 @@ newClient crypto store load = do
             , tableMethods = transactionMethods' store load (contramap (\(Nonce8 w64) -> w64) w64MapMethods)
                                 $ first (either error Nonce8 . decode) . randomBytesGenerate 8
             }
-        , clientErrorReporter = logErrors
+        , clientErrorReporter = logErrors { reportTimeout = reportTimeout ignoreErrors }
         , clientPending = map_var
         , clientAddress = \_ -> return $ NodeInfo
             { udpNodeInfo = either error id $ UDP.nodeInfo (UDP.key2id $ transportPublic crypto) (SockAddrInet 0 0)