Support TCP nodes in readnodes utility.

1 files changed, 18 insertions, 14 deletions

diff --git a/dht/examples/readnodes.hs b/dht/examples/readnodes.hs
index e4a5b522..3ecffbaf 100644
--- a/dht/examples/readnodes.hs
+++ b/dht/examples/readnodes.hs
@@ -10,11 +10,13 @@ import Data.Word
 import Foreign.Ptr
 import Foreign.Marshal.Utils
 import Foreign.Storable
-import Network.Tox.NodeId
 import System.Environment
 import System.IO (stdout)
 import Text.Read
 
+import qualified Network.Tox.NodeId as UDP
+import Network.Tox.TCP.NodeId as TCP
+
 -- struct bootstrap_node {
 -- 8   char *address;
 -- 2   bool ipv6;
@@ -51,32 +53,34 @@ node_bytes num_nodes a s n = do
             Just _ | bigendian -> [0,1]
                    | otherwise -> [1,0]
             _ -> [0,0]
-        t = [0,0] -- TODO: TCP port
-        nid = nodeId n
+        nid = UDP.nodeId $ udpNodeInfo n
     adr <- int_bytes (base + a)
-    u <- int16_bytes $ fromIntegral $ nodePort n
+    u <- int16_bytes $ fromIntegral $ UDP.nodePort $ udpNodeInfo n
+    t <- int16_bytes $ fromIntegral $ tcpPort n
     return $ foldr (++) []
-        [ adr                    -- char *address;
-        , ip6                    -- bool ipv6;
-        , u                      -- uint16_t port_udp
-        , t                      -- uint16_t port_tcp
-        , BA.unpack (id2key nid) -- uint8_t key[32];
-        , [0,0]                  -- padding
+        [ adr                        -- char *address;
+        , ip6                        -- bool ipv6;
+        , u                          -- uint16_t port_udp
+        , t                          -- uint16_t port_tcp
+        , BA.unpack (UDP.id2key nid) -- uint8_t key[32];
+        , [0,0]                      -- padding
         ]
 
 addressString :: NodeInfo -> String
-addressString ni = case show (nodeAddr ni) of
+addressString ni = case show (UDP.nodeAddr $ udpNodeInfo ni) of
     '[':xs -> takeWhile (/=']') xs
     xs     -> takeWhile (/=':') xs
- where
-    a = show (nodeAddr ni)
+
+readNode :: String -> Maybe NodeInfo
+readNode nstr = mplus (readMaybe nstr)
+                      (fromUDPNode <$> readMaybe nstr)
 
 main = do
     args <- getArgs
     let [ifilename] = args
     ws <- words <$> readFile ifilename
     let ns :: [ NodeInfo ]
-        ns = mapMaybe readMaybe ws
+        ns = mapMaybe readNode ws
         num_nodes :: Int32
         num_nodes = fromIntegral $ length ns
         ptr_size :: Int32