Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix edge cases in firmware send and receive related functions #17

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix edge cases in firmware send and receive related functions #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7901fb
fix transmit.c compile error on newer gcc (memset() lacking element s…
Jul 1, 2019
a585ea2
handle_firmware() fix: send word instead of byte size to callback eve…
Jul 1, 2019
4c8e16d
fix firmware send and receive edge case when firmware size is exactly…
Jul 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion artnet/receive.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ int handle_firmware(node n, artnet_packet p) {
n->callbacks.firmware_c.fh(n,
n->firmware.ubea,
n->firmware.data,
n->firmware.bytes_total,
n->firmware.bytes_total / sizeof(p->data.firmware.data[0]),
n->callbacks.firmware_c.data);

} else {
Expand Down Expand Up @@ -639,6 +639,11 @@ int handle_firmware(node n, artnet_packet p) {

// length should be the remaining data
block_length = n->firmware.bytes_total % (ARTNET_FIRMWARE_SIZE * sizeof(uint16_t));
if (block_length == 0) {
// remaining firmware size matches exactly maximum data size
block_length = ARTNET_FIRMWARE_SIZE * sizeof(uint16_t);
total_blocks--;
}
block_id = p->data.firmware.blockId;

// ok the blockid field is only 1 byte, so it wraps back to 0x00 we
Expand Down
13 changes: 7 additions & 6 deletions artnet/transmit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ int artnet_tx_tod_data(node n, int id) {
bloc = 0;

while (remaining > 0) {
memset(&tod.data.toddata.tod,0x00, ARTNET_MAX_UID_COUNT);
memset(&tod.data.toddata.tod, 0x00, ARTNET_MAX_UID_COUNT * sizeof(tod.data.toddata.tod[0]));
lim = min(ARTNET_MAX_UID_COUNT, remaining);
tod.data.toddata.blockCount = bloc++;
tod.data.toddata.uidCount = lim;
Expand Down Expand Up @@ -272,7 +272,7 @@ int artnet_tx_firmware_reply(node n, in_addr_t ip,
int artnet_tx_firmware_packet(node n, firmware_transfer_t *firm) {
artnet_packet_t p;
uint8_t type = 0;
int data_len, max_len, ret;
int data_len, max_len, remaining, ret;

memset(&p, 0x0, sizeof(p));

Expand All @@ -282,17 +282,18 @@ int artnet_tx_firmware_packet(node n, firmware_transfer_t *firm) {
// calculate length
data_len = firm->bytes_total - firm->bytes_current;
data_len = min(data_len, max_len);
remaining = firm->bytes_total - firm->bytes_current - data_len;

// work out type - 6 cases
if(firm->ubea) {
// ubea upload
if (firm->bytes_current == 0) {
// first
type = ARTNET_FIRMWARE_UBEAFIRST;
} else if (data_len == max_len) {
} else if ((data_len == max_len) && (remaining > 0)) {
// cont
type = ARTNET_FIRMWARE_UBEACONT;
} else if (data_len < max_len) {
} else if ((data_len < max_len) || ((data_len == max_len) && (remaining == 0))) {
// last
type = ARTNET_FIRMWARE_UBEALAST;
} else {
Expand All @@ -304,10 +305,10 @@ int artnet_tx_firmware_packet(node n, firmware_transfer_t *firm) {
if (firm->bytes_current == 0) {
// first
type = ARTNET_FIRMWARE_FIRMFIRST;
} else if (data_len == max_len) {
} else if ((data_len == max_len) && (remaining > 0)) {
// cont
type = ARTNET_FIRMWARE_FIRMCONT;
} else if (data_len < max_len) {
} else if ((data_len < max_len) || ((data_len == max_len) && (remaining == 0))) {
// last
type = ARTNET_FIRMWARE_FIRMLAST;
} else {
Expand Down