commit 8ce15933e5e8d9c65c7cca2389e42ff2da604b77 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 18 13:07:33 2020 -0500
Move some declarations into proto_ext_or.h
They are for functions declared in that file. --- src/core/proto/proto_ext_or.h | 7 +++++++ src/feature/relay/ext_orport.h | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/core/proto/proto_ext_or.h b/src/core/proto/proto_ext_or.h index daac3e3eb..3408599fb 100644 --- a/src/core/proto/proto_ext_or.h +++ b/src/core/proto/proto_ext_or.h @@ -24,4 +24,11 @@ struct ext_or_cmd_t { int fetch_ext_or_command_from_buf(struct buf_t *buf, struct ext_or_cmd_t **out);
+ext_or_cmd_t *ext_or_cmd_new(uint16_t len); + +#define ext_or_cmd_free(cmd) \ + FREE_AND_NULL(ext_or_cmd_t, ext_or_cmd_free_, (cmd)) + +void ext_or_cmd_free_(ext_or_cmd_t *cmd); + #endif /* !defined(TOR_PROTO_EXT_OR_H) */ diff --git a/src/feature/relay/ext_orport.h b/src/feature/relay/ext_orport.h index dbe89fce1..d44c97be8 100644 --- a/src/feature/relay/ext_orport.h +++ b/src/feature/relay/ext_orport.h @@ -33,12 +33,6 @@
int connection_ext_or_start_auth(or_connection_t *or_conn);
-ext_or_cmd_t *ext_or_cmd_new(uint16_t len); - -#define ext_or_cmd_free(cmd) \ - FREE_AND_NULL(ext_or_cmd_t, ext_or_cmd_free_, (cmd)) - -void ext_or_cmd_free_(ext_or_cmd_t *cmd); void connection_or_set_ext_or_identifier(or_connection_t *conn); void connection_or_remove_from_ext_or_id_map(or_connection_t *conn); void connection_or_clear_ext_or_id_map(void);