r13256@catbus: nickm | 2007-06-05 10:57:41 -0400

Mark fields that need to be ipv6-ified.


svn:r10503
This commit is contained in:
Nick Mathewson 2007-06-05 20:54:23 +00:00
parent 6ad4c8a376
commit f0345d46f6
2 changed files with 7 additions and 0 deletions

View File

@ -17,6 +17,7 @@ Documentation and testing on 0.1.2.x-final series
- Pending backports for 0.1.2.x: - Pending backports for 0.1.2.x:
- r10148: Open cached-routers with FILE_SHARE_READ on win32. - r10148: Open cached-routers with FILE_SHARE_READ on win32.
- r10493: Weight guard selection by bandwidth.
N - Test guard unreachable logic; make sure that we actually attempt to N - Test guard unreachable logic; make sure that we actually attempt to
connect to guards that we think are unreachable from time to time. connect to guards that we think are unreachable from time to time.

View File

@ -790,6 +790,7 @@ typedef struct connection_t {
* could write? */ * could write? */
time_t timestamp_created; /**< When was this connection_t created? */ time_t timestamp_created; /**< When was this connection_t created? */
/* XXXX020 make this ipv6-capable */
uint32_t addr; /**< IP of the other side of the connection; used to identify uint32_t addr; /**< IP of the other side of the connection; used to identify
* routers, along with port. */ * routers, along with port. */
uint16_t port; /**< If non-zero, port on the other end uint16_t port; /**< If non-zero, port on the other end
@ -804,6 +805,7 @@ typedef struct connection_t {
* strdup into this, because free_connection frees it. */ * strdup into this, because free_connection frees it. */
/** Annother connection that's connected to this one in lieu of a socket. */ /** Annother connection that's connected to this one in lieu of a socket. */
struct connection_t *linked_conn; struct connection_t *linked_conn;
/* XXXX020 NM move these up to the other 1-bit flags. */ /* XXXX020 NM move these up to the other 1-bit flags. */
unsigned int linked:1; /**< True if there is, or has been, a linked_conn. */ unsigned int linked:1; /**< True if there is, or has been, a linked_conn. */
/** True iff we'd like to be notified about read events from the /** True iff we'd like to be notified about read events from the
@ -1019,6 +1021,8 @@ typedef enum {
typedef struct addr_policy_t { typedef struct addr_policy_t {
addr_policy_action_t policy_type; /**< What to do when the policy matches.*/ addr_policy_action_t policy_type; /**< What to do when the policy matches.*/
char *string; /**< String representation of this rule. */ char *string; /**< String representation of this rule. */
/* XXXX020 make this ipv6-capable */
uint32_t addr; /**< Base address to accept or reject. */ uint32_t addr; /**< Base address to accept or reject. */
uint32_t msk; /**< Accept/reject all addresses <b>a</b> such that uint32_t msk; /**< Accept/reject all addresses <b>a</b> such that
* a &amp; msk == <b>addr</b> &amp; msk . */ * a &amp; msk == <b>addr</b> &amp; msk . */
@ -1727,6 +1731,8 @@ static INLINE origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *x)
/** An entry specifying a set of addresses and ports that should be remapped /** An entry specifying a set of addresses and ports that should be remapped
* to another address and port before exiting this exit node. */ * to another address and port before exiting this exit node. */
typedef struct exit_redirect_t { typedef struct exit_redirect_t {
/* XXXX020 make this whole mess ipv6-capable. (Does anybody use it? */
uint32_t addr; uint32_t addr;
uint32_t mask; uint32_t mask;
uint16_t port_min; uint16_t port_min;