diff options
author | Maxim Biro <nurupo.contributions@gmail.com> | 2017-04-16 05:57:21 -0400 |
---|---|---|
committer | Maxim Biro <nurupo.contributions@gmail.com> | 2017-04-22 15:31:25 -0400 |
commit | c7f63737ebfff2d1948ec9d6d92295a75d75cae5 (patch) | |
tree | ffaa46d8aecb53041ed61f6be73a4743fae6d4b1 /toxcore/TCP_client.h | |
parent | 5ed37e543825c023163adba95b99ea81d3337196 (diff) |
Revert "Implement tox_loop"
This reverts commit 5ff099763b1f56414572e1c12eb2f003117db5a0.
Diffstat (limited to 'toxcore/TCP_client.h')
-rw-r--r-- | toxcore/TCP_client.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h index 8a698869..21254314 100644 --- a/toxcore/TCP_client.h +++ b/toxcore/TCP_client.h | |||
@@ -27,12 +27,6 @@ | |||
27 | #include "TCP_server.h" | 27 | #include "TCP_server.h" |
28 | #include "crypto_core.h" | 28 | #include "crypto_core.h" |
29 | 29 | ||
30 | #ifdef HAVE_LIBEV | ||
31 | #include <ev.h> | ||
32 | #elif HAVE_LIBEVENT | ||
33 | #include <event2/event.h> | ||
34 | #endif | ||
35 | |||
36 | #define TCP_CONNECTION_TIMEOUT 10 | 30 | #define TCP_CONNECTION_TIMEOUT 10 |
37 | 31 | ||
38 | typedef enum { | 32 | typedef enum { |
@@ -58,15 +52,7 @@ enum { | |||
58 | }; | 52 | }; |
59 | typedef struct { | 53 | typedef struct { |
60 | uint8_t status; | 54 | uint8_t status; |
61 | Socket sock; | 55 | Socket sock; |
62 | #ifdef HAVE_LIBEV | ||
63 | struct { | ||
64 | ev_io listener; | ||
65 | struct ev_loop *dispatcher; | ||
66 | } sock_listener; | ||
67 | #elif HAVE_LIBEVENT | ||
68 | struct event *sock_listener; | ||
69 | #endif | ||
70 | uint8_t self_public_key[CRYPTO_PUBLIC_KEY_SIZE]; /* our public key */ | 56 | uint8_t self_public_key[CRYPTO_PUBLIC_KEY_SIZE]; /* our public key */ |
71 | uint8_t public_key[CRYPTO_PUBLIC_KEY_SIZE]; /* public key of the server */ | 57 | uint8_t public_key[CRYPTO_PUBLIC_KEY_SIZE]; /* public key of the server */ |
72 | IP_Port ip_port; /* The ip and port of the server */ | 58 | IP_Port ip_port; /* The ip and port of the server */ |