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

Fix indentation on a block

Browse Source
This commit is contained in:
Nick Mathewson 2015-04-15 11:05:09 -04:00
parent 1a7dea9191
commit cc10f13408
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/or/control.c
View File

@ -2101,45 +2101,45 @@ getinfo_helper_events(control_connection_t *control_conn,
}
*answer = bridge_stats;
} else if (!strcmp(question, "status/fresh-relay-descs")) {
if (!server_mode(get_options())) {
*errmsg = "Only relays have descriptors";
return -1;
if (!server_mode(get_options())) {
*errmsg = "Only relays have descriptors";
return -1;
}
routerinfo_t *r;
extrainfo_t *e;
if (router_build_fresh_descriptor(&r, &e) < 0) {
*errmsg = "Error generating descriptor";
return -1;
}
size_t size = r->cache_info.signed_descriptor_len + 1;
if (e) {
size += e->cache_info.signed_descriptor_len + 1;
}
tor_assert(r->cache_info.signed_descriptor_len);
char *descs = tor_malloc(size);
char *cp = descs;
memcpy(cp, signed_descriptor_get_body(&r->cache_info),
r->cache_info.signed_descriptor_len);
cp += r->cache_info.signed_descriptor_len - 1;
if (e) {
if (cp[0] == '\0') {
cp[0] = '\n';
} else if (cp[0] != '\n') {
cp[1] = '\n';
cp++;
}
routerinfo_t *r;
extrainfo_t *e;
if (router_build_fresh_descriptor(&r, &e) < 0) {
*errmsg = "Error generating descriptor";
return -1;
}
size_t size = r->cache_info.signed_descriptor_len + 1;
if (e) {
size += e->cache_info.signed_descriptor_len + 1;
}
tor_assert(r->cache_info.signed_descriptor_len);
char *descs = tor_malloc(size);
char *cp = descs;
memcpy(cp, signed_descriptor_get_body(&r->cache_info),
r->cache_info.signed_descriptor_len);
cp += r->cache_info.signed_descriptor_len - 1;
if (e) {
if (cp[0] == '\0') {
cp[0] = '\n';
} else if (cp[0] != '\n') {
cp[1] = '\n';
cp++;
}
memcpy(cp, signed_descriptor_get_body(&e->cache_info),
e->cache_info.signed_descriptor_len);
cp += e->cache_info.signed_descriptor_len - 1;
}
if (cp[0] == '\n') {
cp[0] = '\0';
} else if (cp[0] != '\0') {
cp[1] = '\0';
}
*answer = descs;
routerinfo_free(r);
extrainfo_free(e);
memcpy(cp, signed_descriptor_get_body(&e->cache_info),
e->cache_info.signed_descriptor_len);
cp += e->cache_info.signed_descriptor_len - 1;
}
if (cp[0] == '\n') {
cp[0] = '\0';
} else if (cp[0] != '\0') {
cp[1] = '\0';
}
*answer = descs;
routerinfo_free(r);
extrainfo_free(e);
} else {
return 0;
}