commit 6e17fa6d7ba57b990dd929e07969d35dc82fc46b Author: Kevin Butler <haqkrs@gmail.com> Date: Sun Sep 1 17:38:01 2013 +0100 Added --library-versions flag to print the compile time and runtime versions of libevent, openssl and zlib. Partially implements #6384. --- changes/bug6384 | 2 ++ src/common/compat_libevent.c | 8 ++++++++ src/common/compat_libevent.h | 1 + src/common/crypto.c | 41 ++++++++++++++++++++++++++++------------- src/common/crypto.h | 1 + src/common/torgzip.c | 16 ++++++++++++++++ src/common/torgzip.h | 6 ++++++ src/or/config.c | 18 ++++++++++++++++++ src/or/main.c | 9 ++++++--- 9 files changed, 86 insertions(+), 16 deletions(-) diff --git a/changes/bug6384 b/changes/bug6384 new file mode 100644 index 0000000..c0e8446 --- /dev/null +++ b/changes/bug6384 @@ -0,0 +1,2 @@ + o Minor features: + - Add support for `--library-versions` flag. Implements ticket #6384. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 200a7c6..4d0fff8 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -415,6 +415,14 @@ tor_check_libevent_version(const char *m, int server, #define HEADER_VERSION _EVENT_VERSION #endif +/** Return a string representation of the version of Libevent that was used +* at compilation time. */ +const char * +tor_libevent_get_header_version_str(void) +{ + return HEADER_VERSION; +} + /** See whether the headers we were built against differ from the library we * linked against so much that we're likely to crash. If so, warn the * user. */ diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 2472e2c..fda8733 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -78,6 +78,7 @@ void tor_check_libevent_version(const char *m, int server, const char **badness_out); void tor_check_libevent_header_compatibility(void); const char *tor_libevent_get_version_str(void); +const char *tor_libevent_get_header_version_str(void); #ifdef USE_BUFFEREVENTS const struct timeval *tor_libevent_get_one_tick_timeout(void); diff --git a/src/common/crypto.c b/src/common/crypto.c index 6f1a0bc..5be3327 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -195,6 +195,24 @@ try_load_engine(const char *path, const char *engine) } #endif +static char * +parse_openssl_version_str(const char *raw_version) +{ + const char *end_of_version = NULL; + /* The output should be something like "OpenSSL 1.0.0b 10 May 2012. Let's + trim that down. */ + if (!strcmpstart(raw_version, "OpenSSL ")) { + raw_version += strlen("OpenSSL "); + end_of_version = strchr(raw_version, ' '); + } + + if (end_of_version) + return tor_strndup(raw_version, + end_of_version-raw_version); + else + return tor_strdup(raw_version); +} + static char *crypto_openssl_version_str = NULL; /* Return a human-readable version of the run-time openssl version number. */ const char * @@ -202,23 +220,20 @@ crypto_openssl_get_version_str(void) { if (crypto_openssl_version_str == NULL) { const char *raw_version = SSLeay_version(SSLEAY_VERSION); - const char *end_of_version = NULL; - /* The output should be something like "OpenSSL 1.0.0b 10 May 2012. Let's - trim that down. */ - if (!strcmpstart(raw_version, "OpenSSL ")) { - raw_version += strlen("OpenSSL "); - end_of_version = strchr(raw_version, ' '); - } - - if (end_of_version) - crypto_openssl_version_str = tor_strndup(raw_version, - end_of_version-raw_version); - else - crypto_openssl_version_str = tor_strdup(raw_version); + crypto_openssl_version_str = parse_openssl_version_str(raw_version); } return crypto_openssl_version_str; } +/* Return a human-readable version of the compile-time openssl version +* number. */ +const char * +crypto_openssl_get_header_version_str(void) +{ + //return OPENSSL_VERSION_TEXT; + return parse_openssl_version_str(OPENSSL_VERSION_TEXT); +} + /** Initialize the crypto library. Return 0 on success, -1 on failure. */ int diff --git a/src/common/crypto.h b/src/common/crypto.h index 2750ed8..6ce3697 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -109,6 +109,7 @@ typedef struct crypto_dh_t crypto_dh_t; /* global state */ const char * crypto_openssl_get_version_str(void); +const char * crypto_openssl_get_header_version_str(void); int crypto_global_init(int hardwareAccel, const char *accelName, const char *accelPath); diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 4328c63..15451ee 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -68,6 +68,22 @@ is_gzip_supported(void) return gzip_is_supported; } +/** Return a string representation of the version of the currently running + * version of zlib. */ +const char * +tor_zlib_get_version_str(void) +{ + return zlibVersion(); +} + +/** Return a string representation of the version of the version of zlib +* used at compilation. */ +const char * +tor_zlib_get_header_version_str(void) +{ + return ZLIB_VERSION; +} + /** Return the 'bits' value to tell zlib to use <b>method</b>.*/ static INLINE int method_bits(compress_method_t method) diff --git a/src/common/torgzip.h b/src/common/torgzip.h index be10164..5db03fe 100644 --- a/src/common/torgzip.h +++ b/src/common/torgzip.h @@ -32,6 +32,12 @@ tor_gzip_uncompress(char **out, size_t *out_len, int is_gzip_supported(void); +const char * +tor_zlib_get_version_str(void); + +const char * +tor_zlib_get_header_version_str(void); + compress_method_t detect_compression_method(const char *in, size_t in_len); /** Return values from tor_zlib_process; see that function's documentation for diff --git a/src/or/config.c b/src/or/config.c index 657bc60..b00f0d6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -46,6 +46,7 @@ #include "statefile.h" #include "transports.h" #include "ext_orport.h" +#include "torgzip.h" #ifdef _WIN32 #include <shlobj.h> #endif @@ -3816,6 +3817,7 @@ options_init_from_torrc(int argc, char **argv) printf("Tor version %s.\n",get_version()); exit(0); } + if (argc > 1 && (!strcmp(argv[1],"--digests"))) { printf("Tor version %s.\n",get_version()); printf("%s", libor_get_digests()); @@ -3823,6 +3825,22 @@ options_init_from_torrc(int argc, char **argv) exit(0); } + if (argc > 1 && (!strcmp(argv[1],"--library-versions"))) { + printf("Tor version %s. \n", get_version()); + printf("Library versions\tCompiled\t\tRuntime\n"); + printf("Libevent\t\t%-15s\t\t%s\n", + tor_libevent_get_header_version_str(), + tor_libevent_get_version_str()); + printf("OpenSSL \t\t%-15s\t\t%s\n", + crypto_openssl_get_header_version_str(), + crypto_openssl_get_version_str()); + printf("Zlib \t\t%-15s\t\t%s\n", + tor_zlib_get_header_version_str(), + tor_zlib_get_version_str()); + //TODO: Hex versions? + exit(0); + } + /* Go through command-line variables */ if (!global_cmdline_options) { /* Or we could redo the list every time we pass this place. diff --git a/src/or/main.c b/src/or/main.c index 33e1c64..2d6ca74 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2343,6 +2343,8 @@ tor_init(int argc, char *argv[]) /* --version implies --quiet */ if (!strcmp(argv[i], "--version")) quiet = 2; + if (!strcmp(argv[i], "--library-versions")) + quiet = 2; } /* give it somewhere to log to initially */ switch (quiet) { @@ -2365,11 +2367,12 @@ tor_init(int argc, char *argv[]) #else ""; #endif - log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s " - "and OpenSSL %s.", version, bev_str, + log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s, " + "OpenSSL %s and Zlib %s.", version, bev_str, get_uname(), tor_libevent_get_version_str(), - crypto_openssl_get_version_str()); + crypto_openssl_get_version_str(), + tor_zlib_get_version_str()); log_notice(LD_GENERAL, "Tor can't help you if you use it wrong! " "Learn how to be safe at "