From 4b986cb84ea3f2e3be6d440e86a92af0be589d83 Mon Sep 17 00:00:00 2001 From: n9k Date: Mon, 13 Jun 2022 22:34:54 +0000 Subject: [PATCH] Minor readme changes --- README.md | 2 +- STREAMING.md | 37 ++++++++++++++++++++----------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index b2a89c9..09d798d 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ The only things left are (1) streaming, and (2) letting other people access your stream. [/STREAMING.md][streaming] has instructions for setting up OBS Studio and a Tor onion service. If you want to use different streaming software and put your stream on the Internet some -other way, still read those instructions and copy the gist. +other way, read those instructions and copy the gist. ## Copying diff --git a/STREAMING.md b/STREAMING.md index 91be24c..0ba4070 100644 --- a/STREAMING.md +++ b/STREAMING.md @@ -11,22 +11,21 @@ On Windows it might be somewhere in `%appdata%\tor` or something. A Tor hidden service is a regular TCP service that you talk to via a 6-hop circuit created inside the Tor network. You initiate the creation -of this circuit by providing tor with the service's hostname, which is a -long base32-encoded string ending in ".onion". This hostname is derived -from a pair of cryptographic keys generated by the hidden service -operator. +of this circuit by providing tor with the service's hostname, a long +base32-encoded string ending in ".onion". This hostname is derived from +a pair of cryptographic keys generated by the hidden service operator. A TCP service is a computer program you interact with over the Internet using TCP. TCP is a low-level networking protocol that sits above IP -and creates a reliable so-called "connection" between two computers. It -handles the reordering and resending of packets that are shuffled or -lost in transit on the Internet, such that the bytes sent from one -computer will match exactly the bytes that arrive at the other computer -(barring active interference (MITM), TCP is not secure). Getting -reliability for free greatly simplifies the creation of network -applications, and for this reason and other historical reasons TCP is -ubiquitous on the Internet to this day. Many applications use TCP, for -example IRC, SSH, RTMP, Minecraft, and HTTP (like us here). +and creates a reliable "connection" between two computers. It handles +the reordering and resending of packets that are shuffled or lost in +transit on the Internet, such that the bytes sent from one computer will +match exactly the bytes that arrive at the other (barring active +interference (MITM), TCP is not secure). Getting reliability for free +greatly simplifies the creation of network applications, and for this +reason and other historical reasons TCP is ubiquitous on the Internet to +this day. Many applications use TCP, for example IRC, SSH, RTMP, +Minecraft, and HTTP (like us here). #### Configuration @@ -80,7 +79,7 @@ other user. There may be a `User` directive in your torrc or in a file included by your torrc, for example on Debian it's `User debian-tor`. This means that a tor process running as root will immediately drop privileges by switching to the user `debian-tor`. The user's primary -group should have the same name, but you can check as root like this: +group should have the same name, check like this as root: `# id debian-tor`. On Linux, if tor is already running you can see what user and group it is @@ -113,9 +112,9 @@ Include this line verbatim directly below the `HiddenServiceDir` line: HiddenServicePort 80 127.0.0.1:5051 ``` -tor will listen for connections to our onion address at virtual port -80 (this is the conventional HTTP port), and it will forward that -traffic to our TCP service at 127.0.0.1:5051, which is our webserver. +tor will listen for connections to our onion address at virtual port 80 +(the conventional HTTP port), and it will forward traffic to the TCP +service at 127.0.0.1:5051, which is our webserver. ##### Finish @@ -184,6 +183,9 @@ Click `Settings` and set these: +----------------------------+-------------------------------------+ ``` +> *If this table looks garbled, read this file as plaintext or [click +> here][plaintext] and scroll to the bottom.* + To start streaming click `Start Recording`. When it is recording, segments older than four minutes will be regularly @@ -197,3 +199,4 @@ over the network even if they are not deleted. [tor]: https://gitlab.torproject.org/tpo/core/tor [torrc]: https://support.torproject.org/#tbb-editing-torrc [ffmpeg]: https://trac.ffmpeg.org/wiki/HWAccelIntro +[plaintext]: https://git.076.ne.jp/ninya9k/anonstream/raw/branch/master/STREAMING.md