<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10079">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests: codec: ecu_fr: Add buffer with unequal XMAXC values<br><br>This buffer verifies that all XMAXC fields must be zero before the<br>entire buffer is considered as silent by osmo_ecu_fr_conceal().<br><br>Change-Id: I14a192d001b5e167437cedbe76a1a3dd84dde35c<br>---<br>M tests/codec/codec_ecu_fr_test.c<br>M tests/codec/codec_ecu_fr_test.ok<br>2 files changed, 49 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/codec/codec_ecu_fr_test.c b/tests/codec/codec_ecu_fr_test.c</span><br><span>index 3a99fc7..3561c44 100644</span><br><span>--- a/tests/codec/codec_ecu_fr_test.c</span><br><span>+++ b/tests/codec/codec_ecu_fr_test.c</span><br><span>@@ -73,8 +73,11 @@</span><br><span> };</span><br><span> </span><br><span> /* Example of a good frame */</span><br><span style="color: hsl(0, 100%, 40%);">-static const char *sample_frame_hex = \</span><br><span style="color: hsl(0, 100%, 40%);">- "d9ec9be212901f802335598c501f805bad3d4ba01f809b69df5a501f809cd1b4da";</span><br><span style="color: hsl(120, 100%, 40%);">+static const char *sample_frame_hex[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "d9ec9be212901f802335598c501f805bad3d4ba01f809b69df5a501f809cd1b4da",</span><br><span style="color: hsl(120, 100%, 40%);">+ "d9ec9be212901d802335598c5013805bad3d4ba01f809b69df5a5019809cd1b4da",</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> </span><br><span> #define GSM610_XMAXC_LEN 6</span><br><span> static void parse_xmaxc_frame(uint8_t *frame, uint64_t xmaxc_res[4])</span><br><span>@@ -108,26 +111,32 @@</span><br><span> uint8_t frame[GSM_FR_BYTES];</span><br><span> uint64_t xmaxc[4];</span><br><span> int i, rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int j = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Parse frame from string to hex */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexparse(sample_frame_hex, frame, GSM_FR_BYTES);</span><br><span style="color: hsl(0, 100%, 40%);">- parse_xmaxc_frame(frame, xmaxc);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Start with: %s, XMAXC: [%"PRIx64", %"PRIx64", %"PRIx64", %"PRIx64"]\n",</span><br><span style="color: hsl(0, 100%, 40%);">- sample_frame_hex, xmaxc[0], xmaxc[1], xmaxc[2], xmaxc[3]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Reset the ECU with the proposed known good frame */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ecu_fr_reset(&state, frame);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Now pretend that we do not receive any good frames anymore */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < 20; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_ecu_fr_conceal(&state, frame);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ while (sample_frame_hex[j] != NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Parse frame from string to hex */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexparse(sample_frame_hex[j], frame, GSM_FR_BYTES);</span><br><span> parse_xmaxc_frame(frame, xmaxc);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Start with: %s, XMAXC: [%"PRIx64", %"PRIx64", %"PRIx64", %"PRIx64"]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sample_frame_hex[j], xmaxc[0], xmaxc[1], xmaxc[2], xmaxc[3]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("conceal: %02i, result: %s XMAXC: [%"PRIx64", %"PRIx64", %"PRIx64", %"PRIx64"]\n",</span><br><span style="color: hsl(0, 100%, 40%);">- i, osmo_hexdump_nospc(frame, GSM_FR_BYTES),</span><br><span style="color: hsl(0, 100%, 40%);">- xmaxc[0], xmaxc[1], xmaxc[2], xmaxc[3]);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Reset the ECU with the proposed known good frame */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ecu_fr_reset(&state, frame);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Now pretend that we do not receive any good frames anymore */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 20; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_ecu_fr_conceal(&state, frame);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ parse_xmaxc_frame(frame, xmaxc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("conceal: %02i, result: %s XMAXC: [%"PRIx64", %"PRIx64", %"PRIx64", %"PRIx64"]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ i, osmo_hexdump_nospc(frame, GSM_FR_BYTES),</span><br><span style="color: hsl(120, 100%, 40%);">+ xmaxc[0], xmaxc[1], xmaxc[2], xmaxc[3]);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Go to the next frame */</span><br><span style="color: hsl(120, 100%, 40%);">+ j++;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/codec/codec_ecu_fr_test.ok b/tests/codec/codec_ecu_fr_test.ok</span><br><span>index 52d06a1..3cc35af 100644</span><br><span>--- a/tests/codec/codec_ecu_fr_test.ok</span><br><span>+++ b/tests/codec/codec_ecu_fr_test.ok</span><br><span>@@ -19,6 +19,27 @@</span><br><span> conceal: 17, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: [0, 0, 0, 0]</span><br><span> conceal: 18, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: [0, 0, 0, 0]</span><br><span> conceal: 19, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: [0, 0, 0, 0]</span><br><span style="color: hsl(120, 100%, 40%);">+Start with: d9ec9be212901d802335598c5013805bad3d4ba01f809b69df5a5019809cd1b4da, XMAXC: [3b, 27, 3f, 33]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 00, result: d9ec9be212901d802335598c5013805bad3d4ba01f809b69df5a5019809cd1b4da XMAXC: [3b, 27, 3f, 33]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 01, result: d9ec9be212901b802335598c5011805bad3d4ba01d809b69df5a5017809cd1b4da XMAXC: [37, 23, 3b, 2f]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 02, result: d9ec9be2129019802335598c500f805bad3d4ba01b809b69df5a5015809cd1b4da XMAXC: [33, 1f, 37, 2b]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 03, result: d9ec9be2129017802335598c500d805bad3d4ba019809b69df5a5013809cd1b4da XMAXC: [2f, 1b, 33, 27]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 04, result: d9ec9be2129015802335598c500b805bad3d4ba017809b69df5a5011809cd1b4da XMAXC: [2b, 17, 2f, 23]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 05, result: d9ec9be2129013802335598c5009805bad3d4ba015809b69df5a500f809cd1b4da XMAXC: [27, 13, 2b, 1f]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 06, result: d9ec9be2129011802335598c5007805bad3d4ba013809b69df5a500d809cd1b4da XMAXC: [23, f, 27, 1b]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 07, result: d9ec9be212900f802335598c5005805bad3d4ba011809b69df5a500b809cd1b4da XMAXC: [1f, b, 23, 17]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 08, result: d9ec9be212900d802335598c5003805bad3d4ba00f809b69df5a5009809cd1b4da XMAXC: [1b, 7, 1f, 13]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 09, result: d9ec9be212900b802335598c5001805bad3d4ba00d809b69df5a5007809cd1b4da XMAXC: [17, 3, 1b, f]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 10, result: d9ec9be2129009802335598c5000005bad3d4ba00b809b69df5a5005809cd1b4da XMAXC: [13, 0, 17, b]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 11, result: d9ec9be2129007802335598c5000005bad3d4ba009809b69df5a5003809cd1b4da XMAXC: [f, 0, 13, 7]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 12, result: d9ec9be2129005802335598c5000005bad3d4ba007809b69df5a5001809cd1b4da XMAXC: [b, 0, f, 3]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 13, result: d9ec9be2129003802335598c5000005bad3d4ba005809b69df5a5000009cd1b4da XMAXC: [7, 0, b, 0]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 14, result: d9ec9be2129001802335598c5000005bad3d4ba003809b69df5a5000009cd1b4da XMAXC: [3, 0, 7, 0]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 15, result: d9ec9be2129000002335598c5000005bad3d4ba001809b69df5a5000009cd1b4da XMAXC: [0, 0, 3, 0]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 16, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: [0, 0, 0, 0]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 17, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: [0, 0, 0, 0]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 18, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: [0, 0, 0, 0]</span><br><span style="color: hsl(120, 100%, 40%);">+conceal: 19, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: [0, 0, 0, 0]</span><br><span> Frame No. 000:</span><br><span> * input: d9aa93ae63de00471a91b95b8660471392b4a2daa037628f391c624039258dc723</span><br><span> * output: d9aa93ae63de00471a91b95b8660471392b4a2daa037628f391c624039258dc723</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10079">change 10079</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10079"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I14a192d001b5e167437cedbe76a1a3dd84dde35c </div>
<div style="display:none"> Gerrit-Change-Number: 10079 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>