gprs_ns2_vc_fsm: check NSEI match the NSE

The NSE must match the PDUs. The only exception is a RESET with
dialect ipaccess. However those will be handled later.

Change-Id: I00bc04f3f46f5ae8ddd8b4b7d5479fb8e6463e1e
This commit is contained in:
Alexander Couzens 2021-01-20 13:03:03 +01:00
parent ba6345310f
commit 43771df63f
1 changed files with 14 additions and 0 deletions

View File

@ -750,6 +750,7 @@ int gprs_ns2_vc_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed
struct osmo_fsm_inst *fi = nsvc->fi;
int rc = 0;
uint8_t cause;
uint16_t nsei;
/* TODO: 7.2: on UNBLOCK/BLOCK: check if NS-VCI is correct,
* if not answer STATUS with "NS-VC unknown" */
@ -763,6 +764,19 @@ int gprs_ns2_vc_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed
}
}
if (TLVP_PRESENT(tp, NS_IE_NSEI)) {
nsei = tlvp_val16be(tp, NS_IE_NSEI);
if (nsei != nsvc->nse->nsei) {
/* 48.016 § 7.3.1 send, RESET_ACK to wrong NSVCI + ignore */
if (nsh->pdu_type == NS_PDUT_RESET)
ns2_tx_reset_ack(nsvc);
LOGNSVC(nsvc, LOGL_ERROR, "Rx %s with wrong NSEI=%05u. Ignoring PDU.\n",
get_value_string(gprs_ns_pdu_strings, nsh->pdu_type), nsei);
goto out;
}
}
switch (nsh->pdu_type) {
case NS_PDUT_RESET:
osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET, tp);