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

Merge branch 'tor-github/pr/1861'

Browse Source
This commit is contained in:
George Kadianakis 2020-05-21 16:22:47 +03:00
commit fb281daf29
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/ticket32873 Normal file
View File

@ -0,0 +1,6 @@
o Minor features (control port):
- Return a descriptive error message from the 'GETINFO
status/fresh-relay-descs' command on the control port.
Previously, we returned a generic error of "Error
generating descriptor". Closes ticket 32873. Patch by
Neel Chauhan.

16
src/feature/control/control_getinfo.c
View File

@ -1332,8 +1332,22 @@ getinfo_helper_events(control_connection_t *control_conn,
} }
routerinfo_t *r; routerinfo_t *r;
extrainfo_t *e; extrainfo_t *e;
if (router_build_fresh_descriptor(&r, &e) < 0) { int result;
if ((result = router_build_fresh_descriptor(&r, &e)) < 0) {
switch (result) {
case TOR_ROUTERINFO_ERROR_NO_EXT_ADDR:
*errmsg = "Cannot get relay address while generating descriptor";
break;
case TOR_ROUTERINFO_ERROR_DIGEST_FAILED:
*errmsg = "Key digest failed";
break;
case TOR_ROUTERINFO_ERROR_CANNOT_GENERATE:
*errmsg = "Cannot generate router descriptor";
break;
default:
*errmsg = "Error generating descriptor"; *errmsg = "Error generating descriptor";
break;
}
return -1; return -1;
} }
size_t size = r->cache_info.signed_descriptor_len + 1; size_t size = r->cache_info.signed_descriptor_len + 1;