summaryrefslogtreecommitdiff
path: root/doc/design/assistant/telehash.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/design/assistant/telehash.mdwn')
-rw-r--r--doc/design/assistant/telehash.mdwn12
1 files changed, 11 insertions, 1 deletions
diff --git a/doc/design/assistant/telehash.mdwn b/doc/design/assistant/telehash.mdwn
index e69f09f98..4e6ec6722 100644
--- a/doc/design/assistant/telehash.mdwn
+++ b/doc/design/assistant/telehash.mdwn
@@ -2,7 +2,7 @@
git-annex (assistant) repositories.
Or something similar like [Snow](http://www.trustiosity.com/snow/)
-or [cjdns](https://github.com/cjdelisle/cjdns) or tor or i2p.
+or [cjdns](https://github.com/cjdelisle/cjdns) or tor or i2p or [magic wormhole](http://magic-wormhole.io/).
## telehash implementation status
@@ -29,6 +29,8 @@ or [cjdns](https://github.com/cjdelisle/cjdns) or tor or i2p.
and the reliabilty of that network is not known. I notice it has only 1
pre-seeded peer in the source tree for the DHT, and that peer was not up
when I tried it.
+* Only provides network-layer transport, still need to implement some
+ file transfer protocol on top.
## cjdns status
@@ -50,6 +52,14 @@ or [cjdns](https://github.com/cjdelisle/cjdns) or tor or i2p.
## i2p status
+## magic wormhole
+
+* simple file transfer protocol with out of band shared secret
+* handles NAT transversal
+* easy to use
+* doesn't require a running daemon
+* can transfer arbitrary blobs (strings, directories, files)
+
## implementation basics
* Add a telehash.log that maps between uuid and telehash address.