mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-03 17:13:33 +01:00
Make ALLOW_INVALID_* into an enum.
svn:r17648
This commit is contained in:
parent
d0e1cc6fe2
commit
0dc724d19c
16
src/or/or.h
16
src/or/or.h
@ -2072,11 +2072,14 @@ static INLINE origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *x)
|
|||||||
return DOWNCAST(origin_circuit_t, x);
|
return DOWNCAST(origin_circuit_t, x);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ALLOW_INVALID_ENTRY 1
|
/** Bitfield type: things that we're willing to use invalid routers for. */
|
||||||
#define ALLOW_INVALID_EXIT 2
|
typedef enum invalid_router_usage_t {
|
||||||
#define ALLOW_INVALID_MIDDLE 4
|
ALLOW_INVALID_ENTRY =1,
|
||||||
#define ALLOW_INVALID_RENDEZVOUS 8
|
ALLOW_INVALID_EXIT =2,
|
||||||
#define ALLOW_INVALID_INTRODUCTION 16
|
ALLOW_INVALID_MIDDLE =4,
|
||||||
|
ALLOW_INVALID_RENDEZVOUS =8,
|
||||||
|
ALLOW_INVALID_INTRODUCTION=16,
|
||||||
|
} invalid_router_usage_t;
|
||||||
|
|
||||||
/** An entry specifying a set of addresses and ports that should be remapped
|
/** An entry specifying a set of addresses and ports that should be remapped
|
||||||
* to another address and port before exiting this exit node. */
|
* to another address and port before exiting this exit node. */
|
||||||
@ -2146,7 +2149,8 @@ typedef struct {
|
|||||||
|
|
||||||
/** List of "entry", "middle", "exit", "introduction", "rendezvous". */
|
/** List of "entry", "middle", "exit", "introduction", "rendezvous". */
|
||||||
smartlist_t *AllowInvalidNodes;
|
smartlist_t *AllowInvalidNodes;
|
||||||
int _AllowInvalid; /**< Bitmask; derived from AllowInvalidNodes. */
|
/** Bitmask; derived from AllowInvalidNodes. */
|
||||||
|
invalid_router_usage_t _AllowInvalid;
|
||||||
config_line_t *ExitPolicy; /**< Lists of exit policy components. */
|
config_line_t *ExitPolicy; /**< Lists of exit policy components. */
|
||||||
int ExitPolicyRejectPrivate; /**< Should we not exit to local addresses? */
|
int ExitPolicyRejectPrivate; /**< Should we not exit to local addresses? */
|
||||||
config_line_t *SocksPolicy; /**< Lists of socks policy components */
|
config_line_t *SocksPolicy; /**< Lists of socks policy components */
|
||||||
|
Loading…
Reference in New Issue
Block a user