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

Added friend request accepting to nTox and fixed a bug.

Browse Source 
Fixed a bug in Lossless UDP that prevented 2 clients from sometimes
connecting when they connected at the same time to each other.
This commit is contained in:
irungentoo 2013-07-27 20:04:56 -04:00
parent 1864f2b396
commit b83359cd05
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Lossless_UDP.c
View File

@ -428,7 +428,7 @@ int handle_handshake(uint8_t * packet, uint32_t length, IP_Port source)
memcpy(&temp, packet + 5, 4); memcpy(&temp, packet + 5, 4);
handshake_id2 = ntohl(temp); handshake_id2 = ntohl(temp);
if (handshake_id2 == 0) { if (handshake_id2 == 0 && is_connected(connection) < 3) {
send_handshake(source, handshake_id(source), handshake_id1); send_handshake(source, handshake_id(source), handshake_id1);
return 0; return 0;
} }

33
testing/nTox.c
View File

@ -38,6 +38,10 @@ char line[STRING_LENGTH];
int x,y; int x,y;
int nick_before; int nick_before;
uint8_t pending_requests[256][CLIENT_ID_SIZE];
uint8_t num_requests;
void new_lines(char *line) void new_lines(char *line)
{ {
int i; int i;
@ -114,6 +118,17 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
sprintf(numstring, "[i] changed status to %s", (char*)status); sprintf(numstring, "[i] changed status to %s", (char*)status);
new_lines(numstring); new_lines(numstring);
} }
else if (line[1] == 'a') {
uint8_t numf = atoi(line + 3);
char numchar[100];
sprintf(numchar, "[i] friend request %u accepted", numf);
new_lines(numchar);
int num = m_addfriend_norequest(pending_requests[numf]);
sprintf(numchar, "[i] added friendnumber %d", num);
new_lines(numchar);
do_refresh();
}
else if (line[1] == 'q') { //exit else if (line[1] == 'q') { //exit
endwin(); endwin();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
@ -184,20 +199,18 @@ void do_refresh()
refresh(); refresh();
} }
void print_request(uint8_t *public_key, uint8_t *data, uint16_t length) void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
{ {
new_lines("[i] received friend request"); new_lines("[i] received friend request with message:");
do_refresh(); new_lines((char *)data);
if (memcmp(data , "Install Gentoo", sizeof("Install Gentoo")) == 0)
//if the request contained the message of peace the person is obviously a friend so we add him.
{
new_lines("[i] friend request accepted");
do_refresh();
int num = m_addfriend_norequest(public_key);
char numchar[100]; char numchar[100];
sprintf(numchar, "[i] added friendnumber %d", num); sprintf(numchar, "[i] To accept the request do: /a %u", num_requests);
new_lines(numchar); new_lines(numchar);
} memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
++num_requests;
do_refresh();
} }
void print_message(int friendnumber, uint8_t * string, uint16_t length) void print_message(int friendnumber, uint8_t * string, uint16_t length)