summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-06-05 20:54:23 +0000
committerNick Mathewson <nickm@torproject.org>2007-06-05 20:54:23 +0000
commitf0345d46f6372a56c586a05d1a714473eaeccc27 (patch)
tree0788cdd24d90bed9a2a03741b788cfe28d52cf54 /src/or
parent6ad4c8a3764a9ba357d6ff3e20e9ee5728820ab0 (diff)
downloadtor-f0345d46f6372a56c586a05d1a714473eaeccc27.tar.gz
tor-f0345d46f6372a56c586a05d1a714473eaeccc27.zip
r13256@catbus: nickm | 2007-06-05 10:57:41 -0400
Mark fields that need to be ipv6-ified. svn:r10503
Diffstat (limited to 'src/or')
-rw-r--r--src/or/or.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 304352be43..ba68baf727 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -790,6 +790,7 @@ typedef struct connection_t {
* could write? */
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
* routers, along with port. */
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. */
/** Annother connection that's connected to this one in lieu of a socket. */
struct connection_t *linked_conn;
+
/* 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. */
/** True iff we'd like to be notified about read events from the
@@ -1019,6 +1021,8 @@ typedef enum {
typedef struct addr_policy_t {
addr_policy_action_t policy_type; /**< What to do when the policy matches.*/
char *string; /**< String representation of this rule. */
+
+ /* XXXX020 make this ipv6-capable */
uint32_t addr; /**< Base address to accept or reject. */
uint32_t msk; /**< Accept/reject all addresses <b>a</b> such that
* 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
* to another address and port before exiting this exit node. */
typedef struct exit_redirect_t {
+ /* XXXX020 make this whole mess ipv6-capable. (Does anybody use it? */
+
uint32_t addr;
uint32_t mask;
uint16_t port_min;