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

More refactoring done.

Browse Source
This commit is contained in:
irungentoo 2013-08-20 12:08:55 -04:00
parent 512abe64f4
commit da369f1507
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dhtstatus.c
View File

@ -36,7 +36,7 @@ static void dhtstatus_onKey(ToxWindow *self, Messenger *m, int key)
static void dhtstatus_onDraw(ToxWindow *self) static void dhtstatus_onDraw(ToxWindow *self)
{ {
Client_data *close_clientlist = DHT_get_close_list(); Client_data *close_clientlist = DHT_get_close_list(temp_DHT);
curs_set(0); curs_set(0);
werase(self->window); werase(self->window);

14
main.c
View File

@ -90,11 +90,11 @@ static Messenger *init_tox()
#define MAXSERVERS 50 #define MAXSERVERS 50
/* Connects to a random DHT server listed in the DHTservers file */ /* Connects to a random DHT server listed in the DHTservers file */
int init_connection(void) int init_connection(Messenger *m)
{ {
FILE *fp = NULL; FILE *fp = NULL;
if (DHT_isconnected()) if (DHT_isconnected(m->dht))
return 0; return 0;
fp = fopen(SRVLIST_FILE, "r"); fp = fopen(SRVLIST_FILE, "r");
@ -135,7 +135,7 @@ int init_connection(void)
dht.ip.i = resolved_address; dht.ip.i = resolved_address;
unsigned char *binary_string = hex_string_to_bin(key); unsigned char *binary_string = hex_string_to_bin(key);
DHT_bootstrap(dht, binary_string); DHT_bootstrap(m->dht, dht, binary_string);
free(binary_string); free(binary_string);
return 0; return 0;
} }
@ -146,18 +146,18 @@ static void do_tox(Messenger *m, ToxWindow *prompt)
static int conn_err = 0; static int conn_err = 0;
static bool dht_on = false; static bool dht_on = false;
if (!dht_on && !DHT_isconnected() && !(conn_try++ % 100)) { if (!dht_on && !DHT_isconnected(m->dht) && !(conn_try++ % 100)) {
if (!conn_err) { if (!conn_err) {
conn_err = init_connection(); conn_err = init_connection(m);
wprintw(prompt->window, "\nEstablishing connection...\n"); wprintw(prompt->window, "\nEstablishing connection...\n");
if (conn_err) if (conn_err)
wprintw(prompt->window, "\nAuto-connect failed with error code %d\n", conn_err); wprintw(prompt->window, "\nAuto-connect failed with error code %d\n", conn_err);
} }
} else if (!dht_on && DHT_isconnected()) { } else if (!dht_on && DHT_isconnected(m->dht)) {
dht_on = true; dht_on = true;
wprintw(prompt->window, "\nDHT connected.\n"); wprintw(prompt->window, "\nDHT connected.\n");
} else if (dht_on && !DHT_isconnected()) { } else if (dht_on && !DHT_isconnected(m->dht)) {
dht_on = false; dht_on = false;
wprintw(prompt->window, "\nDHT disconnected. Attempting to reconnect.\n"); wprintw(prompt->window, "\nDHT disconnected. Attempting to reconnect.\n");
} }

2
prompt.c
View File

@ -204,7 +204,7 @@ void cmd_connect(ToxWindow *self, Messenger *m, char **args)
dht.ip.i = resolved_address; dht.ip.i = resolved_address;
unsigned char *binary_string = hex_string_to_bin(key); unsigned char *binary_string = hex_string_to_bin(key);
DHT_bootstrap(dht, binary_string); DHT_bootstrap(m->dht, dht, binary_string);
free(binary_string); free(binary_string);
} }