pespin submitted this change.

View Change

Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved
osmux: Change order of lines to follow packet fill order

The osmux header goes before in the packet, so let's move the line
checking is size before the content.

Change-Id: I33feac834700d22ed06472d8971abd0567ce623b
---
M src/osmux.c
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osmux.c b/src/osmux.c
index 51642ab..bd05f76 100644
--- a/src/osmux.c
+++ b/src/osmux.c
@@ -715,9 +715,9 @@
}

/* First check if there is room for this message in the batch */
- bytes += amr_payload_len;
if (circuit->nmsgs == 0)
bytes += sizeof(struct osmux_hdr);
+ bytes += amr_payload_len;

/* No room, sorry. You'll have to retry */
if (bytes > batch->remaining_bytes)

To view, visit change 29498. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I33feac834700d22ed06472d8971abd0567ce623b
Gerrit-Change-Number: 29498
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged