June 2012 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug5603'
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit 7b2afb61b21d09bc3dfc015a18538bf2826e805c Merge: d09a3ec 7cad2e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 5 11:47:34 2012 -0400 Merge branch 'bug5603' changes/bug5603 | 9 ++++++ src/or/circuitbuild.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 75 insertions(+), 4 deletions(-)

1 0

[tor/master] Use GetFileSize correctly on win32
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit e7d34935fb3050065cf0d8350b5d75f72c1fe6c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 24 10:19:41 2012 -0400 Use GetFileSize correctly on win32 (Use its second parameter to find the high 32 bits of the file size; check its return value for error conditions.) --- changes/getfilesize_64 | 3 +++ src/common/compat.c | 24 ++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/changes/getfilesize_64 b/changes/getfilesize_64 new file mode 100644 index 0000000..abcdab6 --- /dev/null +++ b/changes/getfilesize_64 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - On Windows, correctly detect errors and large file sizes from + GetFileSize. Fixes bug 5957; bugfix on Tor 0.1.2.1-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index a4e5074..00ebbe4 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -175,6 +175,8 @@ tor_mmap_file(const char *filename) TCHAR tfilename[MAX_PATH]= {0}; tor_mmap_t *res = tor_malloc_zero(sizeof(tor_mmap_t)); int empty = 0; + DWORD size_low, size_high; + uint64_t real_size; res->file_handle = INVALID_HANDLE_VALUE; res->mmap_handle = NULL; #ifdef UNICODE @@ -192,23 +194,29 @@ tor_mmap_file(const char *filename) if (res->file_handle == INVALID_HANDLE_VALUE) goto win_err; - res->size = GetFileSize(res->file_handle, NULL); + size_low = GetFileSize(res->file_handle, &size_high); - if (res->size == 0) { + if (size_low == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) { + log_warn(LD_FS,"Error getting size of \"%s\".",filename); + goto win_err; + } + if (size_low == 0 && size_high == 0) { log_info(LD_FS,"File \"%s\" is empty. Ignoring.",filename); empty = 1; goto err; } + real_size = (((uint64_t)size_high)<<32) | size_low; + if (real_size > SIZE_MAX) { + log_warn(LD_FS,"File \"%s\" is too big to map; not trying.",filename); + goto err; + } + res->size = real_size; res->mmap_handle = CreateFileMapping(res->file_handle, NULL, PAGE_READONLY, -#if SIZEOF_SIZE_T > 4 - (res->base.size >> 32), -#else - 0, -#endif - (res->size & 0xfffffffful), + size_high, + size_low, NULL); if (res->mmap_handle == NULL) goto win_err;

1 0

