diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-07-20 21:13:11 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-07-20 21:13:11 +0000 |
| commit | 2a339b7627bad567c54a7e274462f8abf66efdf8 (patch) | |
| tree | a17ef56ea38269607341c02b7bf7cc1a95f8f8b8 | |
| parent | 6d53717215bb6c47b277a46060fb52e92d297a45 (diff) | |
| download | tor-2a339b7627bad567c54a7e274462f8abf66efdf8.tar tor-2a339b7627bad567c54a7e274462f8abf66efdf8.tar.gz | |
Split uptime into separate field
svn:r2067
| -rw-r--r-- | src/or/router.c | 6 | ||||
| -rw-r--r-- | src/or/test.c | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/or/router.c b/src/or/router.c index 35562eff7..f9b413db0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -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, diff --git a/src/or/test.c b/src/or/test.c index 1acd13f18..95556c445 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -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); |