aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_extorport.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-09-20 15:19:43 -0400
committerNick Mathewson <nickm@torproject.org>2018-09-21 09:14:06 -0400
commitc7ce6b9821be22e734b79e07e318f2bfba32722d (patch)
tree0582d70285c6fcd33f9804af6684f8de27273c36 /src/test/test_extorport.c
parent98ef3e82e48c2d57c09d5f551b72e7d6bfe5347a (diff)
downloadtor-c7ce6b9821be22e734b79e07e318f2bfba32722d.tar.gz
tor-c7ce6b9821be22e734b79e07e318f2bfba32722d.zip
Split main.c into main.c and mainloop.c
The main.c code is responsible for initialization and shutdown; the mainloop.c code is responsible for running the main loop of Tor. Splitting the "generic event loop" part of mainloop.c from the event-loop-specific part is not done as part of this patch.
Diffstat (limited to 'src/test/test_extorport.c')
-rw-r--r--src/test/test_extorport.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c
index ff987563c6..1ac1c68d7e 100644
--- a/src/test/test_extorport.c
+++ b/src/test/test_extorport.c
@@ -3,7 +3,7 @@
#define CONNECTION_PRIVATE
#define EXT_ORPORT_PRIVATE
-#define MAIN_PRIVATE
+#define MAINLOOP_PRIVATE
#include "core/or/or.h"
#include "lib/container/buffers.h"
#include "core/mainloop/connection.h"
@@ -12,7 +12,7 @@
#include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "feature/relay/ext_orport.h"
-#include "core/mainloop/main.h"
+#include "core/mainloop/mainloop.h"
#include "core/or/or_connection_st.h"
@@ -463,7 +463,7 @@ test_ext_or_handshake(void *arg)
memcpy(ext_or_auth_cookie, "Gliding wrapt in a brown mantle," , 32);
ext_or_auth_cookie_is_set = 1;
- init_connection_lists();
+ tor_init_connection_lists();
conn = or_connection_new(CONN_TYPE_EXT_OR, AF_INET);
tt_int_op(0, OP_EQ, connection_ext_or_start_auth(conn));