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

Merge branch 'master' into new_groupchats

Browse Source
This commit is contained in:
Jfreegman 2015-04-13 00:55:05 -04:00
commit 6cd7fb9e5b
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/toxic.c
View File

@ -591,7 +591,7 @@ static void init_tox_options(struct Tox_Options *tox_opts)
/* Returns a new Tox object on success. /* Returns a new Tox object on success.
* If object fails to initialize the toxic process will terminate. * If object fails to initialize the toxic process will terminate.
*/ */
static Tox *load_tox(char *data_path, struct Tox_Options *tox_opts) static Tox *load_tox(char *data_path, struct Tox_Options *tox_opts, TOX_ERR_NEW *new_err)
{ {
Tox *m = NULL; Tox *m = NULL;
@ -615,8 +615,10 @@ static Tox *load_tox(char *data_path, struct Tox_Options *tox_opts)
bool is_encrypted = tox_is_data_encrypted((uint8_t *) data); bool is_encrypted = tox_is_data_encrypted((uint8_t *) data);
/* attempt to encrypt an already encrypted data file */ /* attempt to encrypt an already encrypted data file */
if (arg_opts.encrypt_data && is_encrypted) if (arg_opts.encrypt_data && is_encrypted) {
fclose(fp);
exit_toxic_err("failed in load_toxic", FATALERR_ENCRYPT); exit_toxic_err("failed in load_toxic", FATALERR_ENCRYPT);
}
if (arg_opts.unencrypt_data && is_encrypted) if (arg_opts.unencrypt_data && is_encrypted)
queue_init_message("Data file '%s' has been unencrypted", data_path); queue_init_message("Data file '%s' has been unencrypted", data_path);
@ -638,8 +640,10 @@ static Tox *load_tox(char *data_path, struct Tox_Options *tox_opts)
pwlen = password_prompt(user_password.pass, sizeof(user_password.pass)); pwlen = password_prompt(user_password.pass, sizeof(user_password.pass));
user_password.len = pwlen; user_password.len = pwlen;
if (strcasecmp(user_password.pass, "q") == 0) if (strcasecmp(user_password.pass, "q") == 0) {
fclose(fp);
exit(0); exit(0);
}
if (pwlen < MIN_PASSWORD_LEN) { if (pwlen < MIN_PASSWORD_LEN) {
system("clear"); system("clear");
@ -653,11 +657,12 @@ static Tox *load_tox(char *data_path, struct Tox_Options *tox_opts)
(uint8_t *) plain, &pwerr); (uint8_t *) plain, &pwerr);
if (pwerr == TOX_ERR_DECRYPTION_OK) { if (pwerr == TOX_ERR_DECRYPTION_OK) {
TOX_ERR_NEW err; m = tox_new(tox_opts, (uint8_t *) plain, plain_len, new_err);
m = tox_new(tox_opts, (uint8_t *) plain, plain_len, &err);
if (err != TOX_ERR_NEW_OK) if (*new_err != TOX_ERR_NEW_OK) {
exit_toxic_err("tox_new() failed", err); fclose(fp);
return NULL;
}
break; break;
} else if (pwerr == TOX_ERR_DECRYPTION_FAILED) { } else if (pwerr == TOX_ERR_DECRYPTION_FAILED) {
@ -665,15 +670,17 @@ static Tox *load_tox(char *data_path, struct Tox_Options *tox_opts)
sleep(1); sleep(1);
printf("Invalid password. Try again. "); printf("Invalid password. Try again. ");
} else { } else {
fclose(fp);
exit_toxic_err("tox_pass_decrypt() failed", pwerr); exit_toxic_err("tox_pass_decrypt() failed", pwerr);
} }
} }
} else { /* data is not encrypted */ } else { /* data is not encrypted */
TOX_ERR_NEW err; m = tox_new(tox_opts, (uint8_t *) data, len, new_err);
m = tox_new(tox_opts, (uint8_t *) data, len, &err);
if (err != TOX_ERR_NEW_OK) if (*new_err != TOX_ERR_NEW_OK) {
exit_toxic_err("tox_new() failed", err); fclose(fp);
return NULL;
}
} }
fclose(fp); fclose(fp);
@ -681,11 +688,10 @@ static Tox *load_tox(char *data_path, struct Tox_Options *tox_opts)
if (file_exists(data_path)) if (file_exists(data_path))
exit_toxic_err("failed in load_toxic", FATALERR_FILEOP); exit_toxic_err("failed in load_toxic", FATALERR_FILEOP);
TOX_ERR_NEW err; m = tox_new(tox_opts, NULL, 0, new_err);
m = tox_new(tox_opts, NULL, 0, &err);
if (err != TOX_ERR_NEW_OK) if (*new_err != TOX_ERR_NEW_OK)
exit_toxic_err("tox_new() failed", err); return NULL;
if (store_data(m, data_path) == -1) if (store_data(m, data_path) == -1)
exit_toxic_err("failed in load_toxic", FATALERR_FILEOP); exit_toxic_err("failed in load_toxic", FATALERR_FILEOP);
@ -699,10 +705,16 @@ static Tox *load_toxic(char *data_path)
struct Tox_Options tox_opts; struct Tox_Options tox_opts;
init_tox_options(&tox_opts); init_tox_options(&tox_opts);
Tox *m = load_tox(data_path, &tox_opts); TOX_ERR_NEW new_err;
Tox *m = load_tox(data_path, &tox_opts, &new_err);
if (m == NULL) if (new_err != TOX_ERR_NEW_OK && tox_opts.ipv6_enabled) {
exit_toxic_err("load_tox() failed", FATALERR_TOX_INIT); queue_init_message("Falling back to ipv4");
tox_opts.ipv6_enabled = false;
m = load_tox(data_path, &tox_opts, &new_err);
} else if (new_err != TOX_ERR_NEW_OK) {
exit_toxic_err("Tox network failed to initialize (tox_new failed with error %d)", new_err);
}
init_tox_callbacks(m); init_tox_callbacks(m);
load_friendlist(m); load_friendlist(m);