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

toxcore/util.h:

Browse Source 
- moved cmdline_parsefor_ipv46() to testing/misc_tools.c
This commit is contained in:
Coren[m] 2013-09-11 15:19:39 +02:00
parent a326e851ba
commit d35fee43ba
8 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
other/DHT_bootstrap.c
View File

@ -33,7 +33,6 @@
#include "../toxcore/DHT.h"
#include "../toxcore/friend_requests.h"
#include "../testing/misc_tools.c"
#include "../toxcore/util.h"
/* Sleep function (x = milliseconds) */
#ifdef WIN32

1
testing/DHT_test.c
View File

@ -34,7 +34,6 @@
//#include "../core/network.h"
#include "../toxcore/DHT.h"
#include "../toxcore/friend_requests.h"
#include "../toxcore/util.h"
#include "misc_tools.c"
#include <string.h>

2
testing/Lossless_UDP_testclient.c
View File

@ -34,7 +34,7 @@
#include "../toxcore/network.h"
#include "../toxcore/Lossless_UDP.h"
#include "../toxcore/util.h"
#include "misc_tools.c"
#ifdef WIN32

2
testing/Lossless_UDP_testserver.c
View File

@ -34,7 +34,7 @@
#include "../toxcore/network.h"
#include "../toxcore/Lossless_UDP.h"
#include "../toxcore/util.h"
#include "misc_tools.c"
//Sleep function (x = milliseconds)
#ifdef WIN32

1
testing/Messenger_test.c
View File

@ -43,7 +43,6 @@
#include "../toxcore/Messenger.h"
#include "misc_tools.c"
#include "../toxcore/util.h"
#ifdef WIN32

33
testing/misc_tools.c
View File

@ -46,3 +46,36 @@ unsigned char *hex_string_to_bin(char hex_string[])
return val;
}
int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
{
int argvoffset = 0, argi;
for(argi = 1; argi < argc; argi++)
if (!strncasecmp(argv[argi], "--ipv", 5)) {
if (argv[argi][5] && !argv[argi][6]) {
char c = argv[argi][5];
if (c == '4')
*ipv6enabled = 0;
else if (c == '6')
*ipv6enabled = 1;
else {
printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]);
return -1;
}
}
else {
printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]);
return -1;
}
if (argvoffset != argi - 1) {
printf("Argument must come first: %s.\n", argv[argi]);
return -1;
}
argvoffset++;
}
return argvoffset;
};

32
toxcore/util.c
View File

@ -43,38 +43,6 @@ void id_cpy(uint8_t *dest, uint8_t *src)
memcpy(dest, src, CLIENT_ID_SIZE);
}
int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
{
int argvoffset = 0, argi;
for(argi = 1; argi < argc; argi++)
if (!strncasecmp(argv[argi], "--ipv", 5)) {
if (argv[argi][5] && !argv[argi][6]) {
char c = argv[argi][5];
if (c == '4')
*ipv6enabled = 0;
else if (c == '6')
*ipv6enabled = 1;
else {
printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]);
return -1;
}
}
else {
printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]);
return -1;
}
if (argvoffset != argi - 1) {
printf("Argument must come first: %s.\n", argv[argi]);
return -1;
}
argvoffset++;
}
return argvoffset;
};
#ifdef LOGGING
char logbuffer[512];
static FILE *logfile = NULL;

2
toxcore/util.h
View File

@ -16,8 +16,6 @@ uint64_t random_64b();
bool id_eq(uint8_t *dest, uint8_t *src);
void id_cpy(uint8_t *dest, uint8_t *src);
int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled);
#undef LOGGING
/* #define LOGGING */
#ifdef LOGGING