diff options
-rw-r--r-- | auto_tests/Makefile.inc | 11 | ||||
-rw-r--r-- | toxcore/Makefile.inc | 4 | ||||
-rw-r--r-- | toxcore/TCP_client.c | 6 |
3 files changed, 12 insertions, 9 deletions
diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc index 27fe6f76..a8771695 100644 --- a/auto_tests/Makefile.inc +++ b/auto_tests/Makefile.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | if BUILD_TESTS | 1 | if BUILD_TESTS |
2 | 2 | ||
3 | TESTS = messenger_autotest crypto_test network_test assoc_test onion_test tox_test | 3 | TESTS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test |
4 | check_PROGRAMS = messenger_autotest crypto_test network_test assoc_test onion_test tox_test | 4 | check_PROGRAMS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test |
5 | 5 | ||
6 | 6 | ||
7 | AUTOTEST_CFLAGS = \ | 7 | AUTOTEST_CFLAGS = \ |
@@ -52,7 +52,6 @@ assoc_test_CFLAGS = $(AUTOTEST_CFLAGS) | |||
52 | assoc_test_LDADD = $(AUTOTEST_LDADD) | 52 | assoc_test_LDADD = $(AUTOTEST_LDADD) |
53 | 53 | ||
54 | 54 | ||
55 | |||
56 | onion_test_SOURCES = ../auto_tests/onion_test.c | 55 | onion_test_SOURCES = ../auto_tests/onion_test.c |
57 | 56 | ||
58 | onion_test_CFLAGS = $(AUTOTEST_CFLAGS) | 57 | onion_test_CFLAGS = $(AUTOTEST_CFLAGS) |
@@ -60,6 +59,12 @@ onion_test_CFLAGS = $(AUTOTEST_CFLAGS) | |||
60 | onion_test_LDADD = $(AUTOTEST_LDADD) | 59 | onion_test_LDADD = $(AUTOTEST_LDADD) |
61 | 60 | ||
62 | 61 | ||
62 | TCP_test_SOURCES = ../auto_tests/TCP_test.c | ||
63 | |||
64 | TCP_test_CFLAGS = $(AUTOTEST_CFLAGS) | ||
65 | |||
66 | TCP_test_LDADD = $(AUTOTEST_LDADD) | ||
67 | |||
63 | 68 | ||
64 | tox_test_SOURCES = ../auto_tests/tox_test.c | 69 | tox_test_SOURCES = ../auto_tests/tox_test.c |
65 | 70 | ||
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc index 8912965e..5e529267 100644 --- a/toxcore/Makefile.inc +++ b/toxcore/Makefile.inc | |||
@@ -35,6 +35,10 @@ libtoxcore_la_SOURCES = ../toxcore/DHT.h \ | |||
35 | ../toxcore/onion_announce.c \ | 35 | ../toxcore/onion_announce.c \ |
36 | ../toxcore/onion_client.h \ | 36 | ../toxcore/onion_client.h \ |
37 | ../toxcore/onion_client.c \ | 37 | ../toxcore/onion_client.c \ |
38 | ../toxcore/TCP_client.h \ | ||
39 | ../toxcore/TCP_client.c \ | ||
40 | ../toxcore/TCP_server.h \ | ||
41 | ../toxcore/TCP_server.c \ | ||
38 | ../toxcore/misc_tools.h | 42 | ../toxcore/misc_tools.h |
39 | 43 | ||
40 | libtoxcore_la_CFLAGS = -I$(top_srcdir) \ | 44 | libtoxcore_la_CFLAGS = -I$(top_srcdir) \ |
diff --git a/toxcore/TCP_client.c b/toxcore/TCP_client.c index 29b4e7e7..437429b9 100644 --- a/toxcore/TCP_client.c +++ b/toxcore/TCP_client.c | |||
@@ -130,12 +130,6 @@ static int send_pending_data(TCP_Client_Connection *con) | |||
130 | return -1; | 130 | return -1; |
131 | } | 131 | } |
132 | 132 | ||
133 | static int send_disconnect_packet(TCP_Client_Connection *TCP_connection) | ||
134 | { | ||
135 | |||
136 | return 0; | ||
137 | } | ||
138 | |||
139 | /* Create new TCP connection to ip_port/public_key | 133 | /* Create new TCP connection to ip_port/public_key |
140 | */ | 134 | */ |
141 | TCP_Client_Connection *new_TCP_connection(IP_Port ip_port, uint8_t *public_key, uint8_t *self_public_key, | 135 | TCP_Client_Connection *new_TCP_connection(IP_Port ip_port, uint8_t *public_key, uint8_t *self_public_key, |