diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-07-28 18:19:57 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-07-28 18:19:57 -0400 |
| commit | e8e88922a789e3317c881521110bfa9a7bdce597 (patch) | |
| tree | 58180b8ab702ae5968135f8727065c7b3baea84a /src/or/or.h | |
| parent | 7b716878cb6837756bd65ed788e5d8d89d8af56c (diff) | |
| parent | 69706f99e80aec9414e6a54e76346d4cf89f1a4c (diff) | |
| download | tor-e8e88922a789e3317c881521110bfa9a7bdce597.tar.gz tor-e8e88922a789e3317c881521110bfa9a7bdce597.zip | |
Merge branch 'maint-0.2.1' into master
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index be72750a7b..65b582fd83 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -490,6 +490,11 @@ typedef enum { (p)<=_CIRCUIT_PURPOSE_C_MAX) /** True iff the circuit_t <b>c</b> is actually an origin_circuit_t. */ #define CIRCUIT_IS_ORIGIN(c) (CIRCUIT_PURPOSE_IS_ORIGIN((c)->purpose)) +/** True iff the circuit purpose <b>p</b> is for an established rendezvous + * circuit. */ +#define CIRCUIT_PURPOSE_IS_ESTABLISHED_REND(p) \ + ((p) == CIRCUIT_PURPOSE_C_REND_JOINED || \ + (p) == CIRCUIT_PURPOSE_S_REND_JOINED) /** How many circuits do we want simultaneously in-progress to handle * a given stream? */ @@ -2948,6 +2953,8 @@ int getinfo_helper_config(control_connection_t *conn, const char *question, char **answer); const char *tor_get_digests(void); +int get_effective_bwrate(or_options_t *options); +int get_effective_bwburst(or_options_t *options); #ifdef CONFIG_PRIVATE /* Used only by config.c and test.c */ |