Check return code of rlcmac decode/encode functions
Change-Id: Iabcb768bd714680aa768b35c786dea2015d1e451
diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp
index f911b09..04c06cf 100644
--- a/tests/rlcmac/RLCMACTest.cpp
+++ b/tests/rlcmac/RLCMACTest.cpp
@@ -93,6 +93,8 @@
void testRlcMacDownlink(void *test_ctx)
{
printf("*** %s ***\n", __func__);
+
+ int rc;
struct bitvec *resultVector = bitvec_alloc(23, test_ctx);
bitvec_unhex(resultVector, DUMMY_VEC);
@@ -121,11 +123,11 @@
RlcMacDownlink_t data;
memset(&data, 0, sizeof(data));
cout << "=========Start DECODE===========" << endl;
- decode_gsm_rlcmac_downlink(vector, &data);
- cout << "+++++++++Finish DECODE++++++++++" << endl;
+ rc = decode_gsm_rlcmac_downlink(vector, &data);
+ cout << "+++++++++Finish DECODE ("<< rc <<")++++++++++" << endl;
cout << "=========Start ENCODE=============" << endl;
- encode_gsm_rlcmac_downlink(resultVector, &data);
- cout << "+++++++++Finish ENCODE+++++++++++" << endl;
+ rc = encode_gsm_rlcmac_downlink(resultVector, &data);
+ cout << "+++++++++Finish ENCODE ("<< rc <<")+++++++++++" << endl;
cout << "vector1 = " << osmo_hexdump(vector->data, 23) << endl;
cout << "vector2 = " << osmo_hexdump(resultVector->data, 23) << endl;
if (memcmp(vector->data, resultVector->data, 23) == 0)
@@ -143,6 +145,8 @@
void testRlcMacUplink(void *test_ctx)
{
printf("*** %s ***\n", __func__);
+
+ int rc;
struct bitvec *resultVector = bitvec_alloc(23, test_ctx);
bitvec_unhex(resultVector, DUMMY_VEC);
@@ -167,11 +171,11 @@
RlcMacUplink_t data;
memset(&data, 0, sizeof(data));
cout << "=========Start DECODE===========" << endl;
- decode_gsm_rlcmac_uplink(vector, &data);
- cout << "+++++++++Finish DECODE++++++++++" << endl;
+ rc = decode_gsm_rlcmac_uplink(vector, &data);
+ cout << "+++++++++Finish DECODE ("<< rc << ")++++++++++" << endl;
cout << "=========Start ENCODE=============" << endl;
- encode_gsm_rlcmac_uplink(resultVector, &data);
- cout << "+++++++++Finish ENCODE+++++++++++" << endl;
+ rc = encode_gsm_rlcmac_uplink(resultVector, &data);
+ cout << "+++++++++Finish ENCODE ("<< rc <<")+++++++++++" << endl;
cout << "vector1 = " << osmo_hexdump(vector->data, 23) << endl;
cout << "vector2 = " << osmo_hexdump(resultVector->data, 23) << endl;
if (memcmp(vector->data, resultVector->data, 23) == 0)
@@ -188,9 +192,11 @@
void testCsnLeftAlignedVarBmpBounds(void *test_ctx)
{
printf("*** %s ***\n", __func__);
+
struct msgb *m = msgb_alloc(80, "test");
static uint8_t exp[] = { 0x7f, 0xff, 0xff, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
bitvec *vector = bitvec_alloc(23, test_ctx);
+ int rc;
bitvec_unhex(vector, "40200bffd161003e0e519ffffffb800000000000000000");
RlcMacUplink_t data;
@@ -198,7 +204,8 @@
EGPRS_AckNack_Desc_t *urbb =
&data.u.Egprs_Packet_Downlink_Ack_Nack.EGPRS_AckNack.Desc;
- decode_gsm_rlcmac_uplink(vector, &data);
+ rc = decode_gsm_rlcmac_uplink(vector, &data);
+ OSMO_ASSERT(rc == 0);
memcpy(msgb_put(m, 13), urbb->URBB, 13);
if (!msgb_eq_data_print(m, exp, 13))
diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok
index 5793d57..24ea4b7 100644
--- a/tests/rlcmac/RLCMACTest.ok
+++ b/tests/rlcmac/RLCMACTest.ok
@@ -2,81 +2,81 @@
DOWNLINK
vector1 = 4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 4e 08 25 00 e3 f1 a8 1d 08 08 20 80 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector2 = 4e 08 25 00 e3 f1 a8 1d 08 08 20 80 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 48282407a6a07422720100032b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 48 28 24 07 a6 a0 74 22 72 01 00 03 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector2 = 48 28 24 07 a6 a0 74 22 72 01 00 03 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 47240c00400000000000000079eb2ac9402b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 47 24 0c 00 40 00 00 00 00 00 00 00 79 eb 2a c9 40 2b 2b 2b 2b 2b 2b
vector2 = 47 24 0c 00 40 00 00 00 00 00 00 00 79 eb 2a c9 40 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 47 28 3c 36 75 13 ba 33 30 04 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector2 = 47 28 3c 36 75 13 ba 33 30 04 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 400820001a3904df0680efb3300b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 40 08 20 00 1a 39 04 df 06 80 ef b3 30 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector2 = 40 08 20 00 1a 39 04 df 06 80 ef b3 30 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 40284f0000001009810c826f4406809dcecb2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 40 28 4f 00 00 00 10 09 81 0c 82 6f 44 06 80 9d ce cb 2b 2b 2b 2b 2b
vector2 = 40 28 4f 00 00 00 10 09 81 0c 82 6f 44 06 80 9d ce cb 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 40 24 03 0f 2f 00 00 00 00 87 b0 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector2 = 40 24 03 0f 2f 00 00 00 00 87 b0 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 49 13 e0 08 50 88 40 13 a8 04 8b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector2 = 49 13 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : FALSE
vector1 = 412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 41 24 30 00 7f ff ff ff ff ff ff ff ef d1 9c 7b a1 2b 2b 2b 2b 2b 2b
vector2 = 41 24 30 00 7f ff ff ff ff ff ff ff ef d1 9c 7b a1 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 41 94 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector2 = 41 94 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
@@ -84,41 +84,41 @@
UPLINK
vector1 = 400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 40 0e 1e 61 d1 1d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector2 = 40 0e 1e 61 d1 1d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 400b8020000000000000002480e0032b2b2b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 40 0b 80 20 00 00 00 00 00 00 00 24 80 e0 03 2b 2b 2b 2b 2b 2b 2b 2b
vector2 = 40 0b 80 20 00 00 00 00 00 00 00 24 80 e0 03 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 4016713dc094270ca2ae57ef909006aa0fc0001f80222b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 40 16 71 3d c0 94 27 0c a2 ae 57 ef 90 90 06 aa 0f c0 00 1f 80 22 2b
vector2 = 40 16 71 3d c0 94 27 0c a2 ae 57 ef 90 90 06 aa 0f c0 00 1f 80 22 2b
vector1 == vector2 : TRUE
vector1 = 40200ffc0021ec010b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 40 20 0f fc 00 21 ec 01 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector2 = 40 20 0f fc 00 21 ec 01 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE
vector1 = 400a9020000000000000003010012a0800132b2b2b2b2b
=========Start DECODE===========
-+++++++++Finish DECODE++++++++++
++++++++++Finish DECODE (0)++++++++++
=========Start ENCODE=============
-+++++++++Finish ENCODE+++++++++++
++++++++++Finish ENCODE (0)+++++++++++
vector1 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b
vector2 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b
vector1 == vector2 : TRUE