summaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2017-08-05 00:33:34 +0300
committerNick Mathewson <nickm@torproject.org>2017-08-08 20:29:35 -0400
commit0bf8587858b927d1dcb39189442f55d8dabe50aa (patch)
treec06aedc07b074aded43249de7b90e116df528bea /src/or/directory.c
parentfe0c40c9b344853963dc7af0f746d8c772bb3a97 (diff)
downloadtor-0bf8587858b927d1dcb39189442f55d8dabe50aa.tar.gz
tor-0bf8587858b927d1dcb39189442f55d8dabe50aa.zip
Do more type checking when setting HS idents.
I repurposed the old directory_request_set_hs_ident() into a new directory_request_upload_set_hs_ident() which is only used for the upload purpose and so it can assert on the dir_purpose. When coding the client-side we can make a second function for fetch.
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index fc83c013cb..e079a5941f 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1281,12 +1281,11 @@ directory_request_set_rend_query(directory_request_t *req,
* <b>ident</b> object must outlive the request.
*/
void
-directory_request_set_hs_ident(directory_request_t *req,
- const hs_ident_dir_conn_t *ident)
+directory_request_upload_set_hs_ident(directory_request_t *req,
+ const hs_ident_dir_conn_t *ident)
{
if (ident) {
- tor_assert(req->dir_purpose == DIR_PURPOSE_FETCH_HSDESC ||
- req->dir_purpose == DIR_PURPOSE_UPLOAD_HSDESC);
+ tor_assert(req->dir_purpose == DIR_PURPOSE_UPLOAD_HSDESC);
}
req->hs_ident = ident;
}