diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-03-27 02:25:34 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-03-27 02:25:34 +0000 |
| commit | 6f08d121d96be29c2ce2d9ef9df4416141651951 (patch) | |
| tree | 91c4acf09b72156d35b9bf259c2e5b48b968a14a /src/or/routerparse.c | |
| parent | 74d35c8027937fe8dac031bf76e31a017d4fa81f (diff) | |
| download | tor-6f08d121d96be29c2ce2d9ef9df4416141651951.tar.gz tor-6f08d121d96be29c2ce2d9ef9df4416141651951.zip | |
Refactor and consolidate addr/exit policies into a new policies.c.
Fix some minor bugs and memory leaks along the way.
svn:r6246
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index e180e2cc27..1ee0594a73 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1258,7 +1258,7 @@ networkstatus_parse_from_string(const char *s) return ns; } -/** Parse the exit policy in the string <b>s</b> and return it. If +/** Parse the addr policy in the string <b>s</b> and return it. If * assume_action is nonnegative, then insert its action (ADDR_POLICY_ACCEPT or * ADDR_POLICY_REJECT) for items that specify no action. */ @@ -1290,7 +1290,7 @@ router_parse_addr_policy_from_string(const char *s, int assume_action) } tok = get_next_token(&cp, RTR); if (tok->tp == _ERR) { - log_warn(LD_DIR, "Error reading exit policy: %s", tok->error); + log_warn(LD_DIR, "Error reading address policy: %s", tok->error); goto err; } if (tok->tp != K_ACCEPT && tok->tp != K_REJECT) { @@ -1298,7 +1298,7 @@ router_parse_addr_policy_from_string(const char *s, int assume_action) goto err; } - /* Now that we've gotten an exit policy, add it to the router. */ + /* Now that we've gotten an addr policy, add it to the router. */ r = router_parse_addr_policy(tok); goto done; err: |