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

3 files changed, 14 insertions, 29 deletions

diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index c42dc053..536217fe 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -88,16 +88,16 @@ static void print_assoc(IPPTsPng *assoc, uint8_t ours)
 {
     IP_Port *ipp = &assoc->ip_port;
     char ip_str[IP_NTOA_LEN];
-    printf("\nIP: %s Port: %u", ip_ntoa(&ipp->ip, ip_str, sizeof(ip_str)), ntohs(ipp->port));
+    printf("\nIP: %s Port: %u", ip_ntoa(&ipp->ip, ip_str, sizeof(ip_str)), net_ntohs(ipp->port));
     printf("\nTimestamp: %llu", (long long unsigned int) assoc->timestamp);
     printf("\nLast pinged: %llu\n", (long long unsigned int) assoc->last_pinged);
 
     ipp = &assoc->ret_ip_port;
 
     if (ours) {
-        printf("OUR IP: %s Port: %u\n", ip_ntoa(&ipp->ip, ip_str, sizeof(ip_str)), ntohs(ipp->port));
+        printf("OUR IP: %s Port: %u\n", ip_ntoa(&ipp->ip, ip_str, sizeof(ip_str)), net_ntohs(ipp->port));
     } else {
-        printf("RET IP: %s Port: %u\n", ip_ntoa(&ipp->ip, ip_str, sizeof(ip_str)), ntohs(ipp->port));
+        printf("RET IP: %s Port: %u\n", ip_ntoa(&ipp->ip, ip_str, sizeof(ip_str)), net_ntohs(ipp->port));
     }
 
     printf("Timestamp: %llu\n", (long long unsigned int) assoc->ret_timestamp);
@@ -138,7 +138,7 @@ static void print_friendlist(DHT *dht)
 
         int friendok = DHT_getfriendip(dht, dht->friends_list[k].public_key, &p_ip);
         char ip_str[IP_NTOA_LEN];
-        printf("\nIP: %s:%u (%d)", ip_ntoa(&p_ip.ip, ip_str, sizeof(ip_str)), ntohs(p_ip.port), friendok);
+        printf("\nIP: %s:%u (%d)", ip_ntoa(&p_ip.ip, ip_str, sizeof(ip_str)), net_ntohs(p_ip.port), friendok);
 
         printf("\nCLIENTS IN LIST:\n\n");
 
@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
 
     perror("Initialization");
 
-    uint16_t port = htons(atoi(argv[argvoffset + 2]));
+    uint16_t port = net_htons(atoi(argv[argvoffset + 2]));
     unsigned char *binary_string = hex_string_to_bin(argv[argvoffset + 3]);
     int res = DHT_bootstrap_from_address(dht, argv[argvoffset + 1], ipv6enabled, port, binary_string);
     free(binary_string);
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 467d7988..c1a63da8 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
     }
 
     if (argc == argvoffset + 4) {
-        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(m->dht, argv[argvoffset + 1],
                                              ipv6enabled, port, bootstrap_key);
diff --git a/testing/dns3_test.c b/testing/dns3_test.c
index 021a09f9..37bbfadb 100644
--- a/testing/dns3_test.c
+++ b/testing/dns3_test.c
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 
     IP ip = {0};
     ip.family = AF_INET;
-    Socket sock = socket(ip.family, SOCK_DGRAM, IPPROTO_UDP);
+    Socket sock = net_socket(ip.family, TOX_SOCK_DGRAM, TOX_PROTO_UDP);
 
     if (!sock_valid(sock)) {
         return -1;
@@ -60,29 +60,9 @@ int main(int argc, char *argv[])
         return -1;
     }
 
-    struct sockaddr_in target;
-
-    size_t addrsize = sizeof(struct sockaddr_in);
-
-    target.sin_family = AF_INET;
-
-    fill_addr4(ip.ip4, &target.sin_addr);
-
-    target.sin_port = htons(53);
-
+    uint32_t request_id;
     uint8_t string[1024] = {0};
-
     void *d = tox_dns3_new(hex_string_to_bin(argv[2]));
-
-    unsigned int i;
-
-    uint32_t request_id;
-
-    /*
-    for (i = 0; i < 255; ++i) {
-        tox_generate_dns3_string(d, string, sizeof(string), &request_id, string, i);
-        printf("%s\n", string);
-    }*/
     int len = tox_generate_dns3_string(d, string + 1, sizeof(string) - 1, &request_id, (uint8_t *)argv[3], strlen(argv[3]));
 
     if (len == -1) {
@@ -96,7 +76,11 @@ int main(int argc, char *argv[])
     uint8_t id = rand();
     uint32_t p_len = create_packet(packet, string, strlen((char *)string), id);
 
-    if (sendto(sock, (char *)packet, p_len, 0, (struct sockaddr *)&target, addrsize) != p_len) {
+    IP_Port ip_port;
+    ip_port.port = 53;
+    ip_port.ip = ip;
+
+    if (net_sendto_ip4(sock, (char *)packet, p_len, ip_port) != p_len) {
         return -1;
     }
 
@@ -107,6 +91,7 @@ int main(int argc, char *argv[])
         return -1;
     }
 
+    unsigned int i;
     for (i = r_len - 1; i != 0 && buffer[i] != '='; --i) {
         ;
     }