diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-11-12 19:39:13 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-11-12 19:39:13 +0000 |
| commit | 5109de562604c334fee2a0778ff15ad93a4b1191 (patch) | |
| tree | 82b677aa510f32609afabaa0afbe575c8caa17f9 /src/or/test.c | |
| parent | ad8e779db22078ca6b18bd6194bbceee538cb632 (diff) | |
| download | tor-5109de562604c334fee2a0778ff15ad93a4b1191.tar.gz tor-5109de562604c334fee2a0778ff15ad93a4b1191.zip | |
Rename exit_policy to addr_policy, since it gets used for SOCKS and directory connections too. Make all policies get validated in options_validate, and make SOCKS/directory policies get set in options_act.
svn:r2819
Diffstat (limited to 'src/or/test.c')
| -rw-r--r-- | src/or/test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/test.c b/src/or/test.c index 6ad2249dc9..5bf99917a7 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -939,7 +939,7 @@ test_dir_format(void) routerinfo_t r1, r2; crypto_pk_env_t *pk1 = NULL, *pk2 = NULL, *pk3 = NULL; routerinfo_t *rp1 = NULL, *rp2 = NULL; - struct exit_policy_t ex1, ex2; + struct addr_policy_t ex1, ex2; routerlist_t *dir1 = NULL, *dir2 = NULL; tor_version_t ver1; char *bw_lines = NULL; @@ -989,13 +989,13 @@ test_dir_format(void) r1.nickname = tor_strdup("Magri"); r1.platform = tor_strdup(platform); - ex1.policy_type = EXIT_POLICY_ACCEPT; + ex1.policy_type = ADDR_POLICY_ACCEPT; ex1.string = NULL; ex1.addr = 0; ex1.msk = 0; ex1.prt_min = ex1.prt_max = 80; ex1.next = &ex2; - ex2.policy_type = EXIT_POLICY_REJECT; + ex2.policy_type = ADDR_POLICY_REJECT; ex2.addr = 18 << 24; ex2.msk = 0xFF000000u; ex2.prt_min = ex2.prt_max = 24; |