From 704ffcfb7e24c386abbdbc5a7db56adb5b1c56b4 Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Thu, 7 Apr 2022 17:37:06 +0000
Subject: [PATCH] docs: Add required port for directory_nodes in doc

`:80` needs to be provided otherwise parsing will fail with

    Failed to load directory nodes: InvalidLocationStringError('3kxw6lf5vf6y26emzwgibzhrzhmhqiw6ekrek3nqfjjmhwznb2moonad.onion')

This is correct in the auto-generated configuration file, but not in the
document.

Also mention that even for UNIX sockets, it's necessary to specify `tor_control_port`.
---
 docs/onion-message-channels.md | 3 ++-
 jmclient/jmclient/configure.py | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/onion-message-channels.md b/docs/onion-message-channels.md
index e883de5..eeb1a51 100644
--- a/docs/onion-message-channels.md
+++ b/docs/onion-message-channels.md
@@ -46,6 +46,7 @@ socks5_port = 9050
 tor_control_host = localhost
 # or, to use a UNIX socket
 # tor_control_host = unix:/var/run/tor/control
+# note: port needs to be provided (but is ignored for UNIX socket)
 tor_control_port = 9051
 
 # the host/port actually serving the hidden service
@@ -67,7 +68,7 @@ hidden_service_dir =
 # Each item has format host:port ; both are required, though port will
 # be 80 if created in this code.
 # for MAINNET:
-directory_nodes = 3kxw6lf5vf6y26emzwgibzhrzhmhqiw6ekrek3nqfjjmhwznb2moonad.onion,qqd22cwgygaxcy6vdw6mzwkyaxg5urb4ptbc5d74nrj25phspajxjbqd.onion
+directory_nodes = 3kxw6lf5vf6y26emzwgibzhrzhmhqiw6ekrek3nqfjjmhwznb2moonad.onion:80,qqd22cwgygaxcy6vdw6mzwkyaxg5urb4ptbc5d74nrj25phspajxjbqd.onion:80
 
 # for SIGNET (testing network):
 # directory_nodes = rr6f6qtleiiwic45bby4zwmiwjrj3jsbmcvutwpqxjziaydjydkk5iad.onion:80,k74oyetjqgcamsyhlym2vgbjtvhcrbxr4iowd4nv4zk5sehw4v665jad.onion:80
diff --git a/jmclient/jmclient/configure.py b/jmclient/jmclient/configure.py
index 1fa7c26..8c9317b 100644
--- a/jmclient/jmclient/configure.py
+++ b/jmclient/jmclient/configure.py
@@ -157,6 +157,7 @@ socks5_port = 9050
 tor_control_host = localhost
 # or, to use a UNIX socket
 # tor_control_host = unix:/var/run/tor/control
+# note: port needs to be provided (but is ignored for UNIX socket)
 tor_control_port = 9051
 
 # the host/port actually serving the hidden service
@@ -464,6 +465,7 @@ tor_control_host = localhost
 
 # or, to use a UNIX socket
 # control_host = unix:/var/run/tor/control
+# note: port needs to be provided (but is ignored for UNIX socket)
 tor_control_port = 9051
 
 # the host/port actually serving the hidden service