summaryrefslogtreecommitdiff
path: root/other/bootstrap_serverdaemon
diff options
context:
space:
mode:
authorCoren[m] <Break@Ocean>2013-10-20 16:56:12 +0200
committerCoren[m] <Break@Ocean>2013-10-20 16:56:12 +0200
commita0f08839bd134f3f964a6cccf1243cd42f15d4e5 (patch)
treea313feee4c0d2a251cb460b9afe3766ca2422d5f /other/bootstrap_serverdaemon
parent8abad7bc822a548d4f6e73203e8d4f640c1217ae (diff)
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off).
Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
Diffstat (limited to 'other/bootstrap_serverdaemon')
-rw-r--r--other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
index 890085cc..dc519448 100644
--- a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
+++ b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
@@ -305,12 +305,8 @@ struct server_conf_s configure_server(char *cfg_file)
305 printf("bootstrap_server %d: Invalid port.\n", i); 305 printf("bootstrap_server %d: Invalid port.\n", i);
306 } 306 }
307 307
308#ifdef TOX_ENABLE_IPV6
309 server_conf.info[i].conn.ip.family = AF_INET; 308 server_conf.info[i].conn.ip.family = AF_INET;
310 server_conf.info[i].conn.ip.ip4.uint32 = resolve_addr(strcpy(tmp_ip, bs_ip)); 309 server_conf.info[i].conn.ip.ip4.uint32 = resolve_addr(strcpy(tmp_ip, bs_ip));
311#else
312 server_conf.info[i].conn.ip.uint32 = resolve_addr(strcpy(tmp_ip, bs_ip));
313#endif
314 server_conf.info[i].conn.port = htons(bs_port); 310 server_conf.info[i].conn.port = htons(bs_port);
315 b16_to_key(strcpy(tmp_pk, bs_pk), bs_pk_p); 311 b16_to_key(strcpy(tmp_pk, bs_pk), bs_pk_p);
316 } 312 }