4 files changed, 7 insertions, 7 deletions

diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index d7e66d33..a339119f 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -166,11 +166,11 @@ int main(int argc, char *argv[])
     fclose(file);
 
     printf("\n");
-    printf("Port: %u\n", ntohs(dht->net->port));
+    printf("Port: %u\n", net_ntohs(dht->net->port));
 
     if (argc > argvoffset + 3) {
         printf("Trying to bootstrap into the network...\n");
-        uint16_t port = htons(atoi(argv[argvoffset + 2]));
+        uint16_t port = net_htons(atoi(argv[argvoffset + 2]));
         uint8_t *bootstrap_key = hex_string_to_bin(argv[argvoffset + 3]);
         int res = DHT_bootstrap_from_address(dht, argv[argvoffset + 1],
                                              ipv6enabled, port, bootstrap_key);
@@ -196,7 +196,7 @@ int main(int argc, char *argv[])
         do_DHT(dht);
 
         if (is_timeout(last_LANdiscovery, is_waiting_for_dht_connection ? 5 : LAN_DISCOVERY_INTERVAL)) {
-            send_LANdiscovery(htons(PORT), dht);
+            send_LANdiscovery(net_htons(PORT), dht);
             last_LANdiscovery = unix_time();
         }
 
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)
         }
 
         bs_public_key_bin = hex_string_to_bin(bs_public_key);
-        address_resolved = DHT_bootstrap_from_address(dht, bs_address, enable_ipv6, htons(bs_port),
+        address_resolved = DHT_bootstrap_from_address(dht, bs_address, enable_ipv6, net_htons(bs_port),
                            bs_public_key_bin);
         free(bs_public_key_bin);
 
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[])
     print_public_key(dht->self_public_key);
 
     uint64_t last_LANdiscovery = 0;
-    const uint16_t htons_port = htons(port);
+    const uint16_t net_htons_port = net_htons(port);
 
     int waiting_for_dht_connection = 1;
 
@@ -325,7 +325,7 @@ int main(int argc, char *argv[])
         do_DHT(dht);
 
         if (enable_lan_discovery && is_timeout(last_LANdiscovery, LAN_DISCOVERY_INTERVAL)) {
-            send_LANdiscovery(htons_port, dht);
+            send_LANdiscovery(net_htons_port, dht);
             last_LANdiscovery = unix_time();
         }
 
diff --git a/other/bootstrap_node_packets.c b/other/bootstrap_node_packets.c
index 09404d6e..614cb720 100644
--- a/other/bootstrap_node_packets.c
+++ b/other/bootstrap_node_packets.c
@@ -61,7 +61,7 @@ int bootstrap_set_callbacks(Networking_Core *net, uint32_t version, uint8_t *mot
         return -1;
     }
 
-    bootstrap_version = htonl(version);
+    bootstrap_version = net_htonl(version);
     memcpy(bootstrap_motd, motd, motd_length);
     bootstrap_motd_length = motd_length;