Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-30 06:03:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38 from FullName/ipv6enabled

Browse Source 
Adapted to ipv6-enabled tox
This commit is contained in:
Sean 2013-09-15 02:46:59 -07:00
commit f5a6c8382e
2 changed files with 5 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/main.c
View File

@ -90,7 +90,7 @@ static void init_term()
static Tox *init_tox() static Tox *init_tox()
{ {
/* Init core */ /* Init core */
Tox *m = tox_new(); Tox *m = tox_new(TOX_ENABLE_IPV6_DEFAULT);
if (m == NULL) if (m == NULL)
return NULL; return NULL;
@ -114,65 +114,6 @@ static Tox *init_tox()
return m; return m;
} }
/*
resolve_addr():
address should represent IPv4 or a hostname with A record
returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
returns 0 on failure
TODO: Fix ipv6 support
*/
uint32_t resolve_addr(const char *address)
{
struct addrinfo *server = NULL;
struct addrinfo hints;
int rc;
uint32_t addr;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET; // IPv4 only right now.
hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses.
#ifdef _WIN32
int res;
WSADATA wsa_data;
res = WSAStartup(MAKEWORD(2, 2), &wsa_data);
if (res != 0)
{
return 0;
}
#endif
rc = getaddrinfo(address, "echo", &hints, &server);
// Lookup failed.
if (rc != 0) {
#ifdef _WIN32
WSACleanup();
#endif
return 0;
}
// IPv4 records only..
if (server->ai_family != AF_INET) {
freeaddrinfo(server);
#ifdef _WIN32
WSACleanup();
#endif
return 0;
}
addr = ((struct sockaddr_in *)server->ai_addr)->sin_addr.s_addr;
freeaddrinfo(server);
#ifdef _WIN32
WSACleanup();
#endif
return addr;
}
#define MAXLINE 90 /* Approx max number of chars in a sever line (IP + port + key) */ #define MAXLINE 90 /* Approx max number of chars in a sever line (IP + port + key) */
#define MINLINE 70 #define MINLINE 70
#define MAXSERVERS 50 #define MAXSERVERS 50
@ -211,16 +152,9 @@ int init_connection(Tox *m)
if (ip == NULL || port == NULL || key == NULL) if (ip == NULL || port == NULL || key == NULL)
return 3; return 3;
tox_IP_Port dht;
dht.port = htons(atoi(port));
uint32_t resolved_address = resolve_addr(ip);
if (resolved_address == 0)
return 0;
dht.ip.i = resolved_address;
uint8_t *binary_string = hex_string_to_bin(key); uint8_t *binary_string = hex_string_to_bin(key);
tox_bootstrap(m, dht, binary_string); tox_bootstrap_from_address(m, ip, TOX_ENABLE_IPV6_DEFAULT,
htons(atoi(port)), binary_string);
free(binary_string); free(binary_string);
return 0; return 0;
} }

11
src/prompt.c
View File

@ -285,16 +285,9 @@ void cmd_connect(ToxWindow *self, Tox *m, int argc, char **argv)
return; return;
} }
dht.port = htons(atoi(port));
uint32_t resolved_address = resolve_addr(ip);
if (resolved_address == 0) {
return;
}
dht.ip.i = resolved_address;
uint8_t *binary_string = hex_string_to_bin(key); uint8_t *binary_string = hex_string_to_bin(key);
tox_bootstrap(m, dht, binary_string); tox_bootstrap_from_address(m, ip, TOX_ENABLE_IPV6_DEFAULT,
htons(atoi(port)), binary_string);
free(binary_string); free(binary_string);
} }