2 files changed, 42 insertions, 7 deletions

diff --git a/Tox.hs b/Tox.hs
index 513f50c1..e1a1bf8a 100644
--- a/Tox.hs
+++ b/Tox.hs
@@ -10,6 +10,7 @@
 module Tox where
 
 import Control.Arrow
+import Control.Concurrent.STM
 import qualified Crypto.Cipher.Salsa    as Salsa
 import qualified Crypto.Cipher.XSalsa   as XSalsa
 import Crypto.ECC.Class
@@ -28,6 +29,7 @@ import qualified Data.ByteString.Char8  as C8
 import Data.ByteString.Lazy             (toStrict)
 import Data.Data
 import Data.IP
+import Data.Maybe
 import Data.Monoid
 import qualified Data.Serialize         as S
 import Data.Typeable
@@ -158,6 +160,12 @@ id2key recipient = case publicKey recipient of
     -- This should never happen because a NodeId is 32 bytes.
     CryptoFailed e   -> error ("Unexpected pattern fail: "++show e)
 
+key2id :: PublicKey -> NodeId
+key2id pk = case S.decode (BA.convert pk) of
+                Left _ -> error "key2id"
+                Right nid -> nid
+
+
 zeros32 :: Bytes
 zeros32 = BA.replicate 32 0
 
@@ -232,21 +240,40 @@ encodePacket :: SecretKey -> SecretsCache -> Message ByteString -> NodeInfo -> (
 encodePacket sk cache msg ni = ( S.runPut . putMessage $ encryptMessage sk cache (nodeId ni) msg
                                , nodeAddr ni )
 
+newClient :: SockAddr -> IO (Client String Method TransactionId NodeInfo (Message ByteString) ())
 newClient addr = do
     udp <- udpTransport addr
     secret <- generateSecretKey
+    let pubkey = key2id $ toPublic secret
     cache <- newEmptyCache
     drg <- getSystemDRG
-    let net = layerTransport (parsePacket secret cache) (encodePacket secret cache) udp
-        intmapT = transactionMethods (contramapT intKey intMapMethods) gen
-        mapT = transactionMethods (contramapT nonceKey mapMethods) gen
-        dispatch = DispatchMethods
+    let me = NodeInfo pubkey (fromMaybe (toEnum 0) $ fromSockAddr addr)
+                             (fromMaybe 0 $ sockAddrPort addr)
+    tox <- atomically $ newTVar (me,())
+    let net = layerTransport (parsePacket secret cache)
+                             (encodePacket secret cache)
+                             udp
+        dispatch tbl = DispatchMethods
             { classifyInbound = classify
             , lookupHandler = handlers
-            , tableMethods = intmapT
+            , tableMethods = tbl
             }
-
-    return net
+        client tbl var = Client
+            { clientNet           = net
+            , clientDispatcher    = dispatch tbl
+            , clientErrorReporter = ignoreErrors -- TODO
+            , clientPending       = var
+            , clientContext       = atomically (readTVar tox)
+            }
+    if fitsInInt (Proxy :: Proxy Word64)
+      then do
+        let intmapT = transactionMethods (contramapT intKey intMapMethods) gen
+        intmap_var <- atomically $ newTVar (drg, mempty)
+        return (client intmapT intmap_var)
+      else do
+        let mapT = transactionMethods (contramapT nonceKey mapMethods) gen
+        map_var <- atomically $ newTVar (drg, mempty)
+        return (client mapT map_var)
 
 last8 :: ByteString -> Nonce8
 last8 bs
diff --git a/src/Network/QueryResponse.hs b/src/Network/QueryResponse.hs
index 4fc9438c..221c2284 100644
--- a/src/Network/QueryResponse.hs
+++ b/src/Network/QueryResponse.hs
@@ -306,6 +306,14 @@ data ErrorReporter addr x meth tid err = ErrorReporter
     , reportTimeout :: meth -> tid -> addr -> IO ()
     }
 
+ignoreErrors :: ErrorReporter addr x meth tid err
+ignoreErrors = ErrorReporter
+    { reportParseError = \_ -> return ()
+    , reportMissingHandler = \_ _ _ -> return ()
+    , reportUnknown = \_ _ _ -> return ()
+    , reportTimeout = \_ _ _ -> return ()
+    }
+
 -- Change the /err/ type for an 'ErrorReporter'.
 contramapE f (ErrorReporter pe mh unk tim)
     = ErrorReporter (\e -> pe (f e))