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

Make tor-resolve take a -p port option in addition to the current host:port syntax.

Browse Source 
svn:r17002
This commit is contained in:
Nick Mathewson 2008-09-29 14:18:47 +00:00
parent 9678f166a8
commit ee0078ead4
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -60,6 +60,8 @@ Changes in version 0.2.1.6-alpha - 2008-09-29
single-hop circuits, and clients to use those servers to build single-hop circuits, and clients to use those servers to build
single-hop circuits when using a specialized controller. Patch single-hop circuits when using a specialized controller. Patch
from Josh Albrecht. Resolves feature request 768. from Josh Albrecht. Resolves feature request 768.
- Add a -p option to tor-resolve for specifying the SOCKS port: some
people find host:port too confusing.
o Minor bugfixes: o Minor bugfixes:
- Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha. - Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha.

35
src/tools/tor-resolve.c
View File

@ -293,7 +293,7 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport,
static void static void
usage(void) usage(void)
{ {
puts("Syntax: tor-resolve [-4] [-v] [-x] [-F] " puts("Syntax: tor-resolve [-4] [-v] [-x] [-F] [-p port] "
"hostname [sockshost:socksport]"); "hostname [sockshost:socksport]");
exit(1); exit(1);
} }
@ -303,7 +303,7 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
uint32_t sockshost; uint32_t sockshost;
uint16_t socksport; uint16_t socksport = 0, port_option = 0;
int isSocks4 = 0, isVerbose = 0, isReverse = 0, force = 0; int isSocks4 = 0, isVerbose = 0, isReverse = 0, force = 0;
char **arg; char **arg;
int n_args; int n_args;
@ -336,7 +336,21 @@ main(int argc, char **argv)
isReverse = 1; isReverse = 1;
else if (!strcmp("-F", arg[0])) else if (!strcmp("-F", arg[0]))
force = 1; force = 1;
else { else if (!strcmp("-p", arg[0])) {
int p;
if (n_args < 2) {
fprintf(stderr, "No arguments given to -p\n");
usage();
}
p = atoi(arg[1]);
if (p<1 || p > 65535) {
fprintf(stderr, "-p requires a number between 1 and 65535\n");
usage();
}
port_option = (uint16_t) p;
++arg; /* skip the port */
--n_args;
} else {
fprintf(stderr, "Unrecognized flag '%s'\n", arg[0]); fprintf(stderr, "Unrecognized flag '%s'\n", arg[0]);
usage(); usage();
} }
@ -356,15 +370,26 @@ main(int argc, char **argv)
add_stream_log(s, "<stderr>", stderr); add_stream_log(s, "<stderr>", stderr);
if (n_args == 1) { if (n_args == 1) {
log_debug(LD_CONFIG, "defaulting to localhost:9050"); log_debug(LD_CONFIG, "defaulting to localhost");
sockshost = 0x7f000001u; /* localhost */ sockshost = 0x7f000001u; /* localhost */
if (port_option) {
log_debug(LD_CONFIG, "Using port %d", (int)port_option);
socksport = port_option;
} else {
log_debug(LD_CONFIG, "defaulting to port 9050");
socksport = 9050; /* 9050 */ socksport = 9050; /* 9050 */
}
} else if (n_args == 2) { } else if (n_args == 2) {
if (parse_addr_port(LOG_WARN, arg[1], NULL, &sockshost, &socksport)<0) { if (parse_addr_port(LOG_WARN, arg[1], NULL, &sockshost, &socksport)<0) {
fprintf(stderr, "Couldn't parse/resolve address %s", arg[1]); fprintf(stderr, "Couldn't parse/resolve address %s", arg[1]);
return 1; return 1;
} }
if (socksport == 0) { if (socksport && port_option && socksport != port_option) {
log_warn(LD_CONFIG, "Conflicting ports; using %d, not %d",
(int)socksport, (int)port_option);
} else if (port_option) {
socksport = port_option;
} else {
log_debug(LD_CONFIG, "defaulting to port 9050"); log_debug(LD_CONFIG, "defaulting to port 9050");
socksport = 9050; socksport = 9050;
} }