nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-12 22:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle empty DNS reply without error as NOERROR

Browse Source
This commit is contained in:
Daniel Winzen 2024-09-24 15:07:59 +02:00
parent a56350abc8
commit 3d2f7c3467
No known key found for this signature in database
GPG Key ID: 222FCC3F35C41077
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/or/or.h
View File

@ -301,6 +301,7 @@ struct curve25519_public_key_t;
#define RESOLVED_TYPE_IPV6 6
#define RESOLVED_TYPE_ERROR_TRANSIENT 0xF0
#define RESOLVED_TYPE_ERROR 0xF1
#define RESOLVED_TYPE_NOERROR 0xF2
/* Negative reasons are internal: we never send them in a DESTROY or TRUNCATE
* call; they only go to the controller for tracking */

2
src/core/or/relay.c
View File

@ -1343,7 +1343,7 @@ connection_ap_handshake_socks_got_resolved_cell(entry_connection_t *conn,
/* Now convert it to the ugly old interface */
if (! addr_best) {
connection_ap_handshake_socks_resolved(conn,
RESOLVED_TYPE_ERROR,0,NULL,-1,-1);
RESOLVED_TYPE_NOERROR,0,NULL,-1,-1);
return;
}

3
src/feature/client/dnsserv.c
View File

@ -319,6 +319,7 @@ evdns_get_orig_address(const struct evdns_server_request *req,
break;
case RESOLVED_TYPE_ERROR:
case RESOLVED_TYPE_ERROR_TRANSIENT:
case RESOLVED_TYPE_NOERROR:
/* Addr doesn't matter, since we're not sending it back in the reply.*/
return addr;
default:
@ -379,6 +380,8 @@ dnsserv_resolved(entry_connection_t *conn,
tor_free(ans);
} else if (answer_type == RESOLVED_TYPE_ERROR) {
err = DNS_ERR_NOTEXIST;
} else if (answer_type == RESOLVED_TYPE_NOERROR) {
err = DNS_ERR_NONE;
} else { /* answer_type == RESOLVED_TYPE_ERROR_TRANSIENT */
err = DNS_ERR_SERVERFAILED;
}

2
src/test/test_relaycell.c
View File

@ -988,7 +988,7 @@ test_relaycell_resolved(void *arg)
tt_int_op(r, OP_EQ, 0);
ASSERT_MARK_CALLED(END_STREAM_REASON_DONE|
END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_ERROR, NULL, -1, -1);
ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_NOERROR, NULL, -1, -1);
/* If we wanted hostnames, we report nothing, since we only had IPs. */
MOCK_RESET();