commit 286c4b5b75ddf272aa0ba0875b51129bad31340d
parent 49dd82602b3999181f99ff5b26acb3b77655825a
Author: parazyd <parazyd@dyne.org>
Date: Sat, 9 Dec 2017 18:13:11 +0100
Generic naming
Diffstat:
7 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
@@ -1,7 +1,8 @@
-Tor-DECODE Announce Mechanism (Tor-DAM)
-=======================================
+Tor Distributed Announce Mechanism (Tor DAM)
+============================================
-Protocol and tooling for finding DECODE nodes in the Tor network.
+Protocol and tooling for mapping machines in the Tor network running
+this software.
Installation
diff --git a/cmd/dam-client/main.go b/cmd/dam-client/main.go
@@ -20,13 +20,13 @@ import (
const Bits = 1024
// Privpath holds the path of where our private key is.
-const Privpath = "/tmp/decode-private.key"
+const Privpath = "/tmp/dam-private.key"
// Pubpath holds the path of where our public key is.
-//const Pubpath = "/tmp/decode-public.pub"
+//const Pubpath = "/tmp/dam-public.pub"
// Postmsg holds the message we are signing with our private key.
-const Postmsg = "I am a DECODE node!"
+const Postmsg = "I am a DAM node!"
type msgStruct struct {
Secret string
@@ -116,7 +116,7 @@ func main() {
// Start up the hidden service
log.Println("Starting up the hidden service...")
- cmd := exec.Command("decodehs.py", Privpath)
+ cmd := exec.Command("damhs.py", Privpath)
stdout, err := cmd.StdoutPipe()
lib.CheckError(err)
diff --git a/cmd/dam-dir/main.go b/cmd/dam-dir/main.go
@@ -151,7 +151,7 @@ func handlePost(rw http.ResponseWriter, request *http.Request) {
if correct {
log.Printf("Welcoming %s to the network\n", n.Address)
ret := map[string]string{
- "secret": "Welcome to the DECODE network!",
+ "secret": "Welcome to the DAM network!",
}
n.Valid = 0
jsonVal, err := json.Marshal(ret)
diff --git a/contrib/redis.conf b/contrib/redis.conf
@@ -2,13 +2,13 @@
# Redis configuration for tor-dam
#
-daemonize yes
+daemonize no
bind 127.0.0.1
port 6379
databases 1
-dbfilename decode-dir.rdb
+dbfilename dam-dir.rdb
save 900 1
save 300 10
diff --git a/protocol.md b/protocol.md
@@ -4,7 +4,7 @@ Tor-DAM Protocol
Abstract
--------
-* Every DECODE node can be an opt-in directory.
+* Every node can be an opt-in directory.
* This implies running the directory daemon on the node.
* Every directory has a HTTP API allowing to list other nodes and
announce new ones.
@@ -13,7 +13,7 @@ Abstract
* It is possible to make this random enough once there are at least 6
nodes in the network.
* A node announces itself to directories by sending a JSON-formatted
- HTTP POST request to one or more active DECODE nodes/directories.
+ HTTP POST request to one or more active nodes/directories.
* Once the POST request is received, the directory will validate the
request and return a secret encrypted with the requester's private
key.
@@ -30,9 +30,9 @@ Protocol
--------
A node announcing itself has to do a JSON-formatted HTTP POST request
-to one or more active DECODE directories with the format explained
-below. N.B. The strings shown in this document might not be valid, but
-they represent a correct example.
+to one or more active directories with the format explained below.
+N.B. The strings shown in this document might not be valid, but they
+represent a correct example.
* `type` reflects the type of the node (currently just a placeholder)
* `address` holds the address of the Tor hidden service
@@ -47,7 +47,7 @@ they represent a correct example.
{
"type": "node",
"address": "qzhpi3jsbuvndnaw.onion",
- "message": "I am a DECODE node!",
+ "message": "I am a node!",
"signature": "ACkwtGGedX1ibHnlwtHlgJYndEMu0HhJaK3DLnH1B+r8/xx7jNDerOU7zrZVuzvf5mH9aZyHAOSHleaD52CsbT3lZrsrVWh4sVsJCD9VbEKuuPV/hx+T8f385V5dv2nDvBtJP32eQhwAxKz8YQvBjQOX8Y/o13vq+bxnxLd1j7g=",
"secret": ""
}
@@ -79,7 +79,7 @@ will again contained the data that was sent the first time as well:
{
"type": "node",
"address": "qzhpi3jsbuvndnaw.onion",
- "message": "I am a DECODE node!",
+ "message": "I am a node!",
"signature": "ACkwtGGedX1ibHnlwtHlgJYndEMu0HhJaK3DLnH1B+r8/xx7jNDerOU7zrZVuzvf5mH9aZyHAOSHleaD52CsbT3lZrsrVWh4sVsJCD9VbEKuuPV/hx+T8f385V5dv2nDvBtJP32eQhwAxKz8YQvBjQOX8Y/o13vq+bxnxLd1j7g=",
"secret": "NzN1amZoeTUvc3V1OTE5KDkzOTQ4NTc2Z3Vyaj8/Pz9tbTU0NyY3eWR1ZWtqdmJza2sxOSg5NzNAOTg0Mgo="
}
@@ -93,7 +93,7 @@ complete the handshake by welcoming the client into the network:
```
{
- "secret": "Welcome to the DECODE network!"
+ "secret": "Welcome to the DAM network!"
}
```
diff --git a/python/Makefile b/python/Makefile
@@ -3,7 +3,7 @@
PREFIX ?= /usr/local
BIN =\
- decodehs.py \
+ damhs.py \
dirauth.py
all:
diff --git a/python/decodehs.py b/python/damhs.py
