nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug when disabling heartbeats.

Browse Source 
Callbacks can't return 0.
This commit is contained in:
George Kadianakis 2016-06-21 15:05:59 +03:00 committed by Nick Mathewson
parent e718a582af
commit f038e9cb00
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug19454 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (heartbeat):
- Fix regression that crashes Tor when disabling heartbeats. Fixes bug
19454; bugfix on tor-0.2.8.1-alpha. Reported by "kubaku".

12
src/or/main.c
View File

@ -2004,18 +2004,24 @@ check_fw_helper_app_callback(time_t now, const or_options_t *options)
return PORT_FORWARDING_CHECK_INTERVAL; return PORT_FORWARDING_CHECK_INTERVAL;
} }
/** Callback to write heartbeat message in the logs. */
static int static int
heartbeat_callback(time_t now, const or_options_t *options) heartbeat_callback(time_t now, const or_options_t *options)
{ {
static int first = 1; static int first = 1;
/* 12. write the heartbeat message */
/* Check if heartbeat is disabled */
if (!options->HeartbeatPeriod) {
return PERIODIC_EVENT_NO_UPDATE;
}
/* Write the heartbeat message */
if (first) { if (first) {
first = 0; /* Skip the first one. */ first = 0; /* Skip the first one. */
} else { } else {
log_heartbeat(now); log_heartbeat(now);
} }
/* XXXX This isn't such a good way to handle possible changes in the
* callback event */
return options->HeartbeatPeriod; return options->HeartbeatPeriod;
} }