summaryrefslogtreecommitdiff
path: root/toxcore/Messenger.c
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2015-05-12 20:59:28 -0400
committerirungentoo <irungentoo@gmail.com>2015-05-12 20:59:28 -0400
commit53c6b26a7e5e4e0abe787c0a7de0ff63dffd2254 (patch)
treef645e81b480581c24259c6c7f546d302247f7f8a /toxcore/Messenger.c
parent478552d33817e8e5aca4aa281ed143d8c57e9c02 (diff)
Connect to own TCP server if hosting one.
Removed useless code.
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r--toxcore/Messenger.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 359708ee..20213016 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2216,6 +2216,11 @@ void do_friends(Messenger *m)
2216 m->friendlist[i].user_istyping_sent = 1; 2216 m->friendlist[i].user_istyping_sent = 1;
2217 } 2217 }
2218 2218
2219 if (m->friendlist[i].tcp_server_sent == 0) {
2220 if (send_user_tcp_server(m, i))
2221 m->friendlist[i].tcp_server_sent = 1;
2222 }
2223
2219 check_friend_tcp_udp(m, i); 2224 check_friend_tcp_udp(m, i);
2220 do_receipts(m, i); 2225 do_receipts(m, i);
2221 do_reqchunk_filecb(m, i); 2226 do_reqchunk_filecb(m, i);
@@ -2286,6 +2291,15 @@ void do_messenger(Messenger *m)
2286 for (i = 0; i < NUM_SAVED_TCP_RELAYS; ++i) { 2291 for (i = 0; i < NUM_SAVED_TCP_RELAYS; ++i) {
2287 add_tcp_relay(m->net_crypto, m->loaded_relays[i].ip_port, m->loaded_relays[i].public_key); 2292 add_tcp_relay(m->net_crypto, m->loaded_relays[i].ip_port, m->loaded_relays[i].public_key);
2288 } 2293 }
2294
2295 if (m->tcp_server) {
2296 /* Add self tcp server. */
2297 IP_Port local_ip_port;
2298 local_ip_port.port = m->options.tcp_server_port;
2299 local_ip_port.ip.family = AF_INET;
2300 local_ip_port.ip.ip4.uint32 = INADDR_LOOPBACK;
2301 add_tcp_relay(m->net_crypto, local_ip_port, m->tcp_server->public_key);
2302 }
2289 } 2303 }
2290 2304
2291 unix_time_update(); 2305 unix_time_update();