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

Split uptime into separate field

Browse Source 
svn:r2067
This commit is contained in:
Nick Mathewson 2004-07-20 21:13:11 +00:00
parent 6d53717215
commit 2a339b7627
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/router.c
View File

@ -527,8 +527,8 @@ int router_rebuild_descriptor(void) {
*/
void get_platform_str(char *platform, int len)
{
snprintf(platform, len-1, "Tor %s (up %ld sec) on %s",
VERSION, stats_n_seconds_uptime, get_uname());
snprintf(platform, len-1, "Tor %s on %s",
VERSION, get_uname());
platform[len-1] = '\0';
return;
}
@ -591,6 +591,7 @@ int router_dump_router_to_string(char *s, int maxlen, routerinfo_t *router,
"router %s %s %d %d %d\n"
"platform %s\n"
"published %s\n"
"opt uptime %ld\n"
"bandwidth %d %d %d\n"
"onion-key\n%s"
"signing-key\n%s",
@ -604,6 +605,7 @@ int router_dump_router_to_string(char *s, int maxlen, routerinfo_t *router,
router->is_trusted_dir ? router->dir_port : 0,
router->platform,
published,
stats_n_seconds_uptime,
(int) router->bandwidthrate,
(int) router->bandwidthburst,
(int) router->advertisedbandwidth,

9
src/or/test.c
View File

@ -723,13 +723,14 @@ test_dir_format()
test_assert(router_dump_router_to_string(buf, 2048, &r1, pk2)>0);
strcpy(buf2, "router Magri testaddr1.foo.bar 9000 9002 9003\n"
"platform Tor "VERSION" (up 0 sec) on ");
/* XXX the "0" above is hardcoded, but even if we made it reflect
* uptime, that still wouldn't make it right, because the two
* descriptors might be made on different seconds... hm. */
"platform Tor "VERSION" on ");
strcat(buf2, get_uname());
strcat(buf2, "\n"
"published 1970-01-01 00:00:00\n"
"opt uptime 0\n"
/* XXX the "0" above is hardcoded, but even if we made it reflect
* uptime, that still wouldn't make it right, because the two
* descriptors might be made on different seconds... hm. */
"bandwidth 1000 5000 10000\n"
"onion-key\n");
strcat(buf2, pk1_str);