diff options
author | Diadlo <polsha3@gmail.com> | 2017-01-07 11:28:53 +0300 |
---|---|---|
committer | Diadlo <polsha3@gmail.com> | 2017-02-26 23:16:16 +0300 |
commit | b19a9e54643eceaa52e71c0f38fa2ecae5a6809e (patch) | |
tree | 4c6fff0a086988ab21636e88dbf65c2e40a76a67 /other/bootstrap_daemon | |
parent | b2d04eae9d9b76523b877a9e5efd5989f83b143d (diff) |
Add part of platform-independent network API implementation
socket -> net_socket
htons -> net_htons
htonl -> net_htonl
connect -> net_connect
sendto -> net_sendto_ip4
getaddrinfo -> net_getipport
sa_family_t -> Family
Diffstat (limited to 'other/bootstrap_daemon')
-rw-r--r-- | other/bootstrap_daemon/src/config.c | 2 | ||||
-rw-r--r-- | other/bootstrap_daemon/src/tox-bootstrapd.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/other/bootstrap_daemon/src/config.c b/other/bootstrap_daemon/src/config.c index aa8978a5..b45b05f9 100644 --- a/other/bootstrap_daemon/src/config.c +++ b/other/bootstrap_daemon/src/config.c | |||
@@ -406,7 +406,7 @@ int bootstrap_from_config(const char *cfg_file_path, DHT *dht, int enable_ipv6) | |||
406 | } | 406 | } |
407 | 407 | ||
408 | bs_public_key_bin = hex_string_to_bin(bs_public_key); | 408 | bs_public_key_bin = hex_string_to_bin(bs_public_key); |
409 | address_resolved = DHT_bootstrap_from_address(dht, bs_address, enable_ipv6, htons(bs_port), | 409 | address_resolved = DHT_bootstrap_from_address(dht, bs_address, enable_ipv6, net_htons(bs_port), |
410 | bs_public_key_bin); | 410 | bs_public_key_bin); |
411 | free(bs_public_key_bin); | 411 | free(bs_public_key_bin); |
412 | 412 | ||
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c index 1c4b11b6..9f67458b 100644 --- a/other/bootstrap_daemon/src/tox-bootstrapd.c +++ b/other/bootstrap_daemon/src/tox-bootstrapd.c | |||
@@ -312,7 +312,7 @@ int main(int argc, char *argv[]) | |||
312 | print_public_key(dht->self_public_key); | 312 | print_public_key(dht->self_public_key); |
313 | 313 | ||
314 | uint64_t last_LANdiscovery = 0; | 314 | uint64_t last_LANdiscovery = 0; |
315 | const uint16_t htons_port = htons(port); | 315 | const uint16_t net_htons_port = net_htons(port); |
316 | 316 | ||
317 | int waiting_for_dht_connection = 1; | 317 | int waiting_for_dht_connection = 1; |
318 | 318 | ||
@@ -325,7 +325,7 @@ int main(int argc, char *argv[]) | |||
325 | do_DHT(dht); | 325 | do_DHT(dht); |
326 | 326 | ||
327 | if (enable_lan_discovery && is_timeout(last_LANdiscovery, LAN_DISCOVERY_INTERVAL)) { | 327 | if (enable_lan_discovery && is_timeout(last_LANdiscovery, LAN_DISCOVERY_INTERVAL)) { |
328 | send_LANdiscovery(htons_port, dht); | 328 | send_LANdiscovery(net_htons_port, dht); |
329 | last_LANdiscovery = unix_time(); | 329 | last_LANdiscovery = unix_time(); |
330 | } | 330 | } |
331 | 331 | ||