<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16901">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sccp: Improve logging in sccp_to_xua_opt()<br><br>Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb<br>---<br>M include/osmocom/sccp/sccp_types.h<br>M src/sccp2sua.c<br>M src/sccp_types.c<br>3 files changed, 40 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h</span><br><span>index 71cbb0f..f43f822 100644</span><br><span>--- a/include/osmocom/sccp/sccp_types.h</span><br><span>+++ b/include/osmocom/sccp/sccp_types.h</span><br><span>@@ -80,6 +80,10 @@</span><br><span> SCCP_PNC_LONG_DATA = 19,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string osmo_sccp_pnc_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *osmo_sccp_pnc_name(enum sccp_message_types val)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return get_value_string(osmo_sccp_pnc_names, val); }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Figure 3/Q.713 Called/calling party address */</span><br><span> enum {</span><br><span> SCCP_TITLE_IND_NONE = 0,</span><br><span>diff --git a/src/sccp2sua.c b/src/sccp2sua.c</span><br><span>index e68662f..b829cf6 100644</span><br><span>--- a/src/sccp2sua.c</span><br><span>+++ b/src/sccp2sua.c</span><br><span>@@ -711,10 +711,11 @@</span><br><span> </span><br><span> oneopt = opt_start;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ enum sccp_parameter_name_codes opt_type = 0; /* dummy value not used */</span><br><span> while (oneopt < msg->tail) {</span><br><span style="color: hsl(0, 100%, 40%);">- enum sccp_parameter_name_codes opt_type = oneopt[0];</span><br><span> uint8_t opt_len;</span><br><span> uint16_t opt_len16;</span><br><span style="color: hsl(120, 100%, 40%);">+ opt_type = oneopt[0];</span><br><span> </span><br><span> switch (opt_type) {</span><br><span> case SCCP_PNC_END_OF_OPTIONAL:</span><br><span>@@ -722,25 +723,30 @@</span><br><span> case SCCP_PNC_LONG_DATA:</span><br><span> /* two byte length field */</span><br><span> if (oneopt + 2 > msg->tail)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto malformed;</span><br><span> opt_len16 = oneopt[1] << 8 | oneopt[2];</span><br><span> if (oneopt + 3 + opt_len16 > msg->tail)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto malformed;</span><br><span> xua_msg_add_sccp_opt(xua, opt_type, opt_len16, oneopt+3);</span><br><span> oneopt += 3 + opt_len16;</span><br><span> break;</span><br><span> default:</span><br><span> /* one byte length field */</span><br><span> if (oneopt + 1 > msg->tail)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto malformed;</span><br><span> </span><br><span> opt_len = oneopt[1];</span><br><span> if (oneopt + 2 + opt_len > msg->tail)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto malformed;</span><br><span> xua_msg_add_sccp_opt(xua, opt_type, opt_len, oneopt+2);</span><br><span> oneopt += 2 + opt_len;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSUA, LOGL_ERROR, "Parameter %s not found\n", osmo_sccp_pnc_name(SCCP_PNC_END_OF_OPTIONAL));</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+malformed:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSUA, LOGL_ERROR, "Malformed parameter %s (%d)\n", osmo_sccp_pnc_name(opt_type), opt_type);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/sccp_types.c b/src/sccp_types.c</span><br><span>index c6e24cc..98b3fa4 100644</span><br><span>--- a/src/sccp_types.c</span><br><span>+++ b/src/sccp_types.c</span><br><span>@@ -24,3 +24,28 @@</span><br><span> { SCCP_MSG_TYPE_LUDTS, "Long unitdata service" },</span><br><span> {}</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 2/Q.713 - SCCP parameter name codes */</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string osmo_sccp_pnc_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_END_OF_OPTIONAL, "End of optional parameters" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_DESTINATION_LOCAL_REFERENCE, "Destination local reference" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_SOURCE_LOCAL_REFERENCE, "Source local reference" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_CALLED_PARTY_ADDRESS, "Called party address" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_CALLING_PARTY_ADDRESS, "Calling party address" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_PROTOCOL_CLASS, "Protocol class" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_SEGMENTING, "Segmenting/reassembling" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_RECEIVE_SEQ_NUMBER, "Receive sequence number" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_SEQUENCING, "Sequencing/segmenting" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_CREDIT, "Credit" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_RELEASE_CAUSE, "Release cause" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_RETURN_CAUSE, "Return cause" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_RESET_CAUSE, "Reset cause" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_ERROR_CAUSE, "Error cause" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_REFUSAL_CAUSE, "Refusal cause" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_DATA, "Data" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_SEGMENTATION, "Segmentation" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_HOP_COUNTER, "Hop counter" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_IMPORTANCE, "Importance" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SCCP_PNC_LONG_DATA, "Long data" },</span><br><span style="color: hsl(120, 100%, 40%);">+ {}</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16901">change 16901</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/libosmo-sccp/+/16901"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb </div>
<div style="display:none"> Gerrit-Change-Number: 16901 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>