[tor/master] Fix some mingw build warnings
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit b482c870ca3d70bc5611b8eb447ebbe3418bf3a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 5 11:06:26 2012 -0400 Fix some mingw build warnings These include: - Having a weird in_addr that can't be initialized with {0} - Needing INVALID_HANDLE_VALUE instead of -1 for file handles. - Having a weird dependent definition for struct stat. - pid is signed, not unsigned. --- src/common/address.h | 4 +++- src/common/util.c | 5 ++++- src/common/util.h | 6 ++++++ src/test/test.c | 2 +- src/test/test_util.c | 5 +++++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/common/address.h b/src/common/address.h index e942949..c6c1268 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -26,6 +26,8 @@ typedef struct tor_addr_t { sa_family_t family; union { + uint32_t dummy_; /* This field is here so we have something to initialize + * with a reliable cross-platform type. */ struct in_addr in_addr; struct in6_addr in6_addr; } addr; @@ -38,7 +40,7 @@ typedef struct tor_addr_port_t uint16_t port; } tor_addr_port_t; -#define TOR_ADDR_NULL {AF_UNSPEC, {{0}}}; +#define TOR_ADDR_NULL {AF_UNSPEC, {0}}; static INLINE const struct in6_addr *tor_addr_to_in6(const tor_addr_t *a); static INLINE uint32_t tor_addr_to_ipv4n(const tor_addr_t *a); diff --git a/src/common/util.c b/src/common/util.c index 74f8bd8..4c086e8 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3317,7 +3317,10 @@ process_handle_new(void) { process_handle_t *out = tor_malloc_zero(sizeof(process_handle_t)); -#ifndef _WIN32 +#ifdef _WIN32 + out->stdout_pipe = INVALID_HANDLE_VALUE; + out->stderr_pipe = INVALID_HANDLE_VALUE; +#else out->stdout_pipe = -1; out->stderr_pipe = -1; #endif diff --git a/src/common/util.h b/src/common/util.h index c975441..527dc48 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -17,6 +17,10 @@ #include "di_ops.h" #include <stdio.h> #include <stdlib.h> +#ifdef _WIN32 +/* for the correct alias to struct stat */ +#include <sys/stat.h> +#endif #ifndef O_BINARY #define O_BINARY 0 @@ -350,7 +354,9 @@ int write_bytes_to_new_file(const char *fname, const char *str, size_t len, /** Flag for read_file_to_str: it's okay if the file doesn't exist. */ #define RFTS_IGNORE_MISSING 2 +#ifndef _WIN32 struct stat; +#endif char *read_file_to_str(const char *filename, int flags, struct stat *stat_out) ATTR_MALLOC; const char *parse_config_line_from_str(const char *line, diff --git a/src/test/test.c b/src/test/test.c index 5f0b470..4f19f36 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -72,7 +72,7 @@ int have_failed = 0; * our files during testing. */ static char temp_dir[256]; #ifdef _WIN32 -#define pid_t unsigned +#define pid_t int #endif static pid_t temp_dir_setup_in_pid = 0; diff --git a/src/test/test_util.c b/src/test/test_util.c index bf33344..4b628ea 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2274,8 +2274,13 @@ run_util_spawn_background(const char *argv[], const char *expected_out, test_assert(process_handle != NULL); test_eq(expected_status, process_handle->status); +#ifdef _WIN32 + test_assert(process_handle->stdout_pipe != INVALID_HANDLE_VALUE); + test_assert(process_handle->stderr_pipe != INVALID_HANDLE_VALUE); +#else test_assert(process_handle->stdout_pipe > 0); test_assert(process_handle->stderr_pipe > 0); +#endif /* Check stdout */ pos = tor_read_all_from_process_stdout(process_handle, stdout_buf,

1 0

