diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-07-24 13:44:04 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-07-24 13:44:04 +0000 |
| commit | 3ce6e2fba290eb5d3a4d0a3ca2f61658245b52b6 (patch) | |
| tree | 08c562380df129cb4c8c896eecba0f3d8013d262 /src/or/or.h | |
| parent | ed781e69716248111ef1a2ddc1b9add671bd8d16 (diff) | |
| download | tor-3ce6e2fba290eb5d3a4d0a3ca2f61658245b52b6.tar tor-3ce6e2fba290eb5d3a4d0a3ca2f61658245b52b6.tar.gz | |
r17346@aud-055: nickm | 2008-07-24 15:37:19 +0200
Make generic address manipulation functions work better. Switch address policy code to use tor_addr_t, so it can handle IPv6. That is a good place to start.
svn:r16178
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h index 6975b16fd..342a57022 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1148,8 +1148,7 @@ typedef struct addr_policy_t { maskbits_t maskbits; /**< Accept/reject all addresses <b>a</b> such that the * first <b>maskbits</b> bits of <b>a</b> match * <b>addr</b>. */ - /* XXXX_IP6 make this ipv6-capable */ - uint32_t addr; /**< Base address to accept or reject. */ + tor_addr_t addr; /**< Base address to accept or reject. */ uint16_t prt_min; /**< Lowest port number to accept/reject. */ uint16_t prt_max; /**< Highest port number to accept/reject. */ } addr_policy_t; @@ -3635,7 +3634,8 @@ int exit_policy_is_general_exit(smartlist_t *policy); int policy_is_reject_star(smartlist_t *policy); int getinfo_helper_policies(control_connection_t *conn, const char *question, char **answer); -int policy_write_item(char *buf, size_t buflen, addr_policy_t *item); +int policy_write_item(char *buf, size_t buflen, addr_policy_t *item, + int format_for_desc); void addr_policy_list_free(smartlist_t *p); void addr_policy_free(addr_policy_t *p); |