commit 2527acb2dc8b71515ac0c882e3af4fc034ab1b48
Merge: cb7fff1 b80a8bb
Author: Nick Mathewson <[email protected]>
Date: Mon May 23 01:23:53 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/Makefile.am
src/or/control.c
changes/exit-policy-default-is-not-a-prefix | 5 +
changes/feature3049 | 6 +
src/common/Makefile.am | 2 +
src/common/compat.h | 2 +-
src/common/compat_libevent.c | 2 +-
src/common/log.c | 2 +-
src/common/procmon.c | 332 +++++++++++++++++++++++++++
src/common/procmon.h | 30 +++
src/common/torlog.h | 1 -
src/common/util.c | 18 +-
src/or/config.c | 15 ++
src/or/connection.c | 3 +-
src/or/control.c | 138 +++++++++++-
src/or/control.h | 4 +
src/or/or.h | 10 +-
src/or/router.c | 7 +-
16 files changed, 558 insertions(+), 19 deletions(-)
diff --cc src/common/Makefile.am
index 3a80eb8,6952591..4821849
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@@ -11,46 -11,12 +11,48 @@@ els
libor_extra_source=
endif
-libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \
- memarea.c di_ops.c procmon.c util_codedigest.c $(libor_extra_source)
-libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c
+libor_a_SOURCES = \
+ address.c \
+ compat.c \
+ container.c \
+ di_ops.c \
+ log.c \
+ memarea.c \
+ mempool.c \
++ procmon.c \
+ util.c \
+ util_codedigest.c \
+ $(libor_extra_source)
+
+libor_crypto_a_SOURCES = \
+ aes.c \
+ crypto.c \
+ torgzip.c \
+ tortls.c
+
libor_event_a_SOURCES = compat_libevent.c
-noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h
tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h
ciphers.inc compat_libevent.h tortls_states.h di_ops.h procmon.h
+noinst_HEADERS = \
+ address.h \
+ aes.h \
+ ciphers.inc \
+ compat.h \
+ compat_libevent.h \
+ container.h \
+ crypto.h \
+ di_ops.h \
+ ht.h \
+ memarea.h \
+ mempool.h \
++ procmon.h \
+ strlcat.c \
+ strlcpy.c \
+ torgzip.h \
+ torint.h \
+ torlog.h \
+ tortls.h \
+ tortls_states.h \
+ util.h
common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
if test "@SHA1SUM@" != none; then \
diff --cc src/common/torlog.h
index b8f5ea4,541a0d1..4c5729e
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@@ -147,9 -145,7 +147,8 @@@ void change_callback_log_severity(int l
log_callback cb);
void flush_pending_log_callbacks(void);
void log_set_application_name(const char *name);
+void set_log_time_granularity(int granularity_msec);
- /* Outputs a message to stdout */
void tor_log(int severity, log_domain_mask_t domain, const char *format, ...)
CHECK_PRINTF(3,4);
#define log tor_log /* hack it so we don't conflict with log() as much */
diff --cc src/or/control.c
index e0e8f7e,0dad1b9..9856073
--- a/src/or/control.c
+++ b/src/or/control.c
@@@ -33,11 -32,8 +33,13 @@@
#include "routerlist.h"
#include "routerparse.h"
+#ifndef MS_WINDOWS
+#include <pwd.h>
+#include <sys/resource.h>
+#endif
+
+ #include "procmon.h"
+
/** Yield true iff <b>s</b> is the state of a control_connection_t that has
* finished authentication and is accepting commands. */
#define STATE_IS_OPEN(s) ((s) == CONTROL_CONN_STATE_OPEN)
diff --cc src/or/router.c
index 63ed4cf,184715b..2b11a52
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -492,11 -490,11 +492,11 @@@ init_keys(void
char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3];
const char *mydesc;
crypto_pk_env_t *prkey;
- char digest[20];
- char v3_digest[20];
+ char digest[DIGEST_LEN];
+ char v3_digest[DIGEST_LEN];
char *cp;
or_options_t *options = get_options();
- authority_type_t type;
+ dirinfo_type_t type;
time_t now = time(NULL);
trusted_dir_server_t *ds;
int v3_digest_set = 0;
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
