Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-07-03 19:27:45 +02:00
Code Issues Projects Releases Wiki Activity

a few dns fixes

Browse Source
This commit is contained in:
Jfreegman 2014-08-11 01:59:01 -04:00
parent d9a861331f
commit 0f4cffbacc
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/dns.c
View File

@ -43,7 +43,7 @@
#include "configdir.h" #include "configdir.h"
#define DNS3_KEY_SIZE 32 #define DNS3_KEY_SIZE 32
#define MAX_DNS_REQST_SIZE 256 #define MAX_DNS_REQST_SIZE 255
#define NUM_DNS3_BACKUP_SERVERS 2 /* must correspond to number of items in dns3_servers array */ #define NUM_DNS3_BACKUP_SERVERS 2 /* must correspond to number of items in dns3_servers array */
#define TOX_DNS3_TXT_PREFIX "v=tox3;id=" #define TOX_DNS3_TXT_PREFIX "v=tox3;id="
@ -87,8 +87,8 @@ static struct _dns_thread {
#define MAX_DNS_SERVERS 50 #define MAX_DNS_SERVERS 50
#define MAX_DOMAIN_SIZE 128 #define MAX_DOMAIN_SIZE 32
#define MAX_DNS_LINE MAX_DOMAIN_SIZE + DNS3_KEY_SIZE + 2 #define MAX_DNS_LINE MAX_DOMAIN_SIZE + (DNS3_KEY_SIZE * 2) + 3
struct _dns3_servers { struct _dns3_servers {
bool loaded; bool loaded;
@ -108,7 +108,7 @@ static int load_dns_domainlist(void)
char line[MAX_DNS_LINE]; char line[MAX_DNS_LINE];
while (fgets(line, sizeof(line), fp) && dns3_servers.lines < MAX_DNS_SERVERS) { while (fgets(line, sizeof(line), fp) && dns3_servers.lines < MAX_DNS_SERVERS) {
if (strlen(line) < (2 * DNS3_KEY_SIZE) + 4) if (strlen(line) < (DNS3_KEY_SIZE * 2) + 4)
continue; continue;
const char *name = strtok(line, " "); const char *name = strtok(line, " ");
@ -118,7 +118,7 @@ static int load_dns_domainlist(void)
continue; continue;
snprintf(dns3_servers.names[dns3_servers.lines], sizeof(dns3_servers.names[dns3_servers.lines]), "%s", name); snprintf(dns3_servers.names[dns3_servers.lines], sizeof(dns3_servers.names[dns3_servers.lines]), "%s", name);
int res = hex_string_to_bytes(dns3_servers.keys[dns3_servers.lines], DNS3_KEY_SIZE, keystr, strlen(keystr)); int res = hex_string_to_bytes(dns3_servers.keys[dns3_servers.lines], DNS3_KEY_SIZE, keystr);
if (res == -1) if (res == -1)
continue; continue;
@ -211,6 +211,9 @@ static int parse_dns_response(ToxWindow *self, u_char *answer, int ans_len, char
if (!size || txt_len >= size || !txt_len) if (!size || txt_len >= size || !txt_len)
return dns_error(self, "No record found."); return dns_error(self, "No record found.");
if (txt_len > MAX_DNS_REQST_SIZE)
return dns_error(self, "Invalid DNS response.");
ans_pt++; ans_pt++;
ans_pt[txt_len] = '\0'; ans_pt[txt_len] = '\0';
memcpy(buf, ans_pt, txt_len + 1); memcpy(buf, ans_pt, txt_len + 1);
@ -307,7 +310,7 @@ void *dns3_lookup_thread(void *data)
kill_dns_thread(NULL); kill_dns_thread(NULL);
} }
char string[MAX_DNS_REQST_SIZE]; char string[MAX_DNS_REQST_SIZE + 1];
uint32_t request_id; uint32_t request_id;
int str_len = tox_generate_dns3_string(dns_obj, (uint8_t *) string, sizeof(string), &request_id, int str_len = tox_generate_dns3_string(dns_obj, (uint8_t *) string, sizeof(string), &request_id,
@ -321,7 +324,7 @@ void *dns3_lookup_thread(void *data)
string[str_len] = '\0'; string[str_len] = '\0';
u_char answer[PACKETSZ]; u_char answer[PACKETSZ];
char d_string[MAX_DNS_REQST_SIZE]; char d_string[MAX_DOMAIN_SIZE + MAX_DNS_REQST_SIZE + 10];
/* format string and create dns query */ /* format string and create dns query */
snprintf(d_string, sizeof(d_string), "_%s._tox.%s", string, domain); snprintf(d_string, sizeof(d_string), "_%s._tox.%s", string, domain);
@ -332,13 +335,13 @@ void *dns3_lookup_thread(void *data)
kill_dns_thread(dns_obj); kill_dns_thread(dns_obj);
} }
char ans_id[MAX_DNS_REQST_SIZE]; char ans_id[MAX_DNS_REQST_SIZE + 1];
/* extract TXT from DNS response */ /* extract TXT from DNS response */
if (parse_dns_response(self, answer, ans_len, ans_id) == -1) if (parse_dns_response(self, answer, ans_len, ans_id) == -1)
kill_dns_thread(dns_obj); kill_dns_thread(dns_obj);
char encrypted_id[MAX_DNS_REQST_SIZE]; char encrypted_id[MAX_DNS_REQST_SIZE + 1];
int prfx_len = strlen(TOX_DNS3_TXT_PREFIX); int prfx_len = strlen(TOX_DNS3_TXT_PREFIX);
/* extract the encrypted ID from TXT response */ /* extract the encrypted ID from TXT response */

2
src/misc_tools.c
View File

@ -124,7 +124,7 @@ char *hex_string_to_bin(const char *hex_string)
return val; return val;
} }
int hex_string_to_bytes(char *buf, int size, const char *keystr, int strsize) int hex_string_to_bytes(char *buf, int size, const char *keystr)
{ {
if (size % 2 != 0) if (size % 2 != 0)
return -1; return -1;

4
src/misc_tools.h
View File

@ -43,12 +43,12 @@ void host_to_net(uint8_t *num, uint16_t numbytes);
char *hex_string_to_bin(const char *hex_string); char *hex_string_to_bin(const char *hex_string);
/* convert a hex string to bytes. returns 0 on success, -1 on failure */ /* convert a hex string to bytes. returns 0 on success, -1 on failure */
int hex_string_to_bytes(char *buf, int size, const char *keystr, int strsize); int hex_string_to_bytes(char *buf, int size, const char *keystr);
/* get the current unix time */ /* get the current unix time */
uint64_t get_unix_time(void); uint64_t get_unix_time(void);
/*Puts the current time in buf in the format of [HH:mm:ss] */ /* Puts the current time in buf in the format of [HH:mm:ss] */
void get_time_str(char *buf, int bufsize); void get_time_str(char *buf, int bufsize);
/* Converts seconds to string in format HH:mm:ss; truncates hours and minutes when necessary */ /* Converts seconds to string in format HH:mm:ss; truncates hours and minutes when necessary */