pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29498 )

Change subject: osmux: Change order of lines to follow packet fill order ......................................................................

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(-)

git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/98/29498/1

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)