diff options
author | Kostya <kostyarjcnz@gmail.com> | 2013-08-30 03:28:50 -0400 |
---|---|---|
committer | Kostya <kostyarjcnz@gmail.com> | 2013-08-30 03:28:50 -0400 |
commit | 25563ac07005448706d294dccdabf14fbe01d100 (patch) | |
tree | 2166609dfed18c1e4625c05ac0478220dd842d87 /testing/DHT_test.c | |
parent | 790867d984841ba0e28c4100615590870895e7d4 (diff) |
Fixed build errors.
Diffstat (limited to 'testing/DHT_test.c')
-rw-r--r-- | testing/DHT_test.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/testing/DHT_test.c b/testing/DHT_test.c index 09e6dfe0..cfb3ec73 100644 --- a/testing/DHT_test.c +++ b/testing/DHT_test.c | |||
@@ -62,11 +62,11 @@ void print_clientlist(DHT *dht) | |||
62 | } | 62 | } |
63 | 63 | ||
64 | p_ip = dht->close_clientlist[i].ip_port; | 64 | p_ip = dht->close_clientlist[i].ip_port; |
65 | printf("\nIP: %u.%u.%u.%u Port: %u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port)); | 65 | printf("\nIP: %u.%u.%u.%u Port: %u", p_ip.ip.uint8[0], p_ip.ip.uint8[1], p_ip.ip.uint8[2], p_ip.ip.uint8[3], ntohs(p_ip.port)); |
66 | printf("\nTimestamp: %llu", (long long unsigned int) dht->close_clientlist[i].timestamp); | 66 | printf("\nTimestamp: %llu", (long long unsigned int) dht->close_clientlist[i].timestamp); |
67 | printf("\nLast pinged: %llu\n", (long long unsigned int) dht->close_clientlist[i].last_pinged); | 67 | printf("\nLast pinged: %llu\n", (long long unsigned int) dht->close_clientlist[i].last_pinged); |
68 | p_ip = dht->close_clientlist[i].ret_ip_port; | 68 | p_ip = dht->close_clientlist[i].ret_ip_port; |
69 | printf("OUR IP: %u.%u.%u.%u Port: %u\n", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port)); | 69 | printf("OUR IP: %u.%u.%u.%u Port: %u\n", p_ip.ip.uint8[0], p_ip.ip.uint8[1], p_ip.ip.uint8[2], p_ip.ip.uint8[3], ntohs(p_ip.port)); |
70 | printf("Timestamp: %llu\n", (long long unsigned int) dht->close_clientlist[i].ret_timestamp); | 70 | printf("Timestamp: %llu\n", (long long unsigned int) dht->close_clientlist[i].ret_timestamp); |
71 | } | 71 | } |
72 | } | 72 | } |
@@ -86,7 +86,7 @@ void print_friendlist(DHT *dht) | |||
86 | } | 86 | } |
87 | 87 | ||
88 | p_ip = DHT_getfriendip(dht, dht->friends_list[k].client_id); | 88 | p_ip = DHT_getfriendip(dht, dht->friends_list[k].client_id); |
89 | printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port)); | 89 | printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.uint8[0], p_ip.ip.uint8[1], p_ip.ip.uint8[2], p_ip.ip.uint8[3], ntohs(p_ip.port)); |
90 | 90 | ||
91 | printf("\nCLIENTS IN LIST:\n\n"); | 91 | printf("\nCLIENTS IN LIST:\n\n"); |
92 | 92 | ||
@@ -101,11 +101,11 @@ void print_friendlist(DHT *dht) | |||
101 | } | 101 | } |
102 | 102 | ||
103 | p_ip = dht->friends_list[k].client_list[i].ip_port; | 103 | p_ip = dht->friends_list[k].client_list[i].ip_port; |
104 | printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port)); | 104 | printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.uint8[0], p_ip.ip.uint8[1], p_ip.ip.uint8[2], p_ip.ip.uint8[3], ntohs(p_ip.port)); |
105 | printf("\nTimestamp: %llu", (long long unsigned int) dht->friends_list[k].client_list[i].timestamp); | 105 | printf("\nTimestamp: %llu", (long long unsigned int) dht->friends_list[k].client_list[i].timestamp); |
106 | printf("\nLast pinged: %llu\n", (long long unsigned int) dht->friends_list[k].client_list[i].last_pinged); | 106 | printf("\nLast pinged: %llu\n", (long long unsigned int) dht->friends_list[k].client_list[i].last_pinged); |
107 | p_ip = dht->friends_list[k].client_list[i].ret_ip_port; | 107 | p_ip = dht->friends_list[k].client_list[i].ret_ip_port; |
108 | printf("ret IP: %u.%u.%u.%u:%u\n", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port)); | 108 | printf("ret IP: %u.%u.%u.%u:%u\n", p_ip.ip.uint8[0], p_ip.ip.uint8[1], p_ip.ip.uint8[2], p_ip.ip.uint8[3], ntohs(p_ip.port)); |
109 | printf("Timestamp: %llu\n", (long long unsigned int)dht->friends_list[k].client_list[i].ret_timestamp); | 109 | printf("Timestamp: %llu\n", (long long unsigned int)dht->friends_list[k].client_list[i].ret_timestamp); |
110 | } | 110 | } |
111 | } | 111 | } |
@@ -133,7 +133,7 @@ int main(int argc, char *argv[]) | |||
133 | /* initialize networking */ | 133 | /* initialize networking */ |
134 | /* bind to ip 0.0.0.0:PORT */ | 134 | /* bind to ip 0.0.0.0:PORT */ |
135 | IP ip; | 135 | IP ip; |
136 | ip.i = 0; | 136 | ip.uint32 = 0; |
137 | 137 | ||
138 | DHT *dht = new_DHT(new_net_crypto(new_networking(ip, PORT))); | 138 | DHT *dht = new_DHT(new_net_crypto(new_networking(ip, PORT))); |
139 | 139 | ||
@@ -169,7 +169,7 @@ int main(int argc, char *argv[]) | |||
169 | * bootstrap_ip_port.ip.c[1] = 0; | 169 | * bootstrap_ip_port.ip.c[1] = 0; |
170 | * bootstrap_ip_port.ip.c[2] = 0; | 170 | * bootstrap_ip_port.ip.c[2] = 0; |
171 | * bootstrap_ip_port.ip.c[3] = 1; */ | 171 | * bootstrap_ip_port.ip.c[3] = 1; */ |
172 | bootstrap_ip_port.ip.i = inet_addr(argv[1]); | 172 | bootstrap_ip_port.ip.uint32 = inet_addr(argv[1]); |
173 | DHT_bootstrap(dht, bootstrap_ip_port, hex_string_to_bin(argv[3])); | 173 | DHT_bootstrap(dht, bootstrap_ip_port, hex_string_to_bin(argv[3])); |
174 | 174 | ||
175 | /* | 175 | /* |