laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26893 ) Change subject: Fix DLCI CC bits transmitted in SAPI "n" REJECT ...................................................................... Fix DLCI CC bits transmitted in SAPI "n" REJECT The SAPI "n" REJECT messages were being sent with DLCI keeping the RSL LINK ID format, which is not the same for CC bits. With this patch, TTCN3 test BSC_Tests.TC_rll_sapi_n_reject_dlci_cc passes again. Related: OS#4728 Related: SYS#5047 Change-Id: Icc187f594743040a3d9b8beff7d9cfc21dd6eb08 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/osmo_bsc_bssap.c 4 files changed, 24 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4e26ec1..910c3d3 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -56,6 +56,26 @@ #define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3] +/* Data Link Connection Identifier (DLCI) is defined in 3GPP TS 48.006, section 9.3.2. + * .... .SSS - SAPI value used on the radio link; + * CC.. .... - control channel identification: + * 00.. .... - indicates that the control channel is not further specified, + * 10.. .... - represents the FACCH or the SDCCH, + * 11.. .... - represents the SACCH, + * other values are reserved. */ +#define RSL_LINK_ID2DLCI(link_id) \ + ((link_id & 0x40 ? 0xc0 : 0x80) | (link_id & 0x07)) + +/* RSL Link Identifier is defined in 3GPP TS 3GPP TS 48.058, section 9.3.2. + * .... .SSS - SAPI value used on the radio link; + * ...P P... - priority for SAPI0 messages; + * CC.. .... - control channel identification: + * 00.. .... - main signalling channel (FACCH or SDCCH), + * 01.. .... - SACCH, + * other values are reserved. */ +#define DLCI2RSL_LINK_ID(dlci) \ + ((dlci & 0xc0) == 0xc0 ? 0x40 : 0x00) | (dlci & 0x07) + /* 3-bit long values */ #define EARFCN_PRIO_INVALID 8 #define EARFCN_MEAS_BW_INVALID 8 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 2183b18..33dd283 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -1168,16 +1168,16 @@ switch (rllr_ind) { case BSC_RLLR_IND_EST_CONF: - rsl_data_request(msg, OBSC_LINKID_CB(msg)); + rsl_data_request(msg, link_id); break; case BSC_RLLR_IND_REL_IND: - bsc_sapi_n_reject(lchan->conn, OBSC_LINKID_CB(msg), + bsc_sapi_n_reject(lchan->conn, RSL_LINK_ID2DLCI(link_id), GSM0808_CAUSE_MS_NOT_EQUIPPED); msgb_free(msg); break; case BSC_RLLR_IND_ERR_IND: case BSC_RLLR_IND_TIMEOUT: - bsc_sapi_n_reject(lchan->conn, OBSC_LINKID_CB(msg), + bsc_sapi_n_reject(lchan->conn, RSL_LINK_ID2DLCI(link_id), GSM0808_CAUSE_BSS_NOT_EQUIPPED); msgb_free(msg); break; @@ -1217,7 +1217,7 @@ rc = rll_establish(msg->lchan, sapi, rll_ind_cb, msg); if (rc) { msgb_free(msg); - bsc_sapi_n_reject(conn, link_id, GSM0808_CAUSE_BSS_NOT_EQUIPPED); + bsc_sapi_n_reject(conn, RSL_LINK_ID2DLCI(link_id), GSM0808_CAUSE_BSS_NOT_EQUIPPED); goto failed_to_send; } return; diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 1715533..a99db43 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -536,15 +536,6 @@ return rc; } -/* Data Link Connection Identifier (DLCI) is defined in 3GPP TS 48.006, section 9.3.2. - * .... .SSS - SAPI value used on the radio link; - * CC.. .... - control channel identification: - * 00.. .... - indicates that the control channel is not further specified, - * 10.. .... - represents the FACCH or the SDCCH, - * 11.. .... - represents the SACCH, - * other values are reserved. */ -#define RSL_LINK_ID2DLCI(link_id) \ - (link_id & 0x40 ? 0xc0 : 0x80) | (link_id & 0x07) /*! MS->BSC/MSC: Um L3 message. */ void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 904da62..3f56052 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1208,16 +1208,6 @@ return ret; } -/* RSL Link Identifier is defined in 3GPP TS 3GPP TS 48.058, section 9.3.2. - * .... .SSS - SAPI value used on the radio link; - * ...P P... - priority for SAPI0 messages; - * CC.. .... - control channel identification: - * 00.. .... - main signalling channel (FACCH or SDCCH), - * 01.. .... - SACCH, - * other values are reserved. */ -#define DLCI2RSL_LINK_ID(dlci) \ - ((dlci & 0xc0) == 0xc0 ? 0x40 : 0x00) | (dlci & 0x07) - static int dtap_rcvmsg(struct gsm_subscriber_connection *conn, struct msgb *msg, unsigned int length) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc187f594743040a3d9b8beff7d9cfc21dd6eb08 Gerrit-Change-Number: 26893 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged