commit 6ccd98f93e733e39dcd460860aeead017b1b5a4f Author: Nick Mathewson nickm@torproject.org Date: Sun Jul 1 14:34:52 2018 -0400

Move ext_or_cmd_t to proto_ext_or --- src/or/or.h | 8 +------- src/or/proto_ext_or.h | 9 +++++++-- 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/or/or.h b/src/or/or.h index be1f61edf..c38b8d750 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -624,13 +624,7 @@ typedef struct packed_cell_t packed_cell_t; typedef struct cell_queue_t cell_queue_t; typedef struct destroy_cell_t destroy_cell_t; typedef struct destroy_cell_queue_t destroy_cell_queue_t; - -/** A parsed Extended ORPort message. */ -typedef struct ext_or_cmd_t { - uint16_t cmd; /** Command type */ - uint16_t len; /** Body length */ - char body[FLEXIBLE_ARRAY_MEMBER]; /** Message body */ -} ext_or_cmd_t; +typedef struct ext_or_cmd_t ext_or_cmd_t;

/** Beginning of a RELAY cell payload. */ typedef struct { diff --git a/src/or/proto_ext_or.h b/src/or/proto_ext_or.h index 5366ec447..708a45974 100644 --- a/src/or/proto_ext_or.h +++ b/src/or/proto_ext_or.h @@ -8,10 +8,15 @@ #define TOR_PROTO_EXT_OR_H

struct buf_t; -struct ext_or_cmt_t; + +/** A parsed Extended ORPort message. */ +typedef struct ext_or_cmd_t { + uint16_t cmd; /** Command type */ + uint16_t len; /** Body length */ + char body[FLEXIBLE_ARRAY_MEMBER]; /** Message body */ +} ext_or_cmd_t;

int fetch_ext_or_command_from_buf(struct buf_t *buf, struct ext_or_cmd_t **out);

#endif /* !defined(TOR_PROTO_EXT_OR_H) */ -