diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/Lossless_UDP.c | 34 | ||||
-rw-r--r-- | core/net_crypto.c | 26 |
2 files changed, 30 insertions, 30 deletions
diff --git a/core/Lossless_UDP.c b/core/Lossless_UDP.c index 55bc1cfb..427d764f 100644 --- a/core/Lossless_UDP.c +++ b/core/Lossless_UDP.c | |||
@@ -103,7 +103,7 @@ static Connection connections[MAX_CONNECTIONS]; | |||
103 | int getconnection_id(IP_Port ip_port) | 103 | int getconnection_id(IP_Port ip_port) |
104 | { | 104 | { |
105 | uint32_t i; | 105 | uint32_t i; |
106 | for(i = 0; i < MAX_CONNECTIONS; i++ ) | 106 | for(i = 0; i < MAX_CONNECTIONS; ++i) |
107 | { | 107 | { |
108 | if(connections[i].ip_port.ip.i == ip_port.ip.i && | 108 | if(connections[i].ip_port.ip.i == ip_port.ip.i && |
109 | connections[i].ip_port.port == ip_port.port && connections[i].status > 0) | 109 | connections[i].ip_port.port == ip_port.port && connections[i].status > 0) |
@@ -124,7 +124,7 @@ static uint32_t randtable[6][256]; | |||
124 | uint32_t handshake_id(IP_Port source) | 124 | uint32_t handshake_id(IP_Port source) |
125 | { | 125 | { |
126 | uint32_t id = 0, i; | 126 | uint32_t id = 0, i; |
127 | for(i = 0; i < 6; i++) | 127 | for(i = 0; i < 6; ++i) |
128 | { | 128 | { |
129 | if(randtable[i][((uint8_t *)&source)[i]] == 0) | 129 | if(randtable[i][((uint8_t *)&source)[i]] == 0) |
130 | { | 130 | { |
@@ -159,7 +159,7 @@ int new_connection(IP_Port ip_port) | |||
159 | return connect; | 159 | return connect; |
160 | } | 160 | } |
161 | uint32_t i; | 161 | uint32_t i; |
162 | for(i = 0; i < MAX_CONNECTIONS; i++) | 162 | for(i = 0; i < MAX_CONNECTIONS; ++i) |
163 | { | 163 | { |
164 | if(connections[i].status == 0) | 164 | if(connections[i].status == 0) |
165 | { | 165 | { |
@@ -195,7 +195,7 @@ int new_inconnection(IP_Port ip_port) | |||
195 | return -1; | 195 | return -1; |
196 | } | 196 | } |
197 | uint32_t i; | 197 | uint32_t i; |
198 | for(i = 0; i < MAX_CONNECTIONS; i++) | 198 | for(i = 0; i < MAX_CONNECTIONS; ++i) |
199 | { | 199 | { |
200 | if(connections[i].status == 0) | 200 | if(connections[i].status == 0) |
201 | { | 201 | { |
@@ -223,7 +223,7 @@ int new_inconnection(IP_Port ip_port) | |||
223 | int incoming_connection() | 223 | int incoming_connection() |
224 | { | 224 | { |
225 | uint32_t i; | 225 | uint32_t i; |
226 | for(i = 0; i < MAX_CONNECTIONS; i++) | 226 | for(i = 0; i < MAX_CONNECTIONS; ++i) |
227 | { | 227 | { |
228 | if(connections[i].inbound == 2) | 228 | if(connections[i].inbound == 2) |
229 | { | 229 | { |
@@ -323,7 +323,7 @@ int read_packet(int connection_id, uint8_t * data) | |||
323 | uint16_t index = connections[connection_id].successful_read % MAX_QUEUE_NUM; | 323 | uint16_t index = connections[connection_id].successful_read % MAX_QUEUE_NUM; |
324 | uint16_t size = connections[connection_id].recvbuffer[index].size; | 324 | uint16_t size = connections[connection_id].recvbuffer[index].size; |
325 | memcpy(data, connections[connection_id].recvbuffer[index].data, size); | 325 | memcpy(data, connections[connection_id].recvbuffer[index].data, size); |
326 | connections[connection_id].successful_read++; | 326 | ++connections[connection_id].successful_read; |
327 | connections[connection_id].recvbuffer[index].size = 0; | 327 | connections[connection_id].recvbuffer[index].size = 0; |
328 | return size; | 328 | return size; |
329 | } | 329 | } |
@@ -372,7 +372,7 @@ uint32_t missing_packets(int connection_id, uint32_t * requested) | |||
372 | { | 372 | { |
373 | temp = htonl(i); | 373 | temp = htonl(i); |
374 | memcpy(requested + number, &temp, 4); | 374 | memcpy(requested + number, &temp, 4); |
375 | number++; | 375 | ++number; |
376 | } | 376 | } |
377 | } | 377 | } |
378 | if(number == 0) | 378 | if(number == 0) |
@@ -556,7 +556,7 @@ int handle_SYNC2(int connection_id, uint8_t counter, uint32_t recv_packetnum, ui | |||
556 | { | 556 | { |
557 | connections[connection_id].status = 3; | 557 | connections[connection_id].status = 3; |
558 | connections[connection_id].recv_counter = counter; | 558 | connections[connection_id].recv_counter = counter; |
559 | connections[connection_id].send_counter++; | 559 | ++connections[connection_id].send_counter; |
560 | send_SYNC(connection_id); | 560 | send_SYNC(connection_id); |
561 | return 0; | 561 | return 0; |
562 | } | 562 | } |
@@ -579,8 +579,8 @@ int handle_SYNC3(int connection_id, uint8_t counter, uint32_t recv_packetnum, ui | |||
579 | connections[connection_id].successful_sent = recv_packetnum; | 579 | connections[connection_id].successful_sent = recv_packetnum; |
580 | connections[connection_id].last_recvSYNC = current_time(); | 580 | connections[connection_id].last_recvSYNC = current_time(); |
581 | connections[connection_id].recv_counter = counter; | 581 | connections[connection_id].recv_counter = counter; |
582 | connections[connection_id].send_counter++; | 582 | ++connections[connection_id].send_counter; |
583 | for(i = 0; i < number; i++) | 583 | for(i = 0; i < number; ++i) |
584 | { | 584 | { |
585 | temp = ntohl(req_packets[i]); | 585 | temp = ntohl(req_packets[i]); |
586 | memcpy(connections[connection_id].req_packets + i, &temp, 4 * number); | 586 | memcpy(connections[connection_id].req_packets + i, &temp, 4 * number); |
@@ -641,7 +641,7 @@ int add_recv(int connection_id, uint32_t data_num, uint8_t * data, uint16_t size | |||
641 | uint32_t i; | 641 | uint32_t i; |
642 | uint32_t maxnum = connections[connection_id].successful_read + BUFFER_PACKET_NUM; | 642 | uint32_t maxnum = connections[connection_id].successful_read + BUFFER_PACKET_NUM; |
643 | uint32_t sent_packet = data_num - connections[connection_id].osent_packetnum; | 643 | uint32_t sent_packet = data_num - connections[connection_id].osent_packetnum; |
644 | for(i = connections[connection_id].recv_packetnum; i != maxnum; i++) | 644 | for(i = connections[connection_id].recv_packetnum; i != maxnum; ++i) |
645 | { | 645 | { |
646 | if(i == data_num) | 646 | if(i == data_num) |
647 | { | 647 | { |
@@ -655,7 +655,7 @@ int add_recv(int connection_id, uint32_t data_num, uint8_t * data, uint16_t size | |||
655 | break; | 655 | break; |
656 | } | 656 | } |
657 | } | 657 | } |
658 | for(i = connections[connection_id].recv_packetnum; i != maxnum; i++) | 658 | for(i = connections[connection_id].recv_packetnum; i != maxnum; ++i) |
659 | { | 659 | { |
660 | if(connections[connection_id].recvbuffer[i % MAX_QUEUE_NUM].size != 0) | 660 | if(connections[connection_id].recvbuffer[i % MAX_QUEUE_NUM].size != 0) |
661 | { | 661 | { |
@@ -729,7 +729,7 @@ void doNew() | |||
729 | { | 729 | { |
730 | uint32_t i; | 730 | uint32_t i; |
731 | uint64_t temp_time = current_time(); | 731 | uint64_t temp_time = current_time(); |
732 | for(i = 0; i < MAX_CONNECTIONS; i++) | 732 | for(i = 0; i < MAX_CONNECTIONS; ++i) |
733 | { | 733 | { |
734 | if(connections[i].status == 1) | 734 | if(connections[i].status == 1) |
735 | { | 735 | { |
@@ -758,7 +758,7 @@ void doSYNC() | |||
758 | { | 758 | { |
759 | uint32_t i; | 759 | uint32_t i; |
760 | uint64_t temp_time = current_time(); | 760 | uint64_t temp_time = current_time(); |
761 | for(i = 0; i < MAX_CONNECTIONS; i++) | 761 | for(i = 0; i < MAX_CONNECTIONS; ++i) |
762 | { | 762 | { |
763 | if(connections[i].status == 2 || connections[i].status == 3) | 763 | if(connections[i].status == 2 || connections[i].status == 3) |
764 | { | 764 | { |
@@ -776,7 +776,7 @@ void doData() | |||
776 | uint32_t i; | 776 | uint32_t i; |
777 | uint64_t j; | 777 | uint64_t j; |
778 | uint64_t temp_time = current_time(); | 778 | uint64_t temp_time = current_time(); |
779 | for(i = 0; i < MAX_CONNECTIONS; i++) | 779 | for(i = 0; i < MAX_CONNECTIONS; ++i) |
780 | { | 780 | { |
781 | if(connections[i].status == 3 && sendqueue(i) != 0) | 781 | if(connections[i].status == 3 && sendqueue(i) != 0) |
782 | { | 782 | { |
@@ -801,7 +801,7 @@ void adjustRates() | |||
801 | { | 801 | { |
802 | uint32_t i; | 802 | uint32_t i; |
803 | uint64_t temp_time = current_time(); | 803 | uint64_t temp_time = current_time(); |
804 | for(i = 0; i < MAX_CONNECTIONS; i++) | 804 | for(i = 0; i < MAX_CONNECTIONS; ++i) |
805 | { | 805 | { |
806 | if(connections[i].status == 3) | 806 | if(connections[i].status == 3) |
807 | { | 807 | { |
@@ -834,4 +834,4 @@ void doLossless_UDP() | |||
834 | adjustRates(); | 834 | adjustRates(); |
835 | 835 | ||
836 | 836 | ||
837 | } \ No newline at end of file | 837 | } |
diff --git a/core/net_crypto.c b/core/net_crypto.c index 62df614e..fe03b5ee 100644 --- a/core/net_crypto.c +++ b/core/net_crypto.c | |||
@@ -128,9 +128,9 @@ int decrypt_data(uint8_t * public_key, uint8_t * secret_key, uint8_t * nonce, | |||
128 | void increment_nonce(uint8_t * nonce) | 128 | void increment_nonce(uint8_t * nonce) |
129 | { | 129 | { |
130 | uint32_t i; | 130 | uint32_t i; |
131 | for(i = 0; i < crypto_box_NONCEBYTES; i++) | 131 | for(i = 0; i < crypto_box_NONCEBYTES; ++i) |
132 | { | 132 | { |
133 | nonce[i]++; | 133 | ++nonce[i]; |
134 | if(nonce[i] != 0) | 134 | if(nonce[i] != 0) |
135 | { | 135 | { |
136 | break; | 136 | break; |
@@ -143,7 +143,7 @@ void increment_nonce(uint8_t * nonce) | |||
143 | void random_nonce(uint8_t * nonce) | 143 | void random_nonce(uint8_t * nonce) |
144 | { | 144 | { |
145 | uint32_t i; | 145 | uint32_t i; |
146 | for(i = 0; i < crypto_box_NONCEBYTES; i++) | 146 | for(i = 0; i < crypto_box_NONCEBYTES; ++i) |
147 | { | 147 | { |
148 | nonce[i] = random_int() % 256; | 148 | nonce[i] = random_int() % 256; |
149 | } | 149 | } |
@@ -228,7 +228,7 @@ int send_friendrequest(uint8_t * public_key, IP_Port ip_port, uint8_t * data, ui | |||
228 | return -1; | 228 | return -1; |
229 | } | 229 | } |
230 | uint32_t i; | 230 | uint32_t i; |
231 | for(i = 0; i < MAX_FRIEND_REQUESTS; i++) | 231 | for(i = 0; i < MAX_FRIEND_REQUESTS; ++i) |
232 | { | 232 | { |
233 | if(outbound_friendrequests[i] == -1) | 233 | if(outbound_friendrequests[i] == -1) |
234 | { | 234 | { |
@@ -365,7 +365,7 @@ int handle_cryptohandshake(uint8_t * public_key, uint8_t * secret_nonce, | |||
365 | int handle_friendrequest(uint8_t * public_key, uint8_t * data) | 365 | int handle_friendrequest(uint8_t * public_key, uint8_t * data) |
366 | { | 366 | { |
367 | uint32_t i; | 367 | uint32_t i; |
368 | for(i = 0; i < MAX_INCOMING; i++) | 368 | for(i = 0; i < MAX_INCOMING; ++i) |
369 | { | 369 | { |
370 | if(incoming_connections[i] != -1) | 370 | if(incoming_connections[i] != -1) |
371 | { | 371 | { |
@@ -403,7 +403,7 @@ int handle_friendrequest(uint8_t * public_key, uint8_t * data) | |||
403 | int getcryptconnection_id(uint8_t * public_key) | 403 | int getcryptconnection_id(uint8_t * public_key) |
404 | { | 404 | { |
405 | uint32_t i; | 405 | uint32_t i; |
406 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; i++) | 406 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; ++i) |
407 | { | 407 | { |
408 | if(crypto_connections[i].status > 0) | 408 | if(crypto_connections[i].status > 0) |
409 | { | 409 | { |
@@ -432,7 +432,7 @@ int crypto_connect(uint8_t * public_key, IP_Port ip_port) | |||
432 | return -1; | 432 | return -1; |
433 | } | 433 | } |
434 | } | 434 | } |
435 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; i++) | 435 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; ++i) |
436 | { | 436 | { |
437 | if(crypto_connections[i].status == 0) | 437 | if(crypto_connections[i].status == 0) |
438 | { | 438 | { |
@@ -469,7 +469,7 @@ int crypto_connect(uint8_t * public_key, IP_Port ip_port) | |||
469 | int crypto_inbound(uint8_t * public_key, uint8_t * secret_nonce, uint8_t * session_key) | 469 | int crypto_inbound(uint8_t * public_key, uint8_t * secret_nonce, uint8_t * session_key) |
470 | { | 470 | { |
471 | uint32_t i; | 471 | uint32_t i; |
472 | for(i = 0; i < MAX_INCOMING; i++) | 472 | for(i = 0; i < MAX_INCOMING; ++i) |
473 | { | 473 | { |
474 | if(incoming_connections[i] != -1) | 474 | if(incoming_connections[i] != -1) |
475 | { | 475 | { |
@@ -530,7 +530,7 @@ int accept_crypto_inbound(int connection_id, uint8_t * public_key, uint8_t * sec | |||
530 | { | 530 | { |
531 | return -1; | 531 | return -1; |
532 | }*/ | 532 | }*/ |
533 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; i++) | 533 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; ++i) |
534 | { | 534 | { |
535 | if(crypto_connections[i].status == 0) | 535 | if(crypto_connections[i].status == 0) |
536 | { | 536 | { |
@@ -603,7 +603,7 @@ void load_keys(uint8_t * keys) | |||
603 | int new_incoming(int id) | 603 | int new_incoming(int id) |
604 | { | 604 | { |
605 | uint32_t i; | 605 | uint32_t i; |
606 | for(i = 0; i < MAX_INCOMING; i++) | 606 | for(i = 0; i < MAX_INCOMING; ++i) |
607 | { | 607 | { |
608 | if(incoming_connections[i] == -1) | 608 | if(incoming_connections[i] == -1) |
609 | { | 609 | { |
@@ -633,7 +633,7 @@ static void handle_incomings() | |||
633 | static void receive_crypto() | 633 | static void receive_crypto() |
634 | { | 634 | { |
635 | uint32_t i; | 635 | uint32_t i; |
636 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; i++) | 636 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; ++i) |
637 | { | 637 | { |
638 | if(crypto_connections[i].status == 1) | 638 | if(crypto_connections[i].status == 1) |
639 | { | 639 | { |
@@ -717,7 +717,7 @@ void initNetCrypto() | |||
717 | memset(outbound_friendrequests, -1 ,sizeof(outbound_friendrequests)); | 717 | memset(outbound_friendrequests, -1 ,sizeof(outbound_friendrequests)); |
718 | memset(incoming_connections, -1 ,sizeof(incoming_connections)); | 718 | memset(incoming_connections, -1 ,sizeof(incoming_connections)); |
719 | uint32_t i; | 719 | uint32_t i; |
720 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; i++) | 720 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; ++i) |
721 | { | 721 | { |
722 | crypto_connections[i].number = ~0; | 722 | crypto_connections[i].number = ~0; |
723 | } | 723 | } |
@@ -726,7 +726,7 @@ void initNetCrypto() | |||
726 | static void killTimedout() | 726 | static void killTimedout() |
727 | { | 727 | { |
728 | uint32_t i; | 728 | uint32_t i; |
729 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; i++) | 729 | for(i = 0; i < MAX_CRYPTO_CONNECTIONS; ++i) |
730 | { | 730 | { |
731 | if(crypto_connections[i].status != 0 && is_connected(crypto_connections[i].number) == 4) | 731 | if(crypto_connections[i].status != 0 && is_connected(crypto_connections[i].number) == 4) |
732 | { | 732 | { |