<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10732">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add CC_CAUSE value_string array<br><br>Adds a value_string array for GSM 04.08 Call Control<br>cause values<br><br>Change-Id: I296f208581ce2550805f9d96e20f7319e1199023<br>---<br>M include/osmocom/gsm/protocol/gsm_04_08.h<br>M src/gsm/gsm48.c<br>M src/gsm/libosmogsm.map<br>3 files changed, 59 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h</span><br><span>index 4635014..e218295 100644</span><br><span>--- a/include/osmocom/gsm/protocol/gsm_04_08.h</span><br><span>+++ b/include/osmocom/gsm/protocol/gsm_04_08.h</span><br><span>@@ -1495,6 +1495,10 @@</span><br><span> GSM48_CC_CAUSE_INTERWORKING = 127,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string gsm48_cc_cause_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *gsm48_cc_cause_name(enum gsm48_cc_cause val)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return get_value_string(gsm48_cc_cause_names, val); }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Annex G, GSM specific cause values for mobility management */</span><br><span> enum gsm48_reject_value {</span><br><span> GSM48_REJECT_IMSI_UNKNOWN_IN_HLR = 2,</span><br><span>diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c</span><br><span>index 136b937..fc3b973 100644</span><br><span>--- a/src/gsm/gsm48.c</span><br><span>+++ b/src/gsm/gsm48.c</span><br><span>@@ -945,6 +945,60 @@</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! TS 04.08 10.5..4.11 Call Control Cause Values */</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string gsm48_cc_cause_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_UNASSIGNED_NR, "UNASSIGNED_NR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_NO_ROUTE, "NO_ROUTE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_CHAN_UNACCEPT, "CHAN_UNACCEPT" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_OP_DET_BARRING, "OP_DET_BARRING" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_NORM_CALL_CLEAR, "NORM_CALL_CLEAR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_USER_BUSY, "USER_BUSY" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_USER_NOTRESPOND, "USER_NOTRESPOND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_USER_ALERTING_NA, "USER_ALERTING_NA" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_CALL_REJECTED, "CALL_REJECTED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_NUMBER_CHANGED, "NUMBER_CHANGED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_PRE_EMPTION, "PRE_EMPTION" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_NONSE_USER_CLR, "NONSE_USER_CLR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_DEST_OOO, "DEST_OOO" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_INV_NR_FORMAT, "INV_NR_FORMAT" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_FACILITY_REJ, "FACILITY_REJ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_RESP_STATUS_INQ, "RESP_STATUS_INQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_NORMAL_UNSPEC, "NORMAL_UNSPEC" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_NO_CIRCUIT_CHAN, "NO_CIRCUIT_CHAN" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_NETWORK_OOO, "NETWORK_OOO" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_TEMP_FAILURE, "TEMP_FAILURE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_SWITCH_CONG, "SWITCH_CONG" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_ACC_INF_DISCARD, "ACC_INF_DISCARD" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_REQ_CHAN_UNAVAIL, "REQ_CHAN_UNAVAIL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_RESOURCE_UNAVAIL, "RESOURCE_UNAVAIL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_QOS_UNAVAIL, "QOS_UNAVAIL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_REQ_FAC_NOT_SUBSC, "REQ_FAC_NOT_SUBSC" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_INC_BARRED_CUG, "INC_BARRED_CUG" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_BEARER_CAP_UNAUTH, "BEARER_CAP_UNAUTH" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_BEARER_CA_UNAVAIL, "BEARER_CA_UNAVAIL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_SERV_OPT_UNAVAIL, "SERV_OPT_UNAVAIL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_BEARERSERV_UNIMPL, "BEARERSERV_UNIMPL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_ACM_GE_ACM_MAX, "ACM_GE_ACM_MAX" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_REQ_FAC_NOTIMPL, "REQ_FAC_NOTIMPL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_RESTR_BCAP_AVAIL, "RESTR_BCAP_AVAIL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_SERV_OPT_UNIMPL, "SERV_OPT_UNIMPL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_INVAL_TRANS_ID, "INVAL_TRANS_ID" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_USER_NOT_IN_CUG, "USER_NOT_IN_CUG" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_INCOMPAT_DEST, "INCOMPAT_DEST" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_INVAL_TRANS_NET, "INVAL_TRANS_NET" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_SEMANTIC_INCORR, "SEMANTIC_INCORR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_INVAL_MAND_INF, "INVAL_MAND_INF" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_MSGTYPE_NOTEXIST, "MSGTYPE_NOTEXIST" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_MSGTYPE_INCOMPAT, "MSGTYPE_INCOMPAT" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_IE_NOTEXIST, "IE_NOTEXIST" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_COND_IE_ERR, "COND_IE_ERR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_MSG_INCOMP_STATE, "MSG_INCOMP_STATE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_RECOVERY_TIMER, "RECOVERY_TIMER" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_PROTO_ERR, "PROTO_ERR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM48_CC_CAUSE_INTERWORKING, "INTERWORKING" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0 , NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! TS 04.80, section 3.4 Messages for supplementary services control */</span><br><span> const struct value_string gsm48_nc_ss_msgtype_names[] = {</span><br><span> OSMO_VALUE_STRING(GSM0480_MTYPE_RELEASE_COMPLETE),</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 1da398c..60d6ed8 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -321,6 +321,7 @@</span><br><span> gsm48_rr_msgtype_names;</span><br><span> gsm48_mm_msgtype_names;</span><br><span> gsm48_cc_msgtype_names;</span><br><span style="color: hsl(120, 100%, 40%);">+gsm48_cc_cause_names;</span><br><span> gsm48_pdisc_msgtype_name;</span><br><span> gsm48_reject_value_names;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10732">change 10732</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/10732"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I296f208581ce2550805f9d96e20f7319e1199023 </div>
<div style="display:none"> Gerrit-Change-Number: 10732 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Keith Whyte <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Keith Whyte <keith@rhizomatica.org> </div>