Commit f8794b0b authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Move vote_schedule into its own header.

parent 5cdc2343

src/or/dirauth/dirvote.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "dirauth/shared_random_state.h"



#include "dir_server_st.h"

#include "vote_timing_st.h"



/**

 * \file dirvote.c

src/or/include.am

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ ORHEADERS = \ 
	src/or/torcert.h				\

	src/or/tor_api_internal.h			\

	src/or/tor_version_st.h				\

	src/or/vote_timing_st.h				\

	src/or/voting_schedule.h



# We add the headers of the modules even though they are disabled so we can

src/or/or.h

+1 −12
Original line number Diff line number Diff line
@@ -3913,18 +3913,7 @@ typedef struct measured_bw_line_t { 


/********************************* dirvote.c ************************/



/** Describes the schedule by which votes should be generated. */

typedef struct vote_timing_t {

  /** Length in seconds between one consensus becoming valid and the next

   * becoming valid. */

  int vote_interval;

  /** For how many intervals is a consensus valid? */

  int n_intervals_valid;

  /** Time in seconds allowed to propagate votes */

  int vote_delay;

  /** Time in seconds allowed to propagate signatures */

  int dist_delay;

} vote_timing_t;

typedef struct vote_timing_t vote_timing_t;



/********************************* geoip.c **************************/

src/or/vote_timing_st.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2001 Matej Pfajfar.

 * Copyright (c) 2001-2004, Roger Dingledine.

 * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.

 * Copyright (c) 2007-2017, The Tor Project, Inc. */

/* See LICENSE for licensing information */



#ifndef VOTE_TIMING_ST_H

#define VOTE_TIMING_ST_H



/** Describes the schedule by which votes should be generated. */

struct vote_timing_t {

  /** Length in seconds between one consensus becoming valid and the next

   * becoming valid. */

  int vote_interval;

  /** For how many intervals is a consensus valid? */

  int n_intervals_valid;

  /** Time in seconds allowed to propagate votes */

  int vote_delay;

  /** Time in seconds allowed to propagate signatures */

  int dist_delay;

};



#endif