diff options
Diffstat (limited to 'testing/DHT_test.c')
-rw-r--r-- | testing/DHT_test.c | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/testing/DHT_test.c b/testing/DHT_test.c index f6a2c4bc..04340b0e 100644 --- a/testing/DHT_test.c +++ b/testing/DHT_test.c | |||
@@ -54,7 +54,7 @@ | |||
54 | 54 | ||
55 | uint8_t zeroes_cid[crypto_box_PUBLICKEYBYTES]; | 55 | uint8_t zeroes_cid[crypto_box_PUBLICKEYBYTES]; |
56 | 56 | ||
57 | void print_client_id(uint8_t *public_key) | 57 | static void print_client_id(uint8_t *public_key) |
58 | { | 58 | { |
59 | uint32_t j; | 59 | uint32_t j; |
60 | 60 | ||
@@ -63,7 +63,7 @@ void print_client_id(uint8_t *public_key) | |||
63 | } | 63 | } |
64 | } | 64 | } |
65 | 65 | ||
66 | void print_hardening(Hardening *h) | 66 | static void print_hardening(Hardening *h) |
67 | { | 67 | { |
68 | printf("Hardening:\n"); | 68 | printf("Hardening:\n"); |
69 | printf("routes_requests_ok: %hhu\n", h->routes_requests_ok); | 69 | printf("routes_requests_ok: %hhu\n", h->routes_requests_ok); |
@@ -81,7 +81,7 @@ void print_hardening(Hardening *h) | |||
81 | printf("\n\n"); | 81 | printf("\n\n"); |
82 | } | 82 | } |
83 | 83 | ||
84 | void print_assoc(IPPTsPng *assoc, uint8_t ours) | 84 | static void print_assoc(IPPTsPng *assoc, uint8_t ours) |
85 | { | 85 | { |
86 | IP_Port *ipp = &assoc->ip_port; | 86 | IP_Port *ipp = &assoc->ip_port; |
87 | printf("\nIP: %s Port: %u", ip_ntoa(&ipp->ip), ntohs(ipp->port)); | 87 | printf("\nIP: %s Port: %u", ip_ntoa(&ipp->ip), ntohs(ipp->port)); |
@@ -100,7 +100,7 @@ void print_assoc(IPPTsPng *assoc, uint8_t ours) | |||
100 | print_hardening(&assoc->hardening); | 100 | print_hardening(&assoc->hardening); |
101 | } | 101 | } |
102 | 102 | ||
103 | void print_clientlist(DHT *dht) | 103 | static void print_clientlist(DHT *dht) |
104 | { | 104 | { |
105 | uint32_t i; | 105 | uint32_t i; |
106 | printf("___________________CLOSE________________________________\n"); | 106 | printf("___________________CLOSE________________________________\n"); |
@@ -120,7 +120,7 @@ void print_clientlist(DHT *dht) | |||
120 | } | 120 | } |
121 | } | 121 | } |
122 | 122 | ||
123 | void print_friendlist(DHT *dht) | 123 | static void print_friendlist(DHT *dht) |
124 | { | 124 | { |
125 | uint32_t i, k; | 125 | uint32_t i, k; |
126 | IP_Port p_ip; | 126 | IP_Port p_ip; |
@@ -153,7 +153,8 @@ void print_friendlist(DHT *dht) | |||
153 | } | 153 | } |
154 | } | 154 | } |
155 | 155 | ||
156 | void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port) | 156 | #if 0 /* slvrTODO: */ |
157 | static void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port) | ||
157 | { | 158 | { |
158 | uint32_t i; | 159 | uint32_t i; |
159 | printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length); | 160 | printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length); |
@@ -169,6 +170,7 @@ void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port) | |||
169 | 170 | ||
170 | printf("\n--------------------END-----------------------------\n\n\n"); | 171 | printf("\n--------------------END-----------------------------\n\n\n"); |
171 | } | 172 | } |
173 | #endif | ||
172 | 174 | ||
173 | int main(int argc, char *argv[]) | 175 | int main(int argc, char *argv[]) |
174 | { | 176 | { |
@@ -230,26 +232,27 @@ int main(int argc, char *argv[]) | |||
230 | return 1; | 232 | return 1; |
231 | } | 233 | } |
232 | 234 | ||
233 | /* | 235 | #if 0 /* slvrTODO: */ |
234 | IP_Port ip_port; | 236 | IP_Port ip_port; |
235 | uint8_t data[MAX_UDP_PACKET_SIZE]; | 237 | uint8_t data[MAX_UDP_PACKET_SIZE]; |
236 | uint32_t length; | 238 | uint32_t length; |
237 | */ | 239 | #endif |
238 | 240 | ||
239 | while (1) { | 241 | while (1) { |
240 | |||
241 | do_DHT(dht); | 242 | do_DHT(dht); |
242 | 243 | ||
243 | /* slvrTODO: | 244 | #if 0 /* slvrTODO: */ |
244 | while(receivepacket(&ip_port, data, &length) != -1) { | 245 | |
245 | if(DHT_handlepacket(data, length, ip_port) && friendreq_handlepacket(data, length, ip_port)) { | 246 | while (receivepacket(&ip_port, data, &length) != -1) { |
246 | //unhandled packet | 247 | if (DHT_handlepacket(data, length, ip_port) && friendreq_handlepacket(data, length, ip_port)) { |
247 | printpacket(data, length, ip_port); | 248 | //unhandled packet |
248 | } else { | 249 | printpacket(data, length, ip_port); |
249 | printf("Received handled packet with length: %u\n", length); | 250 | } else { |
250 | } | 251 | printf("Received handled packet with length: %u\n", length); |
251 | } | 252 | } |
252 | */ | 253 | } |
254 | |||
255 | #endif | ||
253 | networking_poll(dht->net, NULL); | 256 | networking_poll(dht->net, NULL); |
254 | 257 | ||
255 | print_clientlist(dht); | 258 | print_clientlist(dht); |