<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19821">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipa: Fix wrong output log formatting<br><br>Change-Id: I1862465e9f9a1d9f06a189641360ae7b9e03b1fc<br>---<br>M src/gsm/ipa.c<br>1 file changed, 12 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c</span><br><span>index 1563d0a..7a26ba4 100644</span><br><span>--- a/src/gsm/ipa.c</span><br><span>+++ b/src/gsm/ipa.c</span><br><span>@@ -121,22 +121,25 @@</span><br><span> </span><br><span> memset(dec, 0, sizeof(*dec));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMI, LOGL_DEBUG, "Rx IPA CCM ID_GET: ");</span><br><span> while (len >= 2) {</span><br><span> len -= 2;</span><br><span> t_len = *cur++;</span><br><span> t_tag = *cur++;</span><br><span> </span><br><span> if (t_len < len_offset) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLMI, LOGL_DEBUG, "\n");</span><br><span> LOGP(DLMI, LOGL_ERROR, "minimal offset not included: %d < %d\n", t_len, len_offset);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span> if (t_len > len + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLMI, LOGL_DEBUG, "\n");</span><br><span> LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLMI, LOGL_DEBUG, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur);</span><br><span> </span><br><span> dec->lv[t_tag].len = t_len - len_offset;</span><br><span> dec->lv[t_tag].val = cur;</span><br><span>@@ -144,6 +147,7 @@</span><br><span> cur += t_len - len_offset;</span><br><span> len -= t_len - len_offset;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLMI, LOGL_DEBUG, "\n");</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -164,17 +168,19 @@</span><br><span> </span><br><span> memset(dec, 0, sizeof(*dec));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMI, LOGL_DEBUG, "Rx IPA CCM ID_GET: ");</span><br><span> while (len >= 2) {</span><br><span> len -= 2;</span><br><span> t_len = *cur++;</span><br><span> t_tag = *cur++;</span><br><span> </span><br><span> if (t_len > len + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLMI, LOGL_DEBUG, "\n");</span><br><span> LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLMI, LOGL_DEBUG, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur);</span><br><span> </span><br><span> dec->lv[t_tag].len = t_len-1;</span><br><span> dec->lv[t_tag].val = cur;</span><br><span>@@ -182,6 +188,7 @@</span><br><span> cur += t_len-1;</span><br><span> len -= t_len-1;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLMI, LOGL_DEBUG, "\n");</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -202,6 +209,7 @@</span><br><span> </span><br><span> memset(dec, 0, sizeof(*dec));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMI, LOGL_DEBUG, "Rx IPA CCM ID_RESP: ");</span><br><span> while (len >= 3) {</span><br><span> len -= 3;</span><br><span> t_len = osmo_load16be(cur);</span><br><span>@@ -209,6 +217,7 @@</span><br><span> t_tag = *cur++;</span><br><span> </span><br><span> if (t_len > len + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLMI, LOGL_DEBUG, "\n");</span><br><span> LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span>@@ -221,6 +230,7 @@</span><br><span> cur += t_len-1;</span><br><span> len -= t_len-1;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLMI, LOGL_DEBUG, "\n");</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19821">change 19821</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/c/libosmocore/+/19821"/><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-Change-Id: I1862465e9f9a1d9f06a189641360ae7b9e03b1fc </div>
<div style="display:none"> Gerrit-Change-Number: 19821 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>