1 files changed, 34 insertions, 6 deletions

diff --git a/ToxAddress.hs b/ToxAddress.hs
index ea69f6e3..04ee7d6f 100644
--- a/ToxAddress.hs
+++ b/ToxAddress.hs
@@ -13,7 +13,7 @@
 {-# LANGUAGE ScopedTypeVariables        #-}
 {-# LANGUAGE TupleSections              #-}
 {-# LANGUAGE TypeApplications           #-}
-module ToxAddress (NodeInfo(..),NodeId(..),nodeInfo,zeroID) where
+module ToxAddress (NodeInfo(..),NodeId(..),nodeInfo,nodeAddr,zeroID,key2id,id2key) where
 
 import Control.Applicative
 import Control.Monad
@@ -42,6 +42,7 @@ import System.IO.Unsafe                       (unsafeDupablePerformIO)
 import qualified Text.ParserCombinators.ReadP as RP
 import Text.Read
 import Data.Bits
+import ToxCrypto
 
 -- | perform io for hashes that do allocation and ffi.
 -- unsafeDupablePerformIO is used when possible as the
@@ -66,6 +67,26 @@ unpackPublicKey bs = loop 0
 newtype NodeId = NodeId PublicKey
  deriving (Eq,ByteArrayAccess) -- (Eq,Ord,ByteArrayAccess, Bits, Hashable)
 
+key2id :: PublicKey -> NodeId
+key2id = NodeId
+
+id2key :: NodeId -> PublicKey
+id2key (NodeId key) = key
+
+{-
+id2key :: NodeId -> PublicKey
+id2key recipient = case publicKey recipient of
+    CryptoPassed key -> key
+    -- 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
+
+-}
+
 instance Ord NodeId where
     compare (NodeId a) (NodeId b) = compare (unpackPublicKey a) (unpackPublicKey b)
 
@@ -83,8 +104,8 @@ instance Show NodeId where
     show (NodeId bs) = C8.unpack $ Base16.encode $ BA.convert bs
 
 instance S.Serialize NodeId where
-    get = NodeId . throwCryptoError . publicKey <$> S.getBytes 32
-    put (NodeId bs) = S.putByteString $ BA.convert bs
+    get = NodeId <$> getPublicKey
+    put (NodeId bs) = putPublicKey bs
 
 instance Bits NodeId where -- TODO
 
@@ -144,6 +165,12 @@ getIP 0x82 = IPv4 <$> S.get -- TODO: TCP
 getIP 0x8a = IPv6 <$> S.get -- TODO: TCP
 getIP x    = fail ("unsupported address family ("++show x++")")
 
+instance Sized NodeInfo where
+    size = VarSize $ \(NodeInfo nid ip port) ->
+            case ip of
+                IPv4 _ -> 39 -- 35 +  4 = 1 + 4 + 2 + 32
+                IPv6 _ -> 51 -- 35 + 16 = 1 + 16 + 2 + 32
+
 instance S.Serialize NodeInfo where
     get = do
         addrfam <- S.get :: S.Get Word8
@@ -354,9 +381,6 @@ instance Show NodeInfo where
             | IPv6 ip6 <- ip , Just ip4 <- un4map ip6 = shows ip4
             | otherwise                               = ('[' :) . shows ip . (']' :)
 
-nodeAddr :: NodeInfo -> SockAddr
-nodeAddr (NodeInfo _ ip port) = setPort port $ toSockAddr ip
-
 nodeInfo :: NodeId -> SockAddr -> Either String NodeInfo
 nodeInfo nid saddr
     | Just ip <- fromSockAddr saddr
@@ -368,6 +392,10 @@ zeroID = PubKey $ B.replicate 32 0
 
 -}
 
+nodeAddr :: NodeInfo -> SockAddr
+nodeAddr (NodeInfo _ ip port) = setPort port $ toSockAddr ip
+
+
 newtype ForwardPath (n::Nat) = ForwardPath ByteString
  deriving (Eq, Ord,Data)