diff options
| author | Max <msuraev@sysmocom.de> | 2018-11-19 15:04:55 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2018-11-20 17:27:40 +0000 |
| commit | 58099f699f1f89dc261f18ed7032407925aa124f (patch) | |
| tree | 36668423986d623288cdfa3986e5e94c77382094 /src/libmsc/a_iface_bssap.c | |
| parent | f1329c533d8a1898bea172e44be04aa26a8be7d9 (diff) | |
Use libosmocore to function to parse cipher mode reject cause
This allow us to handle both regular and extended cause transparently.
Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556
Related: OS#3187
Diffstat (limited to 'src/libmsc/a_iface_bssap.c')
| -rw-r--r-- | src/libmsc/a_iface_bssap.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index f24fb05a9..c11347eb2 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -427,20 +427,21 @@ static int bssmap_rx_ciph_compl(struct gsm_subscriber_connection *conn, struct m static int bssmap_rx_ciph_rej(struct gsm_subscriber_connection *conn, struct msgb *msg, struct tlv_parsed *tp) { + int rc; enum gsm0808_cause cause; struct rate_ctr_group *msc = conn->network->msc_ctrs; LOGPCONN(conn, LOGL_NOTICE, "RX BSSMAP CIPHER MODE REJECT\n"); - if (!TLVP_PRES_LEN(tp, GSM0808_IE_CAUSE, 1)) { - LOGPCONN(conn, LOGL_ERROR, "Cause code is missing -- discarding message!\n"); - return -EINVAL; + rc = gsm0808_get_cipher_reject_cause(tp); + if (rc < 0) { + LOGPCONN(conn, LOGL_ERROR, "failed (%s) to extract Cause from Cipher mode reject: %s\n", + strerror(-rc), msgb_hexdump(msg)); + return rc; } rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_REJECT]); - - /* FIXME: add support for 2-byte Cause values using libosmocore functions */ - cause = *TLVP_VAL(tp, GSM0808_IE_CAUSE); + cause = (enum gsm0808_cause)rc; LOGPCONN(conn, LOGL_NOTICE, "Cipher mode rejection cause: %s\n", gsm0808_cause_name(cause)); /* FIXME: Can we do something meaningful here? e.g. report to the |