[tor/master] Merge remote-tracking branch 'public/getfilesize_64'
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit d09a3ecd01330e2ec5da942a0469a37416da75ed Merge: b482c87 e7d3493 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 5 11:10:42 2012 -0400 Merge remote-tracking branch 'public/getfilesize_64' Conflicts: src/common/compat.c The getfilesize change conflicted with the removal of file_handle from the windows tor_mmap_t. changes/getfilesize_64 | 3 +++ src/common/compat.c | 24 ++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --cc src/common/compat.c index 87fe84c,00ebbe4..334ea1b --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -228,40 -175,48 +228,48 @@@ tor_mmap_file(const char *filename TCHAR tfilename[MAX_PATH]= {0}; tor_mmap_t *res = tor_malloc_zero(sizeof(tor_mmap_t)); int empty = 0; + HANDLE file_handle = INVALID_HANDLE_VALUE; + DWORD size_low, size_high; + uint64_t real_size; - res->file_handle = INVALID_HANDLE_VALUE; res->mmap_handle = NULL; #ifdef UNICODE mbstowcs(tfilename,filename,MAX_PATH); #else strlcpy(tfilename,filename,MAX_PATH); #endif - res->file_handle = CreateFile(tfilename, - GENERIC_READ, FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - 0); + file_handle = CreateFile(tfilename, + GENERIC_READ, FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + 0); - if (res->file_handle == INVALID_HANDLE_VALUE) + if (file_handle == INVALID_HANDLE_VALUE) goto win_err; - res->size = GetFileSize(file_handle, NULL); - size_low = GetFileSize(res->file_handle, &size_high); ++ size_low = GetFileSize(file_handle, &size_high); - if (res->size == 0) { + if (size_low == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) { + log_warn(LD_FS,"Error getting size of \"%s\".",filename); + goto win_err; + } + if (size_low == 0 && size_high == 0) { log_info(LD_FS,"File \"%s\" is empty. Ignoring.",filename); empty = 1; goto err; } + real_size = (((uint64_t)size_high)<<32) | size_low; + if (real_size > SIZE_MAX) { + log_warn(LD_FS,"File \"%s\" is too big to map; not trying.",filename); + goto err; + } + res->size = real_size; - res->mmap_handle = CreateFileMapping(res->file_handle, + res->mmap_handle = CreateFileMapping(file_handle, NULL, PAGE_READONLY, - #if SIZEOF_SIZE_T > 4 - (res->base.size >> 32), - #else - 0, - #endif - (res->size & 0xfffffffful), + size_high, + size_low, NULL); if (res->mmap_handle == NULL) goto win_err;

1 0

[tor/master] Revert "Disable (Cell, DirReq, Entry, ExitPort)Statistics on bridges"
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit 2468a1bd2c3a989c4225897e58b5bf09ac08ba61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 5 10:47:05 2012 -0400 Revert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges" This reverts commit 981e896dd2eaf69798bb503c271306ee779dd6d2. Apparently Karsten still needs DirReqStatistics for bridges; see --- changes/bug5824 | 3 --- src/or/config.c | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/changes/bug5824 b/changes/bug5824 deleted file mode 100644 index a75e8ed..0000000 --- a/changes/bug5824 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Bridges now never collect statistics that were designed for - relays. Fix for bug 5824; bugfix on 0.2.1.17-rc. diff --git a/src/or/config.c b/src/or/config.c index 03186bf..090d96c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1703,9 +1703,8 @@ options_act(const or_options_t *old_options) time_t now = time(NULL); int print_notice = 0; - /* If we aren't acting as a server, or we are a bridge, we can't collect - * stats anyway. */ - if (!public_server_mode(options)) { + /* If we aren't acting as a server, we can't collect stats anyway. */ + if (!server_mode(options)) { options->CellStatistics = 0; options->DirReqStatistics = 0; options->EntryStatistics = 0;

1 0

[tor/master] Downgrade tor_assert(0) to tor_fragile_assert() in windows stub create_unix_sockaddr
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit 38642a9369faa3e511c32a59a52536fd396de45a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 5 10:36:34 2012 -0400 Downgrade tor_assert(0) to tor_fragile_assert() in windows stub create_unix_sockaddr --- src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 35c79b9..34e1a5c 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -778,7 +778,7 @@ create_unix_sockaddr(const char *listenaddress, char **readable_address, log_fn(LOG_ERR, LD_BUG, "Unix domain sockets not supported, yet we tried to create one."); *len_out = 0; - tor_assert(0); + tor_fragile_assert(); return NULL; } #endif /* HAVE_SYS_UN_H */

1 0

[tor/master] Use %f, not %lf when formatting doubles
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit 0bec9f320b81a85ba3596e9780b1cf7c770dfb31 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 14:26:35 2012 -0400 Use %f, not %lf when formatting doubles %f is correct; %lf is only needed with scanf. Apparently, on some old BSDs, %lf is deprecated. Didn't we do this before? Yes, we did. But we only got the instances of %lf, not more complicated things like %.5lf . This patch tries to get everything. Based on a patch for 3894 by grarpamp. --- changes/bug3894_fmt_doubles | 4 ++++ src/or/dirserv.c | 2 +- src/or/geoip.c | 4 ++-- src/or/rephist.c | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/changes/bug3894_fmt_doubles b/changes/bug3894_fmt_doubles new file mode 100644 index 0000000..0cd0aa2 --- /dev/null +++ b/changes/bug3894_fmt_doubles @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Format more doubles with %f, not %lf. Patch from grarpamp to make + Tor build correctly on older BSDs again. Fixes bug 3894; bugfix on + Tor 0.2.0.8-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 0308d4d..a98b20b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1939,7 +1939,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl) log(LOG_INFO, LD_DIRSERV, "Cutoffs: For Stable, %lu sec uptime, %lu sec MTBF. " "For Fast: %lu bytes/sec. " - "For Guard: WFU %.03lf%%, time-known %lu sec, " + "For Guard: WFU %.03f%%, time-known %lu sec, " "and bandwidth %lu or %lu bytes/sec. We%s have enough stability data.", (unsigned long)stable_uptime, (unsigned long)stable_mtbf, diff --git a/src/or/geoip.c b/src/or/geoip.c index c51142c..8fb4c98 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1026,9 +1026,9 @@ geoip_dirreq_stats_write(time_t now) memset(ns_v2_responses, 0, sizeof(ns_v2_responses)); memset(ns_v3_responses, 0, sizeof(ns_v3_responses)); if (!geoip_get_mean_shares(now, &v2_share, &v3_share)) { - if (fprintf(out, "dirreq-v2-share %0.2lf%%\n", v2_share*100) < 0) + if (fprintf(out, "dirreq-v2-share %0.2f%%\n", v2_share*100) < 0) goto done; - if (fprintf(out, "dirreq-v3-share %0.2lf%%\n", v3_share*100) < 0) + if (fprintf(out, "dirreq-v3-share %0.2f%%\n", v3_share*100) < 0) goto done; } diff --git a/src/or/rephist.c b/src/or/rephist.c index 1dd3d94..f05186e 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -838,7 +838,7 @@ rep_hist_record_mtbf_data(time_t now, int missing_means_down) format_iso_time(time_buf, hist->start_of_run); t = time_buf; } - PRINTF((f, "+MTBF %lu %.5lf%s%s\n", + PRINTF((f, "+MTBF %lu %.5f%s%s\n", hist->weighted_run_length, hist->total_run_weights, t ? " S=" : "", t ? t : "")); t = NULL; @@ -888,10 +888,10 @@ rep_hist_format_router_status(or_history_t *hist, time_t now) tor_asprintf(&cp, "%s%s%s" "%s%s%s" - "wfu %0.3lf\n" + "wfu %0.3f\n" " weighted-time %lu\n" " weighted-uptime %lu\n" - "mtbf %0.1lf\n" + "mtbf %0.1f\n" " weighted-run-length %lu\n" " total-run-weights %f\n", up?"uptime-started ":"", up?sor_buf:"", up?" UTC\n":"",

1 0

[tor/master] Fix some more FreeBSD4 issues (based on a patch from grarpamp)
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit f35271bf3eceadd03bff26d34c1d020892d6c6f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 14:31:36 2012 -0400 Fix some more FreeBSD4 issues (based on a patch from grarpamp) Apparently, freebsd 4 doesn't like malloc.h, needs sys/param.h for MIN/MAX, and doesn't have a SIZE_MAX. For bug 3894. --- changes/bug3894_more | 4 ++++ configure.in | 2 ++ src/common/compat.h | 3 +++ src/common/torint.h | 10 ++++++++++ src/common/util.c | 2 +- 5 files changed, 20 insertions(+), 1 deletions(-) diff --git a/changes/bug3894_more b/changes/bug3894_more new file mode 100644 index 0000000..4c2220a --- /dev/null +++ b/changes/bug3894_more @@ -0,0 +1,4 @@ + o Build fixes: + - Clean up some code issues that prevented Tor from building on older + BSDs. Fixes bug 3894; reported by grarpamp. + diff --git a/configure.in b/configure.in index 424cccb..df4c6f6 100644 --- a/configure.in +++ b/configure.in @@ -417,6 +417,8 @@ dnl These headers are not essential AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h limits.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h inttypes.h utime.h sys/utime.h sys/mman.h netinet/in6.h malloc.h sys/syslimits.h malloc/malloc.h linux/types.h sys/file.h malloc_np.h sys/prctl.h) +AC_CHECK_HEADERS(sys/param.h) + TOR_CHECK_PROTOTYPE(malloc_good_size, HAVE_MALLOC_GOOD_SIZE_PROTOTYPE, [#ifdef HAVE_MALLOC_H #include <malloc.h> diff --git a/src/common/compat.h b/src/common/compat.h index d2f1fd1..2c50ef1 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -19,6 +19,9 @@ #include <ws2tcpip.h> #endif #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/src/common/torint.h b/src/common/torint.h index 0b5c29a..2a1ca30 100644 --- a/src/common/torint.h +++ b/src/common/torint.h @@ -182,6 +182,16 @@ typedef unsigned __int64 uint64_t; #endif #endif +#ifndef SIZE_MAX +#if SIZEOF_SIZE_T == 8 +#define SIZE_MAX UINT64_MAX +#elif SIZEOF_SIZE_T == 4 +#define SIZE_MAX UINT32_MAX +#else +#error "Can't define SIZE_MAX" +#endif +#endif + #ifndef HAVE_SSIZE_T #if SIZEOF_SIZE_T == 8 typedef int64_t ssize_t; diff --git a/src/common/util.c b/src/common/util.c index a03a576..f0ca4cb 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -77,7 +77,7 @@ #include <malloc/malloc.h> #endif #ifdef HAVE_MALLOC_H -#ifndef OPENBSD +#if !defined(OPENBSD) && !defined(__FreeBSD__) /* OpenBSD has a malloc.h, but for our purposes, it only exists in order to * scold us for being so stupid as to autodetect its presence. To be fair, * they've done this since 1996, when autoconf was only 5 years old. */

1 0

[tor/master] Merge remote-tracking branch 'public/bug3894'
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit 7f45ea5c41bd076accd3720c021e6d3b512fb2b2 Merge: b4bd496 f35271b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 5 10:31:00 2012 -0400 Merge remote-tracking branch 'public/bug3894' changes/bug3894_more | 4 ++++ configure.in | 2 ++ src/common/compat.h | 3 +++ src/common/torint.h | 10 ++++++++++ src/common/util.c | 2 +- 5 files changed, 20 insertions(+), 1 deletions(-) diff --cc configure.in index 0f31071,df4c6f6..56cf3d6 --- a/configure.in +++ b/configure.in @@@ -645,41 -415,10 +645,43 @@@ AC_CHECK_HEADERS dnl These headers are not essential -AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h limits.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h inttypes.h utime.h sys/utime.h sys/mman.h netinet/in6.h malloc.h sys/syslimits.h malloc/malloc.h linux/types.h sys/file.h malloc_np.h sys/prctl.h) +AC_CHECK_HEADERS( + arpa/inet.h \ + crt_externs.h \ + grp.h \ + ifaddrs.h \ + inttypes.h \ + limits.h \ + linux/types.h \ + machine/limits.h \ + malloc.h \ + malloc/malloc.h \ + malloc_np.h \ + netdb.h \ + netinet/in.h \ + netinet/in6.h \ + pwd.h \ + stdint.h \ + sys/file.h \ + sys/ioctl.h \ + sys/limits.h \ + sys/mman.h \ + sys/param.h \ + sys/prctl.h \ + sys/resource.h \ + sys/socket.h \ + sys/syslimits.h \ + sys/time.h \ + sys/types.h \ + sys/un.h \ + sys/utime.h \ + sys/wait.h \ + syslog.h \ + utime.h +) + AC_CHECK_HEADERS(sys/param.h) + TOR_CHECK_PROTOTYPE(malloc_good_size, HAVE_MALLOC_GOOD_SIZE_PROTOTYPE, [#ifdef HAVE_MALLOC_H #include <malloc.h>

1 0

[tor/master] Merge remote-tracking branch 'public/format_doubles'
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit b4bd4964eba5b0dae811a5c28c664b8f78a0672c Merge: 981e896 0bec9f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 5 10:30:50 2012 -0400 Merge remote-tracking branch 'public/format_doubles' Conflicts: src/or/geoip.c changes/bug3894_fmt_doubles | 4 ++++ src/or/dirserv.c | 2 +- src/or/geoip.c | 4 ++-- src/or/rephist.c | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --cc src/or/geoip.c index 68a1942,8fb4c98..5d64888 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@@ -1023,117 -1006,61 +1023,117 @@@ geoip_format_dirreq_stats(time_t now ns_v3_responses[i], RESPONSE_GRANULARITY); } #undef RESPONSE_GRANULARITY - if (fprintf(out, "dirreq-v3-resp ok=%u,not-enough-sigs=%u,unavailable=%u," - "not-found=%u,not-modified=%u,busy=%u\n", - ns_v3_responses[GEOIP_SUCCESS], - ns_v3_responses[GEOIP_REJECT_NOT_ENOUGH_SIGS], - ns_v3_responses[GEOIP_REJECT_UNAVAILABLE], - ns_v3_responses[GEOIP_REJECT_NOT_FOUND], - ns_v3_responses[GEOIP_REJECT_NOT_MODIFIED], - ns_v3_responses[GEOIP_REJECT_BUSY]) < 0) - goto done; - if (fprintf(out, "dirreq-v2-resp ok=%u,unavailable=%u," - "not-found=%u,not-modified=%u,busy=%u\n", - ns_v2_responses[GEOIP_SUCCESS], - ns_v2_responses[GEOIP_REJECT_UNAVAILABLE], - ns_v2_responses[GEOIP_REJECT_NOT_FOUND], - ns_v2_responses[GEOIP_REJECT_NOT_MODIFIED], - ns_v2_responses[GEOIP_REJECT_BUSY]) < 0) - goto done; - memset(ns_v2_responses, 0, sizeof(ns_v2_responses)); - memset(ns_v3_responses, 0, sizeof(ns_v3_responses)); + if (!geoip_get_mean_shares(now, &v2_share, &v3_share)) { - tor_asprintf(&v2_share_string, "dirreq-v2-share %0.2lf%%\n", - if (fprintf(out, "dirreq-v2-share %0.2f%%\n", v2_share*100) < 0) - goto done; - if (fprintf(out, "dirreq-v3-share %0.2f%%\n", v3_share*100) < 0) - goto done; ++ tor_asprintf(&v2_share_string, "dirreq-v2-share %0.2f%%\n", + v2_share*100); - tor_asprintf(&v3_share_string, "dirreq-v3-share %0.2lf%%\n", ++ tor_asprintf(&v3_share_string, "dirreq-v3-share %0.2f%%\n", + v3_share*100); } - data_v2 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS_V2, - DIRREQ_DIRECT); - data_v3 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS, - DIRREQ_DIRECT); - if (fprintf(out, "dirreq-v3-direct-dl %s\ndirreq-v2-direct-dl %s\n", - data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0) - goto done; - tor_free(data_v2); - tor_free(data_v3); - data_v2 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS_V2, - DIRREQ_TUNNELED); - data_v3 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS, - DIRREQ_TUNNELED); - if (fprintf(out, "dirreq-v3-tunneled-dl %s\ndirreq-v2-tunneled-dl %s\n", - data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0) - goto done; + v2_direct_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS_V2, DIRREQ_DIRECT); + v3_direct_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS, DIRREQ_DIRECT); + + v2_tunneled_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS_V2, DIRREQ_TUNNELED); + v3_tunneled_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS, DIRREQ_TUNNELED); + + /* Put everything together into a single string. */ + tor_asprintf(&result, "dirreq-stats-end %s (%d s)\n" + "dirreq-v3-ips %s\n" + "dirreq-v2-ips %s\n" + "dirreq-v3-reqs %s\n" + "dirreq-v2-reqs %s\n" + "dirreq-v3-resp ok=%u,not-enough-sigs=%u,unavailable=%u," + "not-found=%u,not-modified=%u,busy=%u\n" + "dirreq-v2-resp ok=%u,unavailable=%u," + "not-found=%u,not-modified=%u,busy=%u\n" + "%s" + "%s" + "dirreq-v3-direct-dl %s\n" + "dirreq-v2-direct-dl %s\n" + "dirreq-v3-tunneled-dl %s\n" + "dirreq-v2-tunneled-dl %s\n", + t, + (unsigned) (now - start_of_dirreq_stats_interval), + v3_ips_string ? v3_ips_string : "", + v2_ips_string ? v2_ips_string : "", + v3_reqs_string ? v3_reqs_string : "", + v2_reqs_string ? v2_reqs_string : "", + ns_v3_responses[GEOIP_SUCCESS], + ns_v3_responses[GEOIP_REJECT_NOT_ENOUGH_SIGS], + ns_v3_responses[GEOIP_REJECT_UNAVAILABLE], + ns_v3_responses[GEOIP_REJECT_NOT_FOUND], + ns_v3_responses[GEOIP_REJECT_NOT_MODIFIED], + ns_v3_responses[GEOIP_REJECT_BUSY], + ns_v2_responses[GEOIP_SUCCESS], + ns_v2_responses[GEOIP_REJECT_UNAVAILABLE], + ns_v2_responses[GEOIP_REJECT_NOT_FOUND], + ns_v2_responses[GEOIP_REJECT_NOT_MODIFIED], + ns_v2_responses[GEOIP_REJECT_BUSY], + v2_share_string ? v2_share_string : "", + v3_share_string ? v3_share_string : "", + v3_direct_dl_string ? v3_direct_dl_string : "", + v2_direct_dl_string ? v2_direct_dl_string : "", + v3_tunneled_dl_string ? v3_tunneled_dl_string : "", + v2_tunneled_dl_string ? v2_tunneled_dl_string : ""); + + /* Free partial strings. */ + tor_free(v3_ips_string); + tor_free(v2_ips_string); + tor_free(v3_reqs_string); + tor_free(v2_reqs_string); + tor_free(v2_share_string); + tor_free(v3_share_string); + tor_free(v3_direct_dl_string); + tor_free(v2_direct_dl_string); + tor_free(v3_tunneled_dl_string); + tor_free(v2_tunneled_dl_string); - finish_writing_to_file(open_file); - open_file = NULL; + return result; +} - start_of_dirreq_stats_interval = now; +/** If 24 hours have passed since the beginning of the current dirreq + * stats period, write dirreq stats to $DATADIR/stats/dirreq-stats + * (possibly overwriting an existing file) and reset counters. Return + * when we would next want to write dirreq stats or 0 if we never want to + * write. */ +time_t +geoip_dirreq_stats_write(time_t now) +{ + char *statsdir = NULL, *filename = NULL, *str = NULL; + + if (!start_of_dirreq_stats_interval) + return 0; /* Not initialized. */ + if (start_of_dirreq_stats_interval + WRITE_STATS_INTERVAL > now) + goto done; /* Not ready to write. */ + + /* Discard all items in the client history that are too old. */ + geoip_remove_old_clients(start_of_dirreq_stats_interval); + + /* Generate history string .*/ + str = geoip_format_dirreq_stats(now); + + /* Write dirreq-stats string to disk. */ + statsdir = get_datadir_fname("stats"); + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { + log_warn(LD_HIST, "Unable to create stats/ directory!"); + goto done; + } + filename = get_datadir_fname2("stats", "dirreq-stats"); + if (write_str_to_file(filename, str, 0) < 0) + log_warn(LD_HIST, "Unable to write dirreq statistics to disk!"); + + /* Reset measurement interval start. */ + geoip_reset_dirreq_stats(now); done: - if (open_file) - abort_writing_to_file(open_file); - tor_free(filename); tor_free(statsdir); - tor_free(data_v2); - tor_free(data_v3); + tor_free(filename); + tor_free(str); return start_of_dirreq_stats_interval + WRITE_STATS_INTERVAL; }

1 0