Commit 3f8f2e3a authored by Antoine Kaufmann's avatar Antoine Kaufmann
Browse files

dist/sockets: calculate message size for entries messages correctly

These were too large until now.
parent a69db6db
...@@ -363,7 +363,7 @@ static int SockMsgRxEntries(struct SockMsg *msg) { ...@@ -363,7 +363,7 @@ static int SockMsgRxEntries(struct SockMsg *msg) {
uint32_t len = entries->num_entries * peer->cleanup_elen; uint32_t len = entries->num_entries * peer->cleanup_elen;
if (len + sizeof(*msg) != msg->msg_len) { if (len + offsetof(struct SockMsg, entries.data) != msg->msg_len) {
fprintf(stderr, "SockMsgRxEntries: invalid message length (m=%u l=%u)\n", fprintf(stderr, "SockMsgRxEntries: invalid message length (m=%u l=%u)\n",
msg->msg_len, len); msg->msg_len, len);
abort(); abort();
...@@ -533,7 +533,7 @@ int NetOpPassEntries(struct Peer *peer, uint32_t pos, uint32_t n) { ...@@ -533,7 +533,7 @@ int NetOpPassEntries(struct Peer *peer, uint32_t pos, uint32_t n) {
} }
fprintf(stderr, "\n");*/ fprintf(stderr, "\n");*/
#endif #endif
msg->msg_len = sizeof(*msg) + len; msg->msg_len = offsetof(struct SockMsg, entries.data) + len;
int ret = SockSend(msg); int ret = SockSend(msg);
SockMsgFree(msg); SockMsgFree(msg);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment