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

Move or_state_mark_dirty into statefile.c

Browse Source 
Previously it was an inline function in or.h
This commit is contained in:
Nick Mathewson 2018-04-27 10:05:53 -04:00
parent 3a47dfed34
commit 9f8b60d74c
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/or.h
View File

@ -4745,15 +4745,6 @@ typedef struct {
time_t LastRotatedOnionKey; time_t LastRotatedOnionKey;
} or_state_t; } or_state_t;
/** Change the next_write time of <b>state</b> to <b>when</b>, unless the
* state is already scheduled to be written to disk earlier than <b>when</b>.
*/
static inline void or_state_mark_dirty(or_state_t *state, time_t when)
{
if (state->next_write > when)
state->next_write = when;
}
#define MAX_SOCKS_REPLY_LEN 1024 #define MAX_SOCKS_REPLY_LEN 1024
#define MAX_SOCKS_ADDR_LEN 256 #define MAX_SOCKS_ADDR_LEN 256
#define SOCKS_NO_AUTH 0x00 #define SOCKS_NO_AUTH 0x00

2
src/or/rephist.c
View File

@ -85,8 +85,8 @@
#include "routerlist.h" #include "routerlist.h"
#include "ht.h" #include "ht.h"
#include "channelpadding.h" #include "channelpadding.h"
#include "connection_or.h" #include "connection_or.h"
#include "statefile.h"
static void bw_arrays_init(void); static void bw_arrays_init(void);
static void predicted_ports_alloc(void); static void predicted_ports_alloc(void);

12
src/or/statefile.c
View File

@ -472,7 +472,7 @@ or_state_save(time_t now)
tor_assert(global_state); tor_assert(global_state);
if (global_state->next_write > now) if (global_state->next_write >= now)
return 0; return 0;
/* Call everything else that might dirty the state even more, in order /* Call everything else that might dirty the state even more, in order
@ -680,6 +680,16 @@ save_transport_to_state(const char *transport,
tor_free(transport_addrport); tor_free(transport_addrport);
} }
/** Change the next_write time of <b>state</b> to <b>when</b>, unless the
* state is already scheduled to be written to disk earlier than <b>when</b>.
*/
void
or_state_mark_dirty(or_state_t *state, time_t when)
{
if (state->next_write > when)
state->next_write = when;
}
STATIC void STATIC void
or_state_free_(or_state_t *state) or_state_free_(or_state_t *state)
{ {

1
src/or/statefile.h
View File

@ -17,6 +17,7 @@ char *get_stored_bindaddr_for_server_transport(const char *transport);
int or_state_load(void); int or_state_load(void);
int or_state_loaded(void); int or_state_loaded(void);
void or_state_free_all(void); void or_state_free_all(void);
void or_state_mark_dirty(or_state_t *state, time_t when);
#ifdef STATEFILE_PRIVATE #ifdef STATEFILE_PRIVATE
STATIC config_line_t *get_transport_in_state_by_name(const char *transport); STATIC config_line_t *get_transport_in_state_by_name(const char *transport);