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

Remove the packet mutation in toxav's bwcontroller.

Browse Source 
1. This mutation is never observed outside the function.
2. If it were (it's not), it would be undefined behaviour, since the
   packet data goes out of scope a few instructions after the callback
   returns.
This commit is contained in:
iphydf 2016-09-05 16:39:18 +01:00
parent 254feb0acd
commit d5f9344847
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
toxav/bwcontroller.c
View File

@ -177,7 +177,7 @@ void send_update(BWController *bwc)
bwc->cycle.lsu = current_time_monotonic();
}
}
static int on_update (BWController *bwc, struct BWCMessage *msg)
static int on_update (BWController *bwc, const struct BWCMessage *msg)
{
LOGGER_DEBUG(bwc->m->log, "%p Got update from peer", bwc);
@ -189,14 +189,14 @@ static int on_update (BWController *bwc, struct BWCMessage *msg)
bwc->cycle.lru = current_time_monotonic();
msg->recv = ntohl(msg->recv);
msg->lost = ntohl(msg->lost);
uint32_t recv = ntohl(msg->recv);
uint32_t lost = ntohl(msg->lost);
LOGGER_DEBUG(bwc->m->log, "recved: %u lost: %u", msg->recv, msg->lost);
LOGGER_DEBUG(bwc->m->log, "recved: %u lost: %u", recv, lost);
if (msg->lost && bwc->mcb) {
if (lost && bwc->mcb) {
bwc->mcb(bwc, bwc->friend_number,
((float) (msg->lost) / (msg->recv + msg->lost)),
((float) lost / (recv + lost)),
bwc->mcb_data);
}
@ -208,6 +208,5 @@ int bwc_handle_data(Messenger *m, uint32_t friendnumber, const uint8_t *data, ui
return -1;
}
/* NOTE the data is mutable */
return on_update(object, (struct BWCMessage *) (data + 1));
return on_update(object, (const struct BWCMessage *) (data + 1));
}