mirror of
https://github.com/irungentoo/toxcore.git
synced 2024-03-22 13:30:51 +08:00
Merge branch 'master' of https://github.com/tux3/toxcore
This commit is contained in:
commit
95c5962304
|
@ -1979,7 +1979,6 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
Messenger *m = object;
|
Messenger *m = object;
|
||||||
uint64_t temp_time = unix_time();
|
|
||||||
uint8_t packet_id = temp[0];
|
uint8_t packet_id = temp[0];
|
||||||
uint8_t *data = temp + 1;
|
uint8_t *data = temp + 1;
|
||||||
uint32_t data_length = len - 1;
|
uint32_t data_length = len - 1;
|
||||||
|
|
|
@ -1325,7 +1325,6 @@ static int handle_send_peers(Group_Chats *g_c, int groupnumber, const uint8_t *d
|
||||||
if (!g)
|
if (!g)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
unsigned int i;
|
|
||||||
const uint8_t *d = data;
|
const uint8_t *d = data;
|
||||||
|
|
||||||
while ((length - (d - data)) >= sizeof(uint16_t) + crypto_box_PUBLICKEYBYTES * 2 + 1) {
|
while ((length - (d - data)) >= sizeof(uint16_t) + crypto_box_PUBLICKEYBYTES * 2 + 1) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user