nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix check-docs to avoid false-positives on missing anchors.

Browse Source 
Also add an anchor for the second ClientTranportPlugin instance.

See #40339.

This doesn't need a changes file because it isn't user-facing.
This commit is contained in:
Nick Mathewson 2022-06-16 11:50:59 -04:00
parent 1d6470a2a8
commit 6c1aad13e2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/man/tor.1.txt
View File

@ -335,7 +335,7 @@ forward slash (/) in the configuration file and on the command line.
to mess with it. (Default: -1) to mess with it. (Default: -1)
[[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__:: [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__::
**ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]:: [[ClientTransportPlugin-2]] **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::
In its first form, when set along with a corresponding Bridge line, the Tor In its first form, when set along with a corresponding Bridge line, the Tor
client forwards its traffic to a SOCKS-speaking proxy on "IP:PORT". client forwards its traffic to a SOCKS-speaking proxy on "IP:PORT".
(IPv4 addresses should written as-is; IPv6 addresses should be wrapped in (IPv4 addresses should written as-is; IPv6 addresses should be wrapped in

9
scripts/maint/checkOptionDocs.pl.in
View File

@ -41,9 +41,16 @@ loadTorrc("@abs_top_srcdir@/src/config/torrc.sample.in", \%torrcSampleOptions);
my $considerNextLine = 0; my $considerNextLine = 0;
open(F, "@abs_top_srcdir@/doc/man/tor.1.txt") or die; open(F, "@abs_top_srcdir@/doc/man/tor.1.txt") or die;
while (<F>) { while (<F>) {
if (m!^(?:\[\[([A-za-z0-9_]+)\]\] *)?\*\*([A-Za-z0-9_]+)\*\*!) { if (m!^(?:\[\[([A-za-z0-9_]+)\]\] *)?\*\*([A-Za-z0-9_]+)\*\*! && $considerNextLine) {
$manPageOptions{$2} = 1; $manPageOptions{$2} = 1;
print "Missing an anchor: $2\n" unless (defined $1 or $2 eq 'tor'); print "Missing an anchor: $2\n" unless (defined $1 or $2 eq 'tor');
$considerNextLine = 1;
} elsif (m!^\s*$! or
m!^\s*\+\s*$! or
m!^\s*//!) {
$considerNextLine = 1;
} else {
$considerNextLine = 0;
} }
} }
close F; close F;