StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68 from nurupo/master

Browse Source 
Updated nTox
This commit is contained in:
irungentoo 2013-07-20 15:21:08 -07:00
commit 9eb301e51d
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
testing/nTox.c
View File

@ -35,31 +35,6 @@ unsigned char * hex_string_to_bin(char hex_string[])
return val;
}
int resolve_dnsaddr(char *address, char *port)
{
in_addr_t resolved = 0;
resolved = inet_addr(address);
if (resolved != -1)
{
return resolved;
}
struct addrinfo hints;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *server = NULL;
int success = getaddrinfo(address, port, &hints, &server);
if (success != 0) {
printf("failed to resolve %s: %s\n", address, gai_strerror(success));
return -1;
} else {
resolved = ((struct sockaddr_in*)server->ai_addr)->sin_addr.s_addr;
freeaddrinfo(server);
return resolved;
}
}
void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
{
if (line[0] == '/') {
@ -270,7 +245,7 @@ int main(int argc, char *argv[])
strcpy(line, "");
IP_Port bootstrap_ip_port;
bootstrap_ip_port.port = htons(atoi(argv[2]));
int resolved_address = resolve_dnsaddr(argv[1], argv[2]);
int resolved_address = resolve_addr(argv[1]);
if (resolved_address != -1) {
bootstrap_ip_port.ip.i = resolved_address;
} else {

1
testing/nTox.h
View File

@ -13,6 +13,7 @@
#include <sys/types.h>
#include <netdb.h>
#include "../core/Messenger.h"
#include "../core/network.h"
#define STRING_LENGTH 256
#define HISTORY 50