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

Make dirserv_get_routerdesc_fingerprints() treat extrainfos with send_unencrypted==0 correctly. Irrelevant, since we will soon never send them at all.

Browse Source 
svn:r17953
This commit is contained in:
Nick Mathewson 2009-01-06 15:37:51 +00:00
parent d95b63f1e4
commit 9abfb564a0
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/directory.c
View File

@ -2708,7 +2708,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
conn->fingerprint_stack = smartlist_create();
res = dirserv_get_routerdesc_fingerprints(conn->fingerprint_stack, url,
&msg,
!connection_dir_is_encrypted(conn));
!connection_dir_is_encrypted(conn),
is_extra);
if (!strcmpstart(url, "fp/")) {
request_type = compressed?"/tor/server/fp.z":"/tor/server/fp";

15
src/or/dirserv.c
View File

@ -2680,7 +2680,8 @@ dirserv_get_networkstatus_v2(smartlist_t *result,
*/
int
dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key,
const char **msg, int for_unencrypted_conn)
const char **msg, int for_unencrypted_conn,
int is_extrainfo)
{
int by_id = 1;
*msg = NULL;
@ -2708,11 +2709,15 @@ dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key,
}
if (for_unencrypted_conn) {
/* Remove anything whose purpose isn't general. */
/* Remove anything that insists it not be sent unencrypted. */
SMARTLIST_FOREACH(fps_out, char *, cp, {
signed_descriptor_t *sd =
by_id ? get_signed_descriptor_by_fp(cp,0,0) :
router_get_by_descriptor_digest(cp);
signed_descriptor_t *sd;
if (by_id)
sd = get_signed_descriptor_by_fp(cp,is_extrainfo,0);
else if (is_extrainfo)
sd = extrainfo_get_by_descriptor_digest(cp);
else
sd = router_get_by_descriptor_digest(cp);
if (sd && !sd->send_unencrypted) {
tor_free(cp);
SMARTLIST_DEL_CURRENT(fps_out, cp);

3
src/or/or.h
View File

@ -3467,7 +3467,8 @@ void dirserv_get_networkstatus_v2_fingerprints(smartlist_t *result,
const char *key);
int dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key,
const char **msg,
int for_unencrypted_conn);
int for_unencrypted_conn,
int is_extrainfo);
int dirserv_get_routerdescs(smartlist_t *descs_out, const char *key,
const char **msg);
void dirserv_orconn_tls_done(const char *address,