From 7d0a56e6a6c9a59283fc0288b75344c34a59ca49 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Sat, 10 Aug 2013 15:46:29 -0400 Subject: [PATCH 1/5] auto-connect to DHT on startup --- chat.c | 2 +- main.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 76 insertions(+), 25 deletions(-) diff --git a/chat.c b/chat.c index 33f51f2..e189723 100644 --- a/chat.c +++ b/chat.c @@ -150,7 +150,7 @@ static void chat_onKey(ToxWindow *self, int key) } /* RETURN key: Execute command or print line */ - if (key == '\n') { + else if (key == '\n') { wclear(ctx->linewin); wmove(self->window, y2-CURS_Y_OFFSET, 0); wclrtobot(self->window); diff --git a/main.c b/main.c index bb5faf8..8805d12 100644 --- a/main.c +++ b/main.c @@ -28,6 +28,8 @@ extern ToxWindow new_friendlist(); extern int friendlist_onFriendAdded(int num); extern void disable_chatwin(int f_num); extern int add_req(uint8_t *public_key); // XXX +extern void cmd_connect(ToxWindow *self, char **args); +extern unsigned char *hex_string_to_bin(char hex_string[]); /* Holds status of chat windows */ char WINDOW_STATUS[MAX_WINDOW_SLOTS]; @@ -138,6 +140,51 @@ static void init_tox() m_callback_action(on_action); } +#define MAXLINE 90 /* Approx max number of chars in a sever line (IP + port + key) */ +#define MAXSERVERS 50 + +/* Connects to a random DHT server listed in the DHTservers file */ +int init_connection(void) +{ + if (DHT_isconnected()) + return 0; + + FILE *fp = fopen("../../../other/DHTservers", "r"); + if (fp == NULL) + return 1; + + char servers[MAXSERVERS][MAXLINE]; + char line[MAXLINE]; + int linecnt = 0; + while (fgets(line, sizeof(line), fp) && linecnt < MAXSERVERS) { + int len = strlen(line); + if (len > 74 && len < MAXLINE) + strcpy(servers[linecnt++], line); + } + if (linecnt < 1) { + fclose(fp); + return 2; + } + fclose(fp); + + int servnum = rand() % linecnt; + char *server = servers[servnum]; + char *ip = strtok(server, " "); + char *port = strtok(NULL, " "); + char *key = strtok(NULL, " "); + + IP_Port dht; + dht.port = htons(atoi(port)); + uint32_t resolved_address = resolve_addr(ip); + if (resolved_address == 0) + return 3; + dht.ip.i = resolved_address; + unsigned char *binary_string = hex_string_to_bin(key); + DHT_bootstrap(dht, binary_string); + free(binary_string); + return 0; +} + void init_window_status() { /* Default window values decrement from -2 */ @@ -203,11 +250,11 @@ static void do_tox() static bool dht_on = false; if (!dht_on && DHT_isconnected()) { dht_on = true; - wprintw(prompt->window, "\nDHT connected!\n"); + wprintw(prompt->window, "\nDHT connected.\n"); } else if (dht_on && !DHT_isconnected()) { dht_on = false; - wprintw(prompt->window, "\nDHT disconnected!\n"); + wprintw(prompt->window, "\nDHT disconnected.\n"); } doMessenger(); } @@ -350,21 +397,22 @@ void set_active_window(int ch) int main(int argc, char *argv[]) { int ch; - int f_flag = 0; - char *user_config_dir = get_user_config_dir(); - char *filename; - int config_err = create_user_config_dir(user_config_dir); - uint8_t loadfromfile = 1; - if(config_err) { - filename = "data"; - } else { - filename = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1); - strcpy(filename, user_config_dir); - strcat(filename, CONFIGDIR); - strcat(filename, "data"); - } - ToxWindow* a; + char *user_config_dir = get_user_config_dir(); + char *DATA_FILE; + int config_err = create_user_config_dir(user_config_dir); + if(config_err) { + DATA_FILE = "data"; + } else { + DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1); + strcpy(DATA_FILE, user_config_dir); + strcat(DATA_FILE, CONFIGDIR); + strcat(DATA_FILE, "data"); + } + + /* This is broken */ + int f_loadfromfile = 1; + int f_flag = 0; int i = 0; for (i = 0; i < argc; ++i) { if (argv[i] == NULL) @@ -372,37 +420,40 @@ int main(int argc, char *argv[]) else if (argv[i][0] == '-') { if (argv[i][1] == 'f') { if (argv[i + 1] != NULL) - filename = argv[i + 1]; + DATA_FILE = argv[i + 1]; else f_flag = -1; } else if (argv[i][1] == 'n') { - loadfromfile = 0; + f_loadfromfile = 0; } } } + if(f_loadfromfile) + load_data(DATA_FILE); + free(DATA_FILE); init_term(); init_tox(); - if(loadfromfile) - load_data(filename); - free(filename); init_windows(); init_window_status(); + int connected = init_connection(); + if (connected != 0) + wprintw(prompt->window, "Auto-connect failed (error code %d)\n", connected); + if (f_flag == -1) { attron(COLOR_PAIR(3) | A_BOLD); - wprintw(prompt->window, "You passed '-f' without giving an argument!\n" + wprintw(prompt->window, "You passed '-f' without giving an argument.\n" "defaulting to 'data' for a keyfile...\n"); attroff(COLOR_PAIR(3) | A_BOLD); } if(config_err) { attron(COLOR_PAIR(3) | A_BOLD); - wprintw(prompt->window, "Unable to determine configuration directory!\n" + wprintw(prompt->window, "Unable to determine configuration directory.\n" "defaulting to 'data' for a keyfile...\n"); attroff(COLOR_PAIR(3) | A_BOLD); } - while(true) { /* Update tox */ do_tox(); From d99e8c9926be3f333c1f94d2954ab5e084d51837 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Sat, 10 Aug 2013 15:50:49 -0400 Subject: [PATCH 2/5] don't need that --- main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/main.c b/main.c index 8805d12..865c911 100644 --- a/main.c +++ b/main.c @@ -28,7 +28,6 @@ extern ToxWindow new_friendlist(); extern int friendlist_onFriendAdded(int num); extern void disable_chatwin(int f_num); extern int add_req(uint8_t *public_key); // XXX -extern void cmd_connect(ToxWindow *self, char **args); extern unsigned char *hex_string_to_bin(char hex_string[]); /* Holds status of chat windows */ From 35f7ba210d7f61638c0a9b2856d5f15ff31db2fd Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Sat, 10 Aug 2013 16:28:40 -0400 Subject: [PATCH 3/5] fix memory leak --- configdir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configdir.c b/configdir.c index d91d080..6cbb06b 100644 --- a/configdir.c +++ b/configdir.c @@ -129,8 +129,8 @@ int create_user_config_dir(char *path) free(fullpath); return -1; } - + #endif - + free(fullpath); return 0; } From 31a9a344d2a811532ea808c03c037032fc038fa2 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Sat, 10 Aug 2013 18:00:54 -0400 Subject: [PATCH 4/5] was making the ID change on every startup --- main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 865c911..3db963b 100644 --- a/main.c +++ b/main.c @@ -427,14 +427,15 @@ int main(int argc, char *argv[]) } } } - if(f_loadfromfile) - load_data(DATA_FILE); - free(DATA_FILE); init_term(); init_tox(); init_windows(); init_window_status(); + + if(f_loadfromfile) + load_data(DATA_FILE); + free(DATA_FILE); int connected = init_connection(); if (connected != 0) From 663f4eb4ff773d99c289fd24970da80c35773b0d Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Sun, 11 Aug 2013 00:55:09 -0400 Subject: [PATCH 5/5] potential seg fault --- main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/main.c b/main.c index 3db963b..d7d375a 100644 --- a/main.c +++ b/main.c @@ -140,6 +140,7 @@ static void init_tox() } #define MAXLINE 90 /* Approx max number of chars in a sever line (IP + port + key) */ +#define MINLINE 70 #define MAXSERVERS 50 /* Connects to a random DHT server listed in the DHTservers file */ @@ -149,7 +150,7 @@ int init_connection(void) return 0; FILE *fp = fopen("../../../other/DHTservers", "r"); - if (fp == NULL) + if (!fp) return 1; char servers[MAXSERVERS][MAXLINE]; @@ -157,7 +158,7 @@ int init_connection(void) int linecnt = 0; while (fgets(line, sizeof(line), fp) && linecnt < MAXSERVERS) { int len = strlen(line); - if (len > 74 && len < MAXLINE) + if (len > MINLINE && len < MAXLINE) strcpy(servers[linecnt++], line); } if (linecnt < 1) { @@ -166,17 +167,18 @@ int init_connection(void) } fclose(fp); - int servnum = rand() % linecnt; - char *server = servers[servnum]; + char *server = servers[rand() % linecnt]; char *ip = strtok(server, " "); char *port = strtok(NULL, " "); char *key = strtok(NULL, " "); + if (!ip || !port || !key) + return 3; IP_Port dht; dht.port = htons(atoi(port)); uint32_t resolved_address = resolve_addr(ip); if (resolved_address == 0) - return 3; + return 4; dht.ip.i = resolved_address; unsigned char *binary_string = hex_string_to_bin(key); DHT_bootstrap(dht, binary_string); @@ -432,7 +434,7 @@ int main(int argc, char *argv[]) init_tox(); init_windows(); init_window_status(); - + if(f_loadfromfile) load_data(DATA_FILE); free(DATA_FILE);