<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12271">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use msgb helper instead of local #define for debug print<br><br>This change was made using following spatch program:<br>@@<br>expression a, b, c;<br>@@<br>- VERIFY(a, b, c);<br>+ if (!msgb_eq_l3_data_print(a, b, c))<br>+ abort();<br><br>Which was applied as follows:<br>spatch --in-place --sp-file verif.spatch tests/gsm0808/gsm0808_test.c<br><br>Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b<br>---<br>M tests/gsm0808/gsm0808_test.c<br>1 file changed, 62 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/12271/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c</span><br><span>index 63b8720..a31e7d4 100644</span><br><span>--- a/tests/gsm0808/gsm0808_test.c</span><br><span>+++ b/tests/gsm0808/gsm0808_test.c</span><br><span>@@ -116,7 +116,8 @@</span><br><span> msgb_v_put(in_msg, 0x23);</span><br><span> </span><br><span> msg = gsm0808_create_layer3_2(in_msg, &cgi, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> msgb_free(in_msg);</span><br><span> }</span><br><span>@@ -152,7 +153,8 @@</span><br><span> </span><br><span> msg = gsm0808_create_layer3_2(in_msg, &cgi, &sc_list);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> </span><br><span> msgb_free(msg);</span><br><span> msgb_free(in_msg);</span><br><span>@@ -165,7 +167,8 @@</span><br><span> </span><br><span> printf("Testing creating Reset\n");</span><br><span> msg = gsm0808_create_reset();</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -176,7 +179,8 @@</span><br><span> </span><br><span> printf("Testing creating Reset Ack\n");</span><br><span> msg = gsm0808_create_reset_ack();</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -188,7 +192,8 @@</span><br><span> </span><br><span> printf("Testing creating Clear Command\n");</span><br><span> msg = gsm0808_create_clear_command(0x23);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -199,7 +204,8 @@</span><br><span> </span><br><span> printf("Testing creating Clear Complete\n");</span><br><span> msg = gsm0808_create_clear_complete();</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -234,12 +240,14 @@</span><br><span> printf("Testing creating Chipher Mode Command\n");</span><br><span> msg = gsm0808_create_cipher(&ei, NULL);</span><br><span> OSMO_ASSERT(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> msg = gsm0808_create_cipher(&ei, &include_imeisv);</span><br><span> OSMO_ASSERT(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res2, ARRAY_SIZE(res2));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -259,19 +267,22 @@</span><br><span> </span><br><span> /* with l3 data */</span><br><span> msg = gsm0808_create_cipher_complete(l3, 4);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res1, ARRAY_SIZE(res1));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> /* with l3 data but short */</span><br><span> l3->len -= 1;</span><br><span> l3->tail -= 1;</span><br><span> msg = gsm0808_create_cipher_complete(l3, 4);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res2, ARRAY_SIZE(res2));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> /* without l3 data */</span><br><span> msg = gsm0808_create_cipher_complete(NULL, 4);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res2, ARRAY_SIZE(res2));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> </span><br><span>@@ -308,7 +319,8 @@</span><br><span> </span><br><span> printf("Testing creating Cipher Reject\n");</span><br><span> msg = gsm0808_create_cipher_reject(cause);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> </span><br><span> parse_cipher_reject(msg, cause);</span><br><span> </span><br><span>@@ -323,7 +335,8 @@</span><br><span> </span><br><span> printf("Testing creating Cipher Reject (extended)\n");</span><br><span> msg = gsm0808_create_cipher_reject_ext(GSM0808_CAUSE_CLASS_INVAL, cause);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> </span><br><span> parse_cipher_reject(msg, cause);</span><br><span> </span><br><span>@@ -342,12 +355,14 @@</span><br><span> </span><br><span> printf("Testing creating CM U\n");</span><br><span> msg = gsm0808_create_classmark_update(&cm2, 1, &cm3, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> </span><br><span> msgb_free(msg);</span><br><span> </span><br><span> msg = gsm0808_create_classmark_update(&cm2, 1, NULL, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res2o, ARRAY_SIZE(res2o));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res2o, ARRAY_SIZE(res2o)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> </span><br><span> msgb_free(msg);</span><br><span> }</span><br><span>@@ -359,7 +374,8 @@</span><br><span> </span><br><span> printf("Testing creating SAPI Reject\n");</span><br><span> msg = gsm0808_create_sapi_reject(3);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -404,12 +420,14 @@</span><br><span> printf("Testing creating Assignment Request\n");</span><br><span> msg = gsm0808_create_ass(&ct, &cic, NULL, NULL, NULL);</span><br><span> OSMO_ASSERT(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res1, ARRAY_SIZE(res1));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> msg = gsm0808_create_ass(&ct, &cic, &ss, &sc_list, &call_id);</span><br><span> OSMO_ASSERT(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res2, ARRAY_SIZE(res2));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -424,11 +442,13 @@</span><br><span> </span><br><span> printf("Testing creating Assignment Complete\n");</span><br><span> msg = gsm0808_create_assignment_completed(0x23, 0x42, 0x11, 0x22);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res1, ARRAY_SIZE(res1));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> msg = gsm0808_create_assignment_completed(0x23, 0x42, 0x11, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res2, ARRAY_SIZE(res2));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -464,7 +484,8 @@</span><br><span> printf("Testing creating Assignment Complete (AoIP)\n");</span><br><span> msg = gsm0808_create_ass_compl(0x23, 0x42, 0x11, 0x22,</span><br><span> &ss, &sc, &sc_list);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -478,11 +499,13 @@</span><br><span> </span><br><span> printf("Testing creating Assignment Failure\n");</span><br><span> msg = gsm0808_create_assignment_failure(0x23, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res1, ARRAY_SIZE(res1));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> msg = gsm0808_create_assignment_failure(0x23, &rr_res);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res2, ARRAY_SIZE(res2));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -504,11 +527,13 @@</span><br><span> </span><br><span> printf("Testing creating Assignment Failure (AoIP)\n");</span><br><span> msg = gsm0808_create_ass_fail(0x23, NULL, &sc_list);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res1, ARRAY_SIZE(res1));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> msg = gsm0808_create_ass_fail(0x23, &rr_res, &sc_list);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res2, ARRAY_SIZE(res2));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -519,7 +544,8 @@</span><br><span> </span><br><span> printf("Testing creating Clear Request\n");</span><br><span> msg = gsm0808_create_clear_rqst(0x23);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -551,15 +577,18 @@</span><br><span> </span><br><span> printf("Testing creating Paging Request\n");</span><br><span> msg = gsm0808_create_paging2(imsi, NULL, &cil, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> msg = gsm0808_create_paging2(imsi, &tmsi, &cil, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res2, ARRAY_SIZE(res2));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> msg = gsm0808_create_paging2(imsi, &tmsi, &cil, &chan_needed);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res3, ARRAY_SIZE(res3));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res3, ARRAY_SIZE(res3)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -575,7 +604,8 @@</span><br><span> msgb_v_put(l3, 0x42);</span><br><span> </span><br><span> msg = gsm0808_create_dtap(l3, 0x3);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(msg);</span><br><span> msgb_free(l3);</span><br><span> }</span><br><span>@@ -593,7 +623,8 @@</span><br><span> </span><br><span> gsm0808_prepend_dtap_header(in_msg, 0x3);</span><br><span> in_msg->l3h = in_msg->data;</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(in_msg, res, ARRAY_SIZE(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_l3_data_print(in_msg, res, ARRAY_SIZE(res)))</span><br><span style="color: hsl(120, 100%, 40%);">+ abort();</span><br><span> msgb_free(in_msg);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12271">change 12271</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/12271"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b </div>
<div style="display:none"> Gerrit-Change-Number: 12271 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>