diff options
-rw-r--r-- | build/Makefile.am | 2 | ||||
-rw-r--r-- | other/bootstrap_daemon/src/Makefile.inc (renamed from other/bootstrap_daemon/Makefile.inc) | 16 | ||||
-rw-r--r-- | other/bootstrap_daemon/src/tox-bootstrapd.c | 12 |
3 files changed, 17 insertions, 13 deletions
diff --git a/build/Makefile.am b/build/Makefile.am index c0e59645..ea844b3f 100644 --- a/build/Makefile.am +++ b/build/Makefile.am | |||
@@ -10,5 +10,5 @@ include ../toxencryptsave/Makefile.inc | |||
10 | include ../toxav/Makefile.inc | 10 | include ../toxav/Makefile.inc |
11 | include ../other/Makefile.inc | 11 | include ../other/Makefile.inc |
12 | include ../testing/Makefile.inc | 12 | include ../testing/Makefile.inc |
13 | include ../other/bootstrap_daemon/Makefile.inc | 13 | include ../other/bootstrap_daemon/src/Makefile.inc |
14 | include ../auto_tests/Makefile.inc | 14 | include ../auto_tests/Makefile.inc |
diff --git a/other/bootstrap_daemon/Makefile.inc b/other/bootstrap_daemon/src/Makefile.inc index b278e3f0..a0d75fa0 100644 --- a/other/bootstrap_daemon/Makefile.inc +++ b/other/bootstrap_daemon/src/Makefile.inc | |||
@@ -3,16 +3,17 @@ if BUILD_DHT_BOOTSTRAP_DAEMON | |||
3 | bin_PROGRAMS += tox-bootstrapd | 3 | bin_PROGRAMS += tox-bootstrapd |
4 | 4 | ||
5 | tox_bootstrapd_SOURCES = \ | 5 | tox_bootstrapd_SOURCES = \ |
6 | ../other/bootstrap_daemon/src/tox-bootstrapd.c \ | 6 | ../other/bootstrap_daemon/src/command_line_arguments.c \ |
7 | ../other/bootstrap_daemon/src/log.c \ | 7 | ../other/bootstrap_daemon/src/command_line_arguments.h \ |
8 | ../other/bootstrap_daemon/src/log.h \ | ||
9 | ../other/bootstrap_daemon/src/config.h \ | ||
10 | ../other/bootstrap_daemon/src/config.c \ | 8 | ../other/bootstrap_daemon/src/config.c \ |
11 | ../other/bootstrap_daemon/src/config_defaults.h \ | 9 | ../other/bootstrap_daemon/src/config_defaults.h \ |
12 | ../other/bootstrap_node_packets.h \ | 10 | ../other/bootstrap_daemon/src/config.h \ |
11 | ../other/bootstrap_daemon/src/log.c \ | ||
12 | ../other/bootstrap_daemon/src/log.h \ | ||
13 | ../other/bootstrap_daemon/src/tox-bootstrapd.c \ | ||
13 | ../other/bootstrap_node_packets.c \ | 14 | ../other/bootstrap_node_packets.c \ |
14 | ../other/bootstrap_daemon/src/command_line_arguments.h \ | 15 | ../other/bootstrap_node_packets.h |
15 | ../other/bootstrap_daemon/src/command_line_arguments.c | 16 | |
16 | 17 | ||
17 | tox_bootstrapd_CFLAGS = \ | 18 | tox_bootstrapd_CFLAGS = \ |
18 | -I$(top_srcdir)/other/bootstrap_daemon \ | 19 | -I$(top_srcdir)/other/bootstrap_daemon \ |
@@ -32,5 +33,6 @@ endif | |||
32 | 33 | ||
33 | EXTRA_DIST += \ | 34 | EXTRA_DIST += \ |
34 | $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.conf \ | 35 | $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.conf \ |
36 | $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.service \ | ||
35 | $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.sh | 37 | $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.sh |
36 | 38 | ||
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c index 45b7add0..4883f885 100644 --- a/other/bootstrap_daemon/src/tox-bootstrapd.c +++ b/other/bootstrap_daemon/src/tox-bootstrapd.c | |||
@@ -30,19 +30,21 @@ | |||
30 | #include <string.h> | 30 | #include <string.h> |
31 | 31 | ||
32 | // toxcore | 32 | // toxcore |
33 | #include "../../toxcore/LAN_discovery.h" | 33 | #include "../../../toxcore/LAN_discovery.h" |
34 | #include "../../toxcore/onion_announce.h" | 34 | #include "../../../toxcore/onion_announce.h" |
35 | #include "../../toxcore/TCP_server.h" | 35 | #include "../../../toxcore/TCP_server.h" |
36 | #include "../../toxcore/util.h" | 36 | #include "../../../toxcore/util.h" |
37 | |||
37 | 38 | ||
38 | // misc | 39 | // misc |
39 | #include "../bootstrap_node_packets.h" | 40 | #include "../../bootstrap_node_packets.h" |
40 | 41 | ||
41 | #include "command_line_arguments.h" | 42 | #include "command_line_arguments.h" |
42 | #include "config.h" | 43 | #include "config.h" |
43 | #include "global.h" | 44 | #include "global.h" |
44 | #include "log.h" | 45 | #include "log.h" |
45 | 46 | ||
47 | |||
46 | #define SLEEP_MILLISECONDS(MS) usleep(1000*MS) | 48 | #define SLEEP_MILLISECONDS(MS) usleep(1000*MS) |
47 | 49 | ||
48 | // Uses the already existing key or creates one if it didn't exist | 50 | // Uses the already existing key or creates one if it didn't exist |