username/s5p
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: clarify tor_nodes overrides listener first hop
Some checks failed
ci / secrets (push) Successful in 5s
Details
ci / test (push) Successful in 19s
Details
ci / build (push) Failing after 28s
Details

Browse Source 
The first hop in each listener's chain is replaced at connection time
by round-robin selection from tor_nodes. Added comments in both the
example config and the server code to make this precedence explicit.
This commit is contained in:
user
2026-02-22 16:42:20 +01:00
parent a1996b1c9e
commit 0ae7b13407
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/example.yaml
View File

@@ -75,8 +75,11 @@ chain:
# newnym_interval: 0 # periodic NEWNYM (seconds, 0 = manual only) # newnym_interval: 0 # periodic NEWNYM (seconds, 0 = manual only)
# Multi-Tor round-robin -- distribute traffic across multiple Tor nodes. # Multi-Tor round-robin -- distribute traffic across multiple Tor nodes.
# When present, the first hop in each listener's chain is replaced at # When present, the first hop in each listener's chain is REPLACED at
# connection time by round-robin selection from this list. # connection time by round-robin selection from this list. The first hop
# specified in each listener's chain acts as a fallback only; tor_nodes
# takes precedence for both client traffic and pool health tests.
# Connection pools are pre-warmed for every node listed here.
# tor_nodes: # tor_nodes:
# - socks5://10.200.1.1:9050 # - socks5://10.200.1.1:9050
# - socks5://10.200.1.254:9050 # - socks5://10.200.1.254:9050
@@ -110,7 +113,7 @@ chain:
# - localhost # exact hostname # - localhost # exact hostname
# - .local # domain suffix # - .local # domain suffix
# chain: # chain:
# - socks5://127.0.0.1:9050 # - socks5://127.0.0.1:9050 # first hop (overridden by tor_nodes)
# - [pool:clean, pool:mitm] # random choice per connection # - [pool:clean, pool:mitm] # random choice per connection
# - [pool:clean, pool:mitm] # independent random choice # - [pool:clean, pool:mitm] # independent random choice
# #

1
src/s5p/server.py
View File

@@ -208,6 +208,7 @@ async def _handle_client(
else: else:
effective_chain = list(listener.chain) effective_chain = list(listener.chain)
fhp = first_hop_pool fhp = first_hop_pool
# tor_nodes round-robin overrides the listener's first hop
if tor_rr and effective_chain: if tor_rr and effective_chain:
node = tor_rr.next() node = tor_rr.next()
effective_chain[0] = node effective_chain[0] = node