summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-12-26 22:41:49 +0000
committerNick Mathewson <nickm@torproject.org>2006-12-26 22:41:49 +0000
commite631b0a56f8958d104d3c74fa4b17dfbfacd6d6e (patch)
treec405e48cd63483cf25c70a5048031266ccaf2458 /doc
parent1df04d70f7151f5ff230b3bc65fee7f820808aaa (diff)
downloadtor-e631b0a56f8958d104d3c74fa4b17dfbfacd6d6e.tar.gz
tor-e631b0a56f8958d104d3c74fa4b17dfbfacd6d6e.zip
r11719@Kushana: nickm | 2006-12-26 17:41:09 -0500
Add SOCKS5 and reverse lookup support to C verseion of tor-resolve svn:r9195
Diffstat (limited to 'doc')
-rw-r--r--doc/TODO6
-rw-r--r--doc/tor-resolve.125
2 files changed, 25 insertions, 6 deletions
diff --git a/doc/TODO b/doc/TODO
index dd42580a18..9ab9915dba 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -93,13 +93,13 @@ N - DNS improvements
- Make evdns use windows strerror equivalents.
- Make sure patches get into libevent.
- Verify that it works well on windows
- . Make reverse DNS work.
- . Add client-side interface
+ o Make reverse DNS work.
+ o Add client-side interface
o SOCKS interface: specify
o SOCKS interface: implement
o Cache answers client-side
o Add to Tor-resolve.py
- - Add to tor-resolve
+ o Add to tor-resolve
d - Be a DNS proxy.
o Check for invalid characters in hostnames before trying to resolve
them. (This will help catch attempts do to mean things to our DNS
diff --git a/doc/tor-resolve.1 b/doc/tor-resolve.1
index 26952fe60e..3987095dbb 100644
--- a/doc/tor-resolve.1
+++ b/doc/tor-resolve.1
@@ -5,15 +5,34 @@
tor-resolve \- resolve a hostname to an IP address via tor
.SH SYNOPSIS
-\fBtor-resolve\fP\ [-4|-5] \fIhostname\fP\ [\fIsockshost\fP[:\fIsocksport]\fP]
+\fBtor-resolve\fP\ [-4|-5] [-v] [-x] \fIhostname\fP\ [\fIsockshost\fP[:\fIsocksport]\fP]
.SH DESCRIPTION
\fBtor-resolve\fR is a simple script to connect to a SOCKS proxy that
knows about the SOCKS RESOLVE command, hand it a hostname, and return
an IP address.
-
-See doc/socks-extensions.txt in the Tor package for protocol details.
+.SH OPTIONS
+\fB-v \fP
+Display verbose output.
+.LP
+.TP
+\fB-x\fP
+Perform a reverse lookup: get the PTR record for an IPv4 address.
+.LP
+.TP
+\fB-5\fP
+Use the SOCKS5 protocol. (Default)
+.LP
+.TP
+\fB-4\fP
+Use the SOCKS4a protocol rather than the default SOCKS5 protocol. Doesn't
+support reverse DNS.
.SH SEE ALSO
.BR tor (1),
.BR torify (1).
+.PP
+See doc/socks-extensions.txt in the Tor package for protocol details.
+
+.SH AUTHORS
+Roger Dingledine <arma@mit.edu>, Nick Mathewson <nickm@alum.mit.edu>.