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

Merge pull request #219 from JFreegman/master

Browse Source 
Partially fixed friend add bug
This commit is contained in:
irungentoo 2013-07-31 15:06:40 -07:00
commit b81dc5508c
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
testing/nTox.c
View File

@ -97,17 +97,34 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
{
if (line[0] == '/') {
char inpt_command = line[1];
char prompt[STRING_LENGTH + 2] = "> ";
char prompt[STRING_LENGTH+2] = "> ";
int prompt_offset = 3;
strcat(prompt, line);
new_lines(prompt);
if (inpt_command == 'f') { // add friend command: /f ID
int i;
char temp_id[128];
for (i = 0; i < 128; i++)
temp_id[i] = line[i+3];
temp_id[i] = line[i+prompt_offset];
int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
char numstring[100];
sprintf(numstring, "[i] added friend %d", num);
switch (num) {
case -1:
sprintf(numstring, "[i] Incorrect key length");
break;
case -2:
sprintf(numstring, "[i] That appears to be your own key");
break;
case -3:
sprintf(numstring, "[i] Friend request already sent");
break;
case -4:
sprintf(numstring, "[i] Could not add friend");
break;
default:
sprintf(numstring, "[i] Added friend %d", num);
break;
}
new_lines(numstring);
do_refresh();
}

24
testing/nTox_win32.c
View File

@ -126,8 +126,28 @@ void line_eval(char* line)
temp_id[i] = line[i+3];
int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
char numstring[100];
sprintf(numstring, "\n[i] added friend %d\n\n", num);
printf(numstring);
switch (num) {
case -1:
sprintf(numstring, "[i] Incorrect key length");
printf(numstring);
break;
case -2:
sprintf(numstring, "[i] That appears to be your own key");
printf(numstring);
break;
case -3:
sprintf(numstring, "[i] Friend request already sent");
printf(numstring);
break;
case -4:
sprintf(numstring, "[i] Could not add friend");
printf(numstring);
break;
default:
sprintf(numstring, "\n[i] added friend %d\n\n", num);
printf(numstring);
break;
}
}
else if (inpt_command == 'r') {