<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/14861">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;">gsm/gsm0480.c: use DLGLOBAL and LOGL_ERROR for logging<br><br>Change-Id: Id38272ff93fae6d2fdf39df4ffc74856d6c9a898<br>---<br>M src/gsm/gsm0480.c<br>1 file changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c</span><br><span>index 66a22b6..3ae591a 100644</span><br><span>--- a/src/gsm/gsm0480.c</span><br><span>+++ b/src/gsm/gsm0480.c</span><br><span>@@ -323,7 +323,7 @@</span><br><span> memset(&ss, 0, sizeof(ss));</span><br><span> </span><br><span> if (len < sizeof(*hdr) + 2) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "USSD Request is too short.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "USSD Request is too short.\n");</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -345,7 +345,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!rc)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "Error occurred while parsing received USSD!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Error occurred while parsing received USSD!\n");</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span>@@ -362,7 +362,7 @@</span><br><span> */</span><br><span> pdisc = gsm48_hdr_pdisc(hdr);</span><br><span> if (pdisc != GSM48_PDISC_NC_SS) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_ERROR, "Dropping message with "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Dropping message with "</span><br><span> "unsupported pdisc=%02x\n", pdisc);</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -385,7 +385,7 @@</span><br><span> */</span><br><span> if (msg_type != GSM0480_MTYPE_RELEASE_COMPLETE) {</span><br><span> if (len < 2) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "SS Request is too short.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "SS Request is too short.\n");</span><br><span> return 0;</span><br><span> }</span><br><span> }</span><br><span>@@ -410,7 +410,7 @@</span><br><span> rc &= parse_ss_facility(&hdr->data[0], len, req);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "Unknown GSM 04.80 message-type field 0x%02x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Unknown GSM 04.80 message-type field 0x%02x\n",</span><br><span> hdr->msg_type);</span><br><span> rc = 0;</span><br><span> break;</span><br><span>@@ -459,7 +459,7 @@</span><br><span> case GSM0480_IE_SS_VERSION:</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "Unhandled GSM 04.08 or 04.80 IEI 0x%02x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Unhandled GSM 04.08 or 04.80 IEI 0x%02x\n",</span><br><span> iei);</span><br><span> rc = 0;</span><br><span> break;</span><br><span>@@ -495,7 +495,7 @@</span><br><span> </span><br><span> /* Make sure that there is no overflow */</span><br><span> if (offset + 2 + component_length > length) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_ERROR, "Component does not fit.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Component does not fit.\n");</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>@@ -515,7 +515,7 @@</span><br><span> case GSM0480_CTYPE_REJECT:</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "Unknown GSM 04.80 Facility "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Unknown GSM 04.80 Facility "</span><br><span> "Component Type 0x%02x\n", component_type);</span><br><span> rc = 0;</span><br><span> break;</span><br><span>@@ -545,7 +545,7 @@</span><br><span> </span><br><span> /* mandatory part */</span><br><span> if (invoke_data[0] != GSM0480_COMPIDTAG_INVOKE_ID) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "Unexpected GSM 04.80 Component-ID tag "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Unexpected GSM 04.80 Component-ID tag "</span><br><span> "0x%02x (expecting Invoke ID tag)\n", invoke_data[0]);</span><br><span> }</span><br><span> </span><br><span>@@ -587,13 +587,13 @@</span><br><span> req);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "GSM 04.80 operation code 0x%02x "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "GSM 04.80 operation code 0x%02x "</span><br><span> "is not yet handled\n", operation_code);</span><br><span> rc = 0;</span><br><span> break;</span><br><span> }</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "Unexpected GSM 04.80 Component-ID tag 0x%02x "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Unexpected GSM 04.80 Component-ID tag 0x%02x "</span><br><span> "(expecting Operation Code tag)\n",</span><br><span> invoke_data[0]);</span><br><span> rc = 0;</span><br><span>@@ -614,7 +614,7 @@</span><br><span> </span><br><span> /* Mandatory part */</span><br><span> if (rr_data[0] != GSM0480_COMPIDTAG_INVOKE_ID) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "Unexpected GSM 04.80 Component-ID tag "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "Unexpected GSM 04.80 Component-ID tag "</span><br><span> "0x%02x (expecting Invoke ID tag)\n", rr_data[0]);</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -645,7 +645,7 @@</span><br><span> return parse_process_uss_data(rr_data + offset + 3,</span><br><span> length - offset - 3, req);</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(0, LOGL_DEBUG, "GSM 04.80 operation code 0x%02x "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "GSM 04.80 operation code 0x%02x "</span><br><span> "is not yet handled\n", operation_code);</span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/14861">change 14861</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/+/14861"/><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: Id38272ff93fae6d2fdf39df4ffc74856d6c9a898 </div>
<div style="display:none"> Gerrit-Change-Number: 14861 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>