nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

help the term "OP" become obsolete

Browse Source 
svn:r5403
This commit is contained in:
Roger Dingledine 2005-11-17 01:17:53 +00:00
parent 9eada6d3c1
commit 298da4497a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/or/or.h
View File

@ -345,7 +345,7 @@ typedef enum {
#define EXIT_PURPOSE_RESOLVE 2 #define EXIT_PURPOSE_RESOLVE 2
#define _EXIT_PURPOSE_MAX 2 #define _EXIT_PURPOSE_MAX 2
/** Circuit state: I'm the OP, still haven't done all my handshakes. */ /** Circuit state: I'm the origin, still haven't done all my handshakes. */
#define CIRCUIT_STATE_BUILDING 0 #define CIRCUIT_STATE_BUILDING 0
/** Circuit state: Waiting to process the onionskin. */ /** Circuit state: Waiting to process the onionskin. */
#define CIRCUIT_STATE_ONIONSKIN_PENDING 1 #define CIRCUIT_STATE_ONIONSKIN_PENDING 1
@ -420,8 +420,8 @@ typedef enum {
#define CIRCUIT_PURPOSE_TESTING 17 #define CIRCUIT_PURPOSE_TESTING 17
#define _CIRCUIT_PURPOSE_MAX 17 #define _CIRCUIT_PURPOSE_MAX 17
/** True iff the circuit purpose <b>p</b> is for a circuit at the OP /** True iff the circuit purpose <b>p</b> is for a circuit that
* that this OP has originated. */ * originated at this node. */
#define CIRCUIT_PURPOSE_IS_ORIGIN(p) ((p)>_CIRCUIT_PURPOSE_OR_MAX) #define CIRCUIT_PURPOSE_IS_ORIGIN(p) ((p)>_CIRCUIT_PURPOSE_OR_MAX)
#define CIRCUIT_IS_ORIGIN(c) (CIRCUIT_PURPOSE_IS_ORIGIN((c)->purpose)) #define CIRCUIT_IS_ORIGIN(c) (CIRCUIT_PURPOSE_IS_ORIGIN((c)->purpose))
@ -543,8 +543,8 @@ typedef enum {
#define RELAY_HEADER_SIZE (1+2+2+4+2) #define RELAY_HEADER_SIZE (1+2+2+4+2)
#define RELAY_PAYLOAD_SIZE (CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE) #define RELAY_PAYLOAD_SIZE (CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE)
/** Parsed onion routing cell. All communication from OP-to-OR, or from /** Parsed onion routing cell. All communication between nodes
* OR-to-OR, is via cells. */ * is via cells. */
typedef struct { typedef struct {
uint16_t circ_id; /**< Circuit which received the cell. */ uint16_t circ_id; /**< Circuit which received the cell. */
uint8_t command; /**< Type of the cell: one of PADDING, CREATE, RELAY, uint8_t command; /**< Type of the cell: one of PADDING, CREATE, RELAY,
@ -570,8 +570,7 @@ typedef struct socks_request_t socks_request_t;
* data. * data.
* *
* A connection is named based on what it's connected to -- an "OR * A connection is named based on what it's connected to -- an "OR
* connection" has an onion router on the other end, an "OP connection" * connection" has a Tor node on the other end, an "exit
* (nearly obsolete) has an onion proxy on the other end, an "exit
* connection" has a website or other server on the other end, and an * connection" has a website or other server on the other end, and an
* "AP connection" has an application proxy (and thus a user) on the * "AP connection" has an application proxy (and thus a user) on the
* other end. * other end.
@ -752,7 +751,7 @@ typedef struct {
char *nickname; /**< Human-readable OR name. */ char *nickname; /**< Human-readable OR name. */
uint32_t addr; /**< IPv4 address of OR, in host order. */ uint32_t addr; /**< IPv4 address of OR, in host order. */
uint16_t or_port; /**< Port for OR-to-OR and OP-to-OR connections. */ uint16_t or_port; /**< Port for TLS connections. */
uint16_t dir_port; /**< Port for HTTP directory connections. */ uint16_t dir_port; /**< Port for HTTP directory connections. */
crypto_pk_env_t *onion_pkey; /**< Public RSA key for onions. */ crypto_pk_env_t *onion_pkey; /**< Public RSA key for onions. */