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

Merge commit 'ioerror/LetsKillNoConnect'

Browse Source
This commit is contained in:
Nick Mathewson 2009-08-09 18:55:32 -07:00
commit 492416be0c
4 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -49,6 +49,7 @@ Changes in version 0.2.2.1-alpha - 2009-0?-??
- The EXTENDED_EVENTS and VERBOSE_NAMES controller features are now
always on; using them is necessary for correct forward-compatible
controllers.
- Removal of support for .noconnect style addresses.
Changes in version 0.2.1.20 - 2009-??-??

12
doc/spec/address-spec.txt
View File

@ -53,15 +53,3 @@
When Tor sees an address in this format, it tries to look up and connect to
the specified hidden service. See rend-spec.txt for full details.
4. .noconnect
SYNTAX: [string].noconnect
When Tor sees an address in this format, it immediately closes the
connection without attaching it to any circuit. This is useful for
controllers that want to test whether a given application is indeed using
the same instance of Tor that they're controlling.
5. [XXX Is there a ".virtual" address that we expose too, or is that
just intended to be internal? -RD]

16
src/or/connection_edge.c
View File

@ -1875,14 +1875,6 @@ connection_ap_handshake_process_socks(edge_connection_t *conn)
return -1;
} /* else socks handshake is done, continue processing */
if (hostname_is_noconnect_address(socks->address))
{
control_event_stream_status(conn, STREAM_EVENT_NEW, 0);
control_event_stream_status(conn, STREAM_EVENT_CLOSED, 0);
connection_mark_unattached_ap(conn, END_STREAM_REASON_DONE);
return -1;
}
if (SOCKS_COMMAND_IS_CONNECT(socks->command))
control_event_stream_status(conn, STREAM_EVENT_NEW, 0);
else
@ -2944,11 +2936,3 @@ failed:
return BAD_HOSTNAME;
}
/** Check if the address is of the form "y.noconnect"
*/
int
hostname_is_noconnect_address(const char *address)
{
return ! strcasecmpend(address, ".noconnect");
}

7
src/or/dnsserv.c
View File

@ -92,12 +92,7 @@ evdns_server_callback(struct evdns_server_request *req, void *_data)
evdns_server_request_respond(req, DNS_ERR_NONE);
return;
}
if (q->type == EVDNS_TYPE_A) {
/* Refuse any attempt to resolve a noconnect address, right now. */
if (hostname_is_noconnect_address(q->name)) {
err = DNS_ERR_REFUSED;
}
} else {
if (q->type != EVDNS_TYPE_A) {
tor_assert(q->type == EVDNS_TYPE_PTR);
}