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

Merge branch 'maint-0.4.8'

Browse Source
This commit is contained in:
Alexander Færøy 2024-02-28 16:52:56 +00:00
commit 72ac1de514
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug40910 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (directory authorities):
- Add a warning when publishing a vote or signatures to another
directory authority fails. Fixes bug 40910; bugfix on
0.2.0.3-alpha.

7
src/feature/dirclient/dirclient.c
View File

@ -101,7 +101,7 @@ dir_conn_purpose_to_string(int purpose)
case DIR_PURPOSE_UPLOAD_DIR:
return "server descriptor upload";
case DIR_PURPOSE_UPLOAD_VOTE:
return "server vote upload";
return "consensus vote upload";
case DIR_PURPOSE_UPLOAD_SIGNATURES:
return "consensus signature upload";
case DIR_PURPOSE_FETCH_SERVERDESC:
@ -763,6 +763,11 @@ connection_dir_client_request_failed(dir_connection_t *conn)
"directory server at %s; will retry",
connection_describe_peer(TO_CONN(conn)));
connection_dir_download_routerdesc_failed(conn);
} else if (conn->base_.purpose == DIR_PURPOSE_UPLOAD_VOTE ||
conn->base_.purpose == DIR_PURPOSE_UPLOAD_SIGNATURES) {
log_warn(LD_DIR, "Failed to post %s to %s.",
dir_conn_purpose_to_string(conn->base_.purpose),
connection_describe_peer(TO_CONN(conn)));
}
}

2
src/test/test_dir.c
View File

@ -5264,7 +5264,7 @@ test_dir_conn_purpose_to_string(void *data)
tt_str_op(dir_conn_purpose_to_string(purpose), OP_EQ, expected);
EXPECT_CONN_PURPOSE(DIR_PURPOSE_UPLOAD_DIR, "server descriptor upload");
EXPECT_CONN_PURPOSE(DIR_PURPOSE_UPLOAD_VOTE, "server vote upload");
EXPECT_CONN_PURPOSE(DIR_PURPOSE_UPLOAD_VOTE, "consensus vote upload");
EXPECT_CONN_PURPOSE(DIR_PURPOSE_UPLOAD_SIGNATURES,
"consensus signature upload");
EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_SERVERDESC, "server descriptor fetch");