<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-iuh/+/19446">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Provide more context when logging "Error in ANY_fromType_aper"<br><br>Let's add the type name whose encoding failed to give us some kind<br>of a clue what's happening in those situations.<br><br>Change-Id: I802677ba7164a4d3382d4bc00f5e1c7ab7067d89<br>---<br>M src/ranap_common.c<br>M src/rua_common.c<br>M src/sabp_common.c<br>3 files changed, 15 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/46/19446/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ranap_common.c b/src/ranap_common.c</span><br><span>index 46203e0..4ada7ff 100644</span><br><span>--- a/src/ranap_common.c</span><br><span>+++ b/src/ranap_common.c</span><br><span>@@ -331,7 +331,7 @@</span><br><span> pdu.choice.initiatingMessage.criticality = criticality;</span><br><span> rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -358,7 +358,7 @@</span><br><span> pdu.choice.successfulOutcome.criticality = criticality;</span><br><span> rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -385,7 +385,7 @@</span><br><span> pdu.choice.unsuccessfulOutcome.criticality = criticality;</span><br><span> rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -412,7 +412,7 @@</span><br><span> pdu.choice.outcome.criticality = criticality;</span><br><span> rc = ANY_fromType_aper(&pdu.choice.outcome.value, td, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -440,7 +440,7 @@</span><br><span> </span><br><span> rc = ANY_fromType_aper(&buff->value, type, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type->name);</span><br><span> FREEMEM(buff);</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -474,14 +474,14 @@</span><br><span> </span><br><span> rc = ANY_fromType_aper(&buff->firstValue, type1, sptr1);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type1->name);</span><br><span> FREEMEM(buff);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span> rc = ANY_fromType_aper(&buff->secondValue, type2, sptr2);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type2->name);</span><br><span> ASN_STRUCT_FREE(asn_DEF_RANAP_ProtocolIE_FieldPair, buff);</span><br><span> return NULL;</span><br><span> }</span><br><span>diff --git a/src/rua_common.c b/src/rua_common.c</span><br><span>index 3c9d773..77ac591 100644</span><br><span>--- a/src/rua_common.c</span><br><span>+++ b/src/rua_common.c</span><br><span>@@ -140,7 +140,7 @@</span><br><span> pdu.choice.initiatingMessage.criticality = criticality;</span><br><span> rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -163,7 +163,7 @@</span><br><span> pdu.choice.successfulOutcome.criticality = criticality;</span><br><span> rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -186,7 +186,7 @@</span><br><span> pdu.choice.unsuccessfulOutcome.criticality = criticality;</span><br><span> rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -211,7 +211,7 @@</span><br><span> </span><br><span> rc = ANY_fromType_aper(&buff->value, type, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type->name);</span><br><span> FREEMEM(buff);</span><br><span> return NULL;</span><br><span> }</span><br><span>diff --git a/src/sabp_common.c b/src/sabp_common.c</span><br><span>index cdb0e32..7aee4b7 100644</span><br><span>--- a/src/sabp_common.c</span><br><span>+++ b/src/sabp_common.c</span><br><span>@@ -114,7 +114,7 @@</span><br><span> pdu.choice.initiatingMessage.criticality = criticality;</span><br><span> rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -141,7 +141,7 @@</span><br><span> pdu.choice.successfulOutcome.criticality = criticality;</span><br><span> rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -168,7 +168,7 @@</span><br><span> pdu.choice.unsuccessfulOutcome.criticality = criticality;</span><br><span> rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -195,7 +195,7 @@</span><br><span> </span><br><span> rc = ANY_fromType_aper(&buff->value, type, sptr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type->name);</span><br><span> FREEMEM(buff);</span><br><span> return NULL;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-iuh/+/19446">change 19446</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/osmo-iuh/+/19446"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-iuh </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I802677ba7164a4d3382d4bc00f5e1c7ab7067d89 </div>
<div style="display:none"> Gerrit-Change-Number: 19446 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>