mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

trivial cleanups

Browse source
This commit is contained in:
Roger Dingledine 2010-01-12 14:05:12 -05:00
parent 397f7c874f
commit 50e8210943
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/or/directory.c
View file

@ -96,8 +96,9 @@ static void directory_initiate_command_rend(const char *address,
/********* END VARIABLES ************/ /********* END VARIABLES ************/
/** Return true iff the directory purpose 'purpose' must use an /** Return true iff the directory purpose <b>dir_purpose</b> (and if it's
* anonymous connection to a directory. */ * fetching descriptors, it's fetching them for <b>router_purpose</b>)
* must use an anonymous connection to a directory. */
static int static int
purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose) purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose)
{ {
@ -229,7 +230,7 @@ directories_have_accepted_server_descriptor(void)
/** Start a connection to every suitable directory authority, using /** Start a connection to every suitable directory authority, using
* connection purpose 'purpose' and uploading the payload 'payload' * connection purpose 'purpose' and uploading the payload 'payload'
* (length 'payload_len'). The purpose should be one of * (length 'payload_len'). dir_purpose should be one of
* 'DIR_PURPOSE_UPLOAD_DIR' or 'DIR_PURPOSE_UPLOAD_RENDDESC'. * 'DIR_PURPOSE_UPLOAD_DIR' or 'DIR_PURPOSE_UPLOAD_RENDDESC'.
* *
* <b>type</b> specifies what sort of dir authorities (V1, V2, * <b>type</b> specifies what sort of dir authorities (V1, V2,
@ -919,7 +920,7 @@ directory_get_consensus_url(int supports_conditional_consensus)
} }
/** Queue an appropriate HTTP command on conn-\>outbuf. The other args /** Queue an appropriate HTTP command on conn-\>outbuf. The other args
* are as in directory_initiate_command. * are as in directory_initiate_command().
*/ */
static void static void
directory_send_command(dir_connection_t *conn, directory_send_command(dir_connection_t *conn,
@ -1147,7 +1148,7 @@ parse_http_url(const char *headers, char **url)
if (s-tmp >= 3 && !strcmpstart(tmp,"://")) { if (s-tmp >= 3 && !strcmpstart(tmp,"://")) {
tmp = strchr(tmp+3, '/'); tmp = strchr(tmp+3, '/');
if (tmp && tmp < s) { if (tmp && tmp < s) {
log_debug(LD_DIR,"Skipping over 'http[s]://hostname' string"); log_debug(LD_DIR,"Skipping over 'http[s]://hostname/' string");
start = tmp; start = tmp;
} }
} }
@ -2303,7 +2304,7 @@ directory_dump_request_log(void)
} }
#endif #endif
/** Decide whether a client would accept the consensus we have /** Decide whether a client would accept the consensus we have.
* *
* Clients can say they only want a consensus if it's signed by more * Clients can say they only want a consensus if it's signed by more
* than half the authorities in a list. They pass this list in * than half the authorities in a list. They pass this list in

5
src/or/dirserv.c
View file

@ -102,7 +102,7 @@ authdir_config_new(void)
return list; return list;
} }
/** Add the fingerprint <b>fp</b> for the nickname <b>nickname</b> to /** Add the fingerprint <b>fp</b> for <b>nickname</b> to
* the smartlist of fingerprint_entry_t's <b>list</b>. Return 0 if it's * the smartlist of fingerprint_entry_t's <b>list</b>. Return 0 if it's
* new, or 1 if we replaced the old value. * new, or 1 if we replaced the old value.
*/ */
@ -184,8 +184,7 @@ dirserv_add_own_fingerprint(const char *nickname, crypto_pk_env_t *pk)
* file. The file format is line-based, with each non-blank holding one * file. The file format is line-based, with each non-blank holding one
* nickname, some space, and a fingerprint for that nickname. On success, * nickname, some space, and a fingerprint for that nickname. On success,
* replace the current fingerprint list with the new list and return 0. On * replace the current fingerprint list with the new list and return 0. On
* failure, leave the current fingerprint list untouched, and * failure, leave the current fingerprint list untouched, and return -1. */
* return -1. */
int int
dirserv_load_fingerprint_file(void) dirserv_load_fingerprint_file(void)
{ {