mirror of
https://github.com/irungentoo/toxcore.git
synced 2024-03-22 13:30:51 +08:00
9de295374d
Compilerflag: CLIENT_ONETOONE_IP (to define in DHT.h, default unset i.e. NEW case: two addresses) Every function in DHT{_test}.c working on Client_data has been rewritten to store IPv4 addresses in assoc4, IPv6 addresses in assoc6. Loading/Storing of states defined with other compiler switch is transparently adjusting to the differences. DHT.h, DHT.c: - introduction and handling of the structure changes DHT_test.c, Messenger.c: - logging adapted to new structures util.h: - LOGGING isn't undefined per default anymore
230 lines
6.5 KiB
C
230 lines
6.5 KiB
C
/* DHT test
|
|
* A file with a main that runs our DHT for testing.
|
|
*
|
|
* Compile with: gcc -O2 -Wall -D VANILLA_NACL -o test ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/{cpucycles.o,libnacl.a,randombytes.o} DHT_test.c
|
|
*
|
|
* Command line arguments are the ip, port and public key of a node.
|
|
* EX: ./test 127.0.0.1 33445 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
|
*
|
|
* The test will then ask you for the id (in hex format) of the friend you wish to add
|
|
*
|
|
* Copyright (C) 2013 Tox project All Rights Reserved.
|
|
*
|
|
* This file is part of Tox.
|
|
*
|
|
* Tox is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Tox is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
//#include "../core/network.h"
|
|
#include "../toxcore/DHT.h"
|
|
#include "../toxcore/friend_requests.h"
|
|
#include "misc_tools.c"
|
|
|
|
#include <string.h>
|
|
|
|
//Sleep function (x = milliseconds)
|
|
#ifdef WIN32
|
|
|
|
#define c_sleep(x) Sleep(1*x)
|
|
|
|
#else
|
|
#include <unistd.h>
|
|
#include <arpa/inet.h>
|
|
#define c_sleep(x) usleep(1000*x)
|
|
|
|
#endif
|
|
|
|
#define PORT 33445
|
|
|
|
void print_assoc(IPPTsPng *assoc, uint8_t ours)
|
|
{
|
|
IP_Port *ipp = &assoc->ip_port;
|
|
printf("\nIP: %s Port: %u", ip_ntoa(&ipp->ip), 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), ntohs(ipp->port));
|
|
else
|
|
printf("RET IP: %s Port: %u\n", ip_ntoa(&ipp->ip), ntohs(ipp->port));
|
|
printf("Timestamp: %llu\n", (long long unsigned int) assoc->ret_timestamp);
|
|
}
|
|
|
|
void print_clientlist(DHT *dht)
|
|
{
|
|
uint32_t i, j;
|
|
printf("___________________CLOSE________________________________\n");
|
|
|
|
for (i = 0; i < LCLIENT_LIST; i++) {
|
|
Client_data *client = &dht->close_clientlist[i];
|
|
printf("ClientID: ");
|
|
|
|
for (j = 0; j < CLIENT_ID_SIZE; j++) {
|
|
printf("%02hhX", client->client_id[j]);
|
|
}
|
|
|
|
#ifdef CLIENT_ONETOONE_IP
|
|
print_assoc(&client->assoc, 1);
|
|
#else
|
|
print_assoc(&client->assoc4, 1);
|
|
print_assoc(&client->assoc6, 1);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
void print_friendlist(DHT *dht)
|
|
{
|
|
uint32_t i, j, k;
|
|
IP_Port p_ip;
|
|
printf("_________________FRIENDS__________________________________\n");
|
|
|
|
for (k = 0; k < dht->num_friends; k++) {
|
|
printf("FRIEND %u\n", k);
|
|
printf("ID: ");
|
|
|
|
for (j = 0; j < CLIENT_ID_SIZE; j++) {
|
|
printf("%c", dht->friends_list[k].client_id[j]);
|
|
}
|
|
|
|
int friendok = DHT_getfriendip(dht, dht->friends_list[k].client_id, &p_ip);
|
|
printf("\nIP: %s:%u (%d)", ip_ntoa(&p_ip.ip), ntohs(p_ip.port), friendok);
|
|
|
|
printf("\nCLIENTS IN LIST:\n\n");
|
|
|
|
for (i = 0; i < MAX_FRIEND_CLIENTS; i++) {
|
|
Client_data *client = &dht->friends_list[k].client_list[i];
|
|
printf("ClientID: ");
|
|
|
|
for (j = 0; j < CLIENT_ID_SIZE; j++) {
|
|
if (client->client_id[j] < 16)
|
|
printf("0");
|
|
|
|
printf("%hhX", client->client_id[j]);
|
|
}
|
|
|
|
#ifdef CLIENT_ONETOONE_IP
|
|
print_assoc(&client->assoc, 0);
|
|
#else
|
|
print_assoc(&client->assoc4, 0);
|
|
print_assoc(&client->assoc6, 0);
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
|
|
void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port)
|
|
{
|
|
uint32_t i;
|
|
printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length);
|
|
printf("--------------------BEGIN-----------------------------\n");
|
|
|
|
for (i = 0; i < length; i++) {
|
|
if (data[i] < 16)
|
|
printf("0");
|
|
|
|
printf("%hhX", data[i]);
|
|
}
|
|
|
|
printf("\n--------------------END-----------------------------\n\n\n");
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
if (argc < 4) {
|
|
printf("Usage: %s [--ipv4|--ipv6] ip port public_key\n", argv[0]);
|
|
exit(0);
|
|
}
|
|
|
|
/* let user override default by cmdline */
|
|
uint8_t ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; /* x */
|
|
int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
|
|
|
|
if (argvoffset < 0)
|
|
exit(1);
|
|
|
|
//memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
|
|
/* initialize networking */
|
|
/* bind to ip 0.0.0.0:PORT */
|
|
IP ip;
|
|
ip_init(&ip, ipv6enabled);
|
|
|
|
DHT *dht = new_DHT(new_net_crypto(new_networking(ip, PORT)));
|
|
|
|
new_keys(dht->c);
|
|
printf("OUR ID: ");
|
|
uint32_t i;
|
|
|
|
for (i = 0; i < 32; i++) {
|
|
if (dht->c->self_public_key[i] < 16)
|
|
printf("0");
|
|
|
|
printf("%hhX", dht->c->self_public_key[i]);
|
|
}
|
|
|
|
char temp_id[128];
|
|
printf("\nEnter the client_id of the friend you wish to add (32 bytes HEX format):\n");
|
|
|
|
if (scanf("%s", temp_id) != 1)
|
|
exit(0);
|
|
|
|
DHT_addfriend(dht, hex_string_to_bin(temp_id));
|
|
|
|
perror("Initialization");
|
|
|
|
uint16_t port = 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);
|
|
|
|
if (!res) {
|
|
printf("Failed to convert \"%s\" into an IP address. Exiting...\n", argv[argvoffset + 1]);
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
IP_Port ip_port;
|
|
uint8_t data[MAX_UDP_PACKET_SIZE];
|
|
uint32_t length;
|
|
*/
|
|
|
|
while (1) {
|
|
|
|
do_DHT(dht);
|
|
|
|
/* slvrTODO:
|
|
while(receivepacket(&ip_port, data, &length) != -1) {
|
|
if(DHT_handlepacket(data, length, ip_port) && friendreq_handlepacket(data, length, ip_port)) {
|
|
//unhandled packet
|
|
printpacket(data, length, ip_port);
|
|
} else {
|
|
printf("Received handled packet with length: %u\n", length);
|
|
}
|
|
}
|
|
*/
|
|
networking_poll(dht->c->lossless_udp->net);
|
|
|
|
print_clientlist(dht);
|
|
print_friendlist(dht);
|
|
c_sleep(300);
|
|
}
|
|
|
|
return 0;
|
|
}
|