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

Address review comments from cypherpunks

Browse Source
This commit is contained in:
Sebastian Hahn 2016-07-04 16:27:46 +02:00
parent 265e40b481
commit bd1a85cc91
3 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/compat_libevent.c
View File

@ -3,11 +3,8 @@
/**
* \file compat_libevent.c
* \brief Wrappers to handle porting between different versions of libevent.
*
* In an ideal world, we'd just use Libevent 2.0 from now on. But as of June
* 2012, Libevent 1.4 is still all over, and some poor souls are stuck on
* Libevent 1.3e. */
* \brief Wrappers and utility functions for Libevent.
*/
#include "orconfig.h"
#include "compat.h"

27
src/common/compat_libevent.h
View File

@ -7,15 +7,11 @@
#include "orconfig.h"
#include "testsupport.h"
struct event;
struct event_base;
#ifdef USE_BUFFEREVENTS
struct bufferevent;
struct ev_token_bucket_cfg;
struct bufferevent_rate_limit_group;
#endif
#include <event2/event.h>
#include <event2/util.h>
#ifdef USE_BUFFEREVENTS
#include <event2/bufferevent.h>
#endif
void configure_libevent_logging(void);
void suppress_libevent_log_msg(const char *msg);
@ -77,22 +73,15 @@ void tor_gettimeofday_cache_set(const struct timeval *tv);
void tor_gettimeofday_cached_monotonic(struct timeval *tv);
#ifdef COMPAT_LIBEVENT_PRIVATE
/** A number representing a version of Libevent.
This is a 4-byte number, with the first three bytes representing the
major, minor, and patchlevel respectively of the library. The fourth
byte is unused.
/** Macro: returns the number of a Libevent version as a 4-byte number,
with the first three bytes representing the major, minor, and patchlevel
respectively of the library. The fourth byte is unused.
This is equivalent to the format of LIBEVENT_VERSION_NUMBER on Libevent
2.0.1 or later.
*/
typedef uint32_t le_version_t;
/** @{ */
/** Macros: returns the number of a libevent version as a le_version_t */
2.0.1 or later. */
#define V(major, minor, patch) \
(((major) << 24) | ((minor) << 16) | ((patch) << 8))
/** @} */
STATIC void
libevent_logging_callback(int severity, const char *msg);

6
src/common/procmon.c
View File

@ -163,11 +163,7 @@ tor_validate_process_specifier(const char *process_spec,
#define PERIODIC_TIMER_FLAGS EV_PERSIST
/* DOCDOC poll_interval_tv */
static struct timeval poll_interval_tv = {15, 0};
/* Note: If you port this file to plain Libevent 2, you can make
* poll_interval_tv const. It has to be non-const here because in
* libevent 1.x, event_add expects a pointer to a non-const struct
* timeval. */
static const struct timeval poll_interval_tv = {15, 0};
/** Create a process-termination monitor for the process specifier
* given in <b>process_spec</b>. Return a newly allocated