diff options
-rw-r--r-- | src/Network/Tox/Onion/Handlers.hs | 2 | ||||
-rw-r--r-- | src/Network/Tox/Onion/Transport.hs | 2 | ||||
-rw-r--r-- | todo.txt | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs index 23673273..0c137bf5 100644 --- a/src/Network/Tox/Onion/Handlers.hs +++ b/src/Network/Tox/Onion/Handlers.hs | |||
@@ -63,7 +63,6 @@ classify msg = go msg | |||
63 | -- The reason for this 20 second timeout in toxcore is that it gives a reasonable | 63 | -- The reason for this 20 second timeout in toxcore is that it gives a reasonable |
64 | -- time (20 to 40 seconds) for a peer to announce himself while taking in count | 64 | -- time (20 to 40 seconds) for a peer to announce himself while taking in count |
65 | -- all the possible delays with some extra seconds. | 65 | -- all the possible delays with some extra seconds. |
66 | -- dhtd: src/Network/Tox/Onion/Handlers.hs:(67,1)-(101,23): Non-exhaustive patterns in function announceH | ||
67 | announceH :: Routing -> TVar SessionTokens -> TVar AnnouncedKeys -> OnionDestination r -> AnnounceRequest -> IO AnnounceResponse | 66 | announceH :: Routing -> TVar SessionTokens -> TVar AnnouncedKeys -> OnionDestination r -> AnnounceRequest -> IO AnnounceResponse |
68 | announceH routing toks keydb oaddr req = do | 67 | announceH routing toks keydb oaddr req = do |
69 | case () of | 68 | case () of |
@@ -242,6 +241,7 @@ sendOnion getTimeout client req oaddr unwrap = | |||
242 | (return . Just . unwrap (onionNodeInfo oaddr)) | 241 | (return . Just . unwrap (onionNodeInfo oaddr)) |
243 | $ join mb | 242 | $ join mb |
244 | 243 | ||
244 | -- | Lookup the secret counterpart for a given alias key. | ||
245 | selectAlias :: TransportCrypto -> NodeId -> STM AliasSelector | 245 | selectAlias :: TransportCrypto -> NodeId -> STM AliasSelector |
246 | selectAlias crypto pkey = do | 246 | selectAlias crypto pkey = do |
247 | ks <- filter (\(sk,pk) -> pk == id2key pkey) | 247 | ks <- filter (\(sk,pk) -> pk == id2key pkey) |
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs index 203d7dc7..bdaef651 100644 --- a/src/Network/Tox/Onion/Transport.hs +++ b/src/Network/Tox/Onion/Transport.hs | |||
@@ -741,7 +741,7 @@ parseDataToRoute | |||
741 | -> Either (Asymm (Encrypted DataToRoute),Rendezvous) (OnionMessage Encrypted, OnionDestination r) | 741 | -> Either (Asymm (Encrypted DataToRoute),Rendezvous) (OnionMessage Encrypted, OnionDestination r) |
742 | parseDataToRoute crypto (OnionToRouteResponse dta, od) | 742 | parseDataToRoute crypto (OnionToRouteResponse dta, od) |
743 | = Left ( dta | 743 | = Left ( dta |
744 | , Rendezvous (onionAliasPublic crypto) $ onionNodeInfo od ) | 744 | , Rendezvous (rendezvousAliasPublic crypto) $ onionNodeInfo od ) |
745 | parseDataToRoute _ msg = Right msg | 745 | parseDataToRoute _ msg = Right msg |
746 | 746 | ||
747 | encodeDataToRoute :: TransportCrypto | 747 | encodeDataToRoute :: TransportCrypto |
@@ -56,13 +56,13 @@ p - put/publish a single given datum on a single given node. | |||
56 | 56 | ||
57 | Tox: (toxid) publish a rendezvous onion route to dht node. | 57 | Tox: (toxid) publish a rendezvous onion route to dht node. |
58 | (friend) publish friend-request to rendezvous point. | 58 | (friend) publish friend-request to rendezvous point. |
59 | (contact) publish dht-nodeid to rendezvous point. | 59 | (dhtkey) publish dht-nodeid to rendezvous point. |
60 | 60 | ||
61 | p toxid <key-pair> <token> [node-addr] | 61 | p toxid <key-pair> <token> [node-addr] |
62 | 62 | ||
63 | p friend <nospam> <rendezvous-addr> <text> | 63 | p friend <nospam> <rendezvous-addr> <text> |
64 | 64 | ||
65 | p contact <rendezvous-addr> | 65 | p dhtkey <rendezvous-addr> |
66 | 66 | ||
67 | a - announce, like put/publish but automatically selects nodes to publish on | 67 | a - announce, like put/publish but automatically selects nodes to publish on |
68 | and continually refreshes the records. | 68 | and continually refreshes the records. |
@@ -77,7 +77,7 @@ a - announce, like put/publish but automatically selects nodes to publish on | |||
77 | 77 | ||
78 | a +toxid <key-pair> | 78 | a +toxid <key-pair> |
79 | a +friend <nospam> <text> | 79 | a +friend <nospam> <text> |
80 | a +contact | 80 | a +dhtkey |
81 | 81 | ||
82 | k - manage key-pairs | 82 | k - manage key-pairs |
83 | 83 | ||