mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Add magic to end of C files to make emacs happy; split test invocation into separate file.
svn:r224
This commit is contained in:
parent
afa95ca47c
commit
c217b1ca71
@ -1,19 +1,22 @@
|
||||
TESTS = test
|
||||
|
||||
TESTS = test_config
|
||||
|
||||
noinst_PROGRAMS = test_config
|
||||
noinst_PROGRAMS = test
|
||||
|
||||
bin_PROGRAMS = or
|
||||
|
||||
or_LDADD = -L../common -lor -lz
|
||||
|
||||
or_SOURCES = buffers.c circuit.c command.c connection.c \
|
||||
connection_exit.c connection_ap.c connection_op.c connection_or.c config.c \
|
||||
main.c onion.c routers.c directory.c dns.c
|
||||
onion.c routers.c directory.c dns.c \
|
||||
main.c tor_main.c
|
||||
|
||||
test_config_SOURCES = test_config.c config.c
|
||||
or_LDADD = -L../common -lor -lz
|
||||
|
||||
test_config_LDADD = -L../common -lor
|
||||
test_SOURCES = buffers.c circuit.c command.c connection.c \
|
||||
connection_exit.c connection_ap.c connection_op.c connection_or.c config.c \
|
||||
onion.c routers.c directory.c dns.c \
|
||||
main.c test.c
|
||||
|
||||
test_LDADD = -L../common -lor -lz
|
||||
|
||||
noinst_HEADERS = or.h tree.h
|
||||
|
||||
|
@ -252,3 +252,10 @@ int find_on_inbuf(char *string, int string_len,
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -631,3 +631,10 @@ void circuit_dump_by_conn(connection_t *conn) {
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -300,3 +300,10 @@ void command_process_destroy_cell(cell_t *cell, connection_t *conn) {
|
||||
circuit_free(circ);
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -369,3 +369,10 @@ int getconfig(int argc, char **argv, or_options_t *options) {
|
||||
return result;
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -904,3 +904,10 @@ int connection_process_cell_from_inbuf(connection_t *conn) {
|
||||
return connection_process_inbuf(conn); /* process the remainder of the buffer */
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -539,3 +539,11 @@ int connection_ap_handle_listener_read(connection_t *conn) {
|
||||
log(LOG_NOTICE,"AP: Received a connection request. Waiting for socksinfo.");
|
||||
return connection_handle_listener_read(conn, CONN_TYPE_AP, AP_CONN_STATE_SOCKS_WAIT);
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -389,3 +389,10 @@ int connection_exit_connect(connection_t *conn) {
|
||||
return connection_exit_send_connected(conn);
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -121,3 +121,10 @@ int connection_op_handle_listener_read(connection_t *conn) {
|
||||
return connection_handle_listener_read(conn, CONN_TYPE_OP, OP_CONN_STATE_AWAITING_KEYS);
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -740,3 +740,10 @@ int connection_or_handle_listener_read(connection_t *conn) {
|
||||
return connection_handle_listener_read(conn, CONN_TYPE_OR, OR_CONN_STATE_SERVER_AUTH_WAIT);
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -293,3 +293,10 @@ int connection_dir_handle_listener_read(connection_t *conn) {
|
||||
return connection_handle_listener_read(conn, CONN_TYPE_DIR, DIR_CONN_STATE_COMMAND_WAIT);
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -568,3 +568,10 @@ static int dns_found_answer(char *question, uint32_t answer, uint32_t valid) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -626,7 +626,7 @@ void daemonize() {
|
||||
fclose(stderr);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
int tor_main(int argc, char *argv[]) {
|
||||
int retval = 0;
|
||||
|
||||
if(getconfig(argc,argv,&options))
|
||||
@ -657,3 +657,10 @@ int main(int argc, char *argv[]) {
|
||||
return retval;
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -809,3 +809,10 @@ static int find_tracked_onion(unsigned char *onion, uint32_t onionlen) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -775,3 +775,11 @@ int router_get_list_from_file(char *routerfile);
|
||||
int router_get_list_from_string(char *s);
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
@ -532,3 +532,10 @@ void test_write_pkey(crypto_pk_env_t *pkey) {
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
||||
|
15
src/or/test.c
Normal file
15
src/or/test.c
Normal file
@ -0,0 +1,15 @@
|
||||
/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */
|
||||
/* See LICENSE for licensing information */
|
||||
/* $Id$ */
|
||||
|
||||
int main(int c, char**v) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
18
src/or/tor_main.c
Normal file
18
src/or/tor_main.c
Normal file
@ -0,0 +1,18 @@
|
||||
/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */
|
||||
/* See LICENSE for licensing information */
|
||||
/* $Id$ */
|
||||
|
||||
int tor_main(int argc, char *argv[]);
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
return tor_main(argc, argv);
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
mode:c
|
||||
indent-tabs-mode:nil
|
||||
c-basic-offset:2
|
||||
End:
|
||||
*/
|
Loading…
Reference in New Issue
Block a user