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

Merge branch 'feature18329_029_squashed' into maint-0.3.2

Browse Source
This commit is contained in:
Nick Mathewson 2017-10-24 19:35:32 -04:00
commit b95ef19a77
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/feature18329
View File

@ -1,4 +1,4 @@
o Minor features:
o Minor features (bridge):
- Bridge relays can now set the BridgeDistribution config option to
add a "bridge-distribution-request" line to their bridge descriptor,
which tells BridgeDB how they'd like their bridge address to be

18
src/test/test_config.c
View File

@ -5449,7 +5449,8 @@ test_config_dup_and_filter(void *arg)
/* If we're not configured to be a bridge, but we set
* BridgeDistribution, then options_validate () should return -1. */
static void
test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
test_config_check_bridge_distribution_setting_not_a_bridge(void *arg)
{
or_options_t* options = get_options_mutable();
or_options_t* old_options = options;
or_options_t* default_options = options;
@ -5470,7 +5471,8 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
/* If the BridgeDistribution setting was valid, 0 should be returned. */
static void
test_config_check_bridge_distribution_setting_valid(void *arg) {
test_config_check_bridge_distribution_setting_valid(void *arg)
{
int ret = check_bridge_distribution_setting("https");
(void)arg;
@ -5482,11 +5484,16 @@ test_config_check_bridge_distribution_setting_valid(void *arg) {
/* If the BridgeDistribution setting was invalid, -1 should be returned. */
static void
test_config_check_bridge_distribution_setting_invalid(void *arg) {
int ret = check_bridge_distribution_setting("hyphens-are-not-allowed");
test_config_check_bridge_distribution_setting_invalid(void *arg)
{
int ret = check_bridge_distribution_setting("hyphens-are-allowed");
(void)arg;
tt_int_op(ret, OP_EQ, 0);
ret = check_bridge_distribution_setting("asterisks*are*forbidden");
tt_int_op(ret, OP_EQ, -1);
done:
return;
@ -5495,7 +5502,8 @@ test_config_check_bridge_distribution_setting_invalid(void *arg) {
/* If the BridgeDistribution setting was unrecognised, a warning should be
* logged and 0 should be returned. */
static void
test_config_check_bridge_distribution_setting_unrecognised(void *arg) {
test_config_check_bridge_distribution_setting_unrecognised(void *arg)
{
int ret = check_bridge_distribution_setting("unicorn");
(void)arg;

7
src/test/test_router.c
View File

@ -22,7 +22,8 @@ NS_DECL(const routerinfo_t *, router_get_my_routerinfo, (void));
static routerinfo_t* mock_routerinfo;
static const routerinfo_t*
NS(router_get_my_routerinfo)(void) {
NS(router_get_my_routerinfo)(void)
{
crypto_pk_t* ident_key;
crypto_pk_t* tap_key;
time_t now;
@ -57,7 +58,8 @@ NS(router_get_my_routerinfo)(void) {
/* If no distribution option was set, then check_bridge_distribution_setting()
* should have set it to "any". */
static void
test_router_dump_router_to_string_no_bridge_distribution_method(void *arg) {
test_router_dump_router_to_string_no_bridge_distribution_method(void *arg)
{
const char* needle = "bridge-distribution-request any";
or_options_t* options = get_options_mutable();
routerinfo_t* router = NULL;
@ -107,3 +109,4 @@ struct testcase_t router_tests[] = {
ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK),
END_OF_TESTCASES
};