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

complain early if we get an unrecognized nickname from

Browse Source 
bob's rend service descriptor


svn:r1482
This commit is contained in:
Roger Dingledine 2004-04-05 17:51:00 +00:00
parent 12ede0a2c4
commit ac84512489
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/connection_edge.c
View File

@ -777,12 +777,16 @@ circuit_get_open_circ_or_launch(connection_t *conn,
if(desired_circuit_purpose == CIRCUIT_PURPOSE_C_INTRODUCING) { if(desired_circuit_purpose == CIRCUIT_PURPOSE_C_INTRODUCING) {
/* need to pick an intro point */ /* need to pick an intro point */
exitname = rend_get_random_intro(conn->rend_query); exitname = rend_client_get_random_intro(conn->rend_query);
if(!exitname) { if(!exitname) {
log_fn(LOG_WARN,"Couldn't get an intro point for '%s'. Closing conn.", log_fn(LOG_WARN,"Couldn't get an intro point for '%s'. Closing conn.",
conn->rend_query); conn->rend_query);
return -1; return -1;
} }
if(!router_get_by_nickname(exitname)) {
log_fn(LOG_WARN,"Advertised intro point '%s' is not known. Closing.", exitname);
return -1;
}
log_fn(LOG_INFO,"Chose %s as intro point for %s.", exitname, conn->rend_query); log_fn(LOG_INFO,"Chose %s as intro point for %s.", exitname, conn->rend_query);
} }

2
src/or/or.h
View File

@ -1046,7 +1046,7 @@ int rend_client_receive_rendezvous(circuit_t *circ, const char *request, int req
void rend_client_desc_fetched(char *query, int success); void rend_client_desc_fetched(char *query, int success);
int rend_cmp_service_ids(char *one, char *two); int rend_cmp_service_ids(char *one, char *two);
char *rend_get_random_intro(char *query); char *rend_client_get_random_intro(char *query);
int rend_parse_rendezvous_address(char *address); int rend_parse_rendezvous_address(char *address);
int rend_client_send_establish_rendezvous(circuit_t *circ); int rend_client_send_establish_rendezvous(circuit_t *circ);

2
src/or/rendclient.c
View File

@ -208,7 +208,7 @@ int rend_cmp_service_ids(char *one, char *two) {
/* return a pointer to a nickname for a random introduction /* return a pointer to a nickname for a random introduction
* point of query. return NULL if error. * point of query. return NULL if error.
*/ */
char *rend_get_random_intro(char *query) { char *rend_client_get_random_intro(char *query) {
const char *descp; const char *descp;
int desc_len; int desc_len;
int i; int i;