diff options
| author | Harald Welte <laforge@osmocom.org> | 2021-01-21 12:45:56 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2021-01-21 12:46:59 +0100 |
| commit | 43cb90ff5dbb7f420f2fdbc0e97b697ab25ba2f8 (patch) | |
| tree | d967acaeb06c6fe1a296e09afb7325f377bb3076 /src/gb/gprs_ns2_vc_fsm.c | |
| parent | 2846ee2624feae4d2aef00fc5f139ea91bf6126d (diff) | |
Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE"
This reverts commit 9c1e04e5802dfa25fcab3ca2c947897a1b7e7485.
Related: OS#4965
Change-Id: Ic26e6ee8c225266dc31850e38976460cb0e81ebd
Diffstat (limited to 'src/gb/gprs_ns2_vc_fsm.c')
| -rw-r--r-- | src/gb/gprs_ns2_vc_fsm.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index d4f43207..3ec69097 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -750,10 +750,11 @@ 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, nsvci; + uint16_t nsei; /* TODO: 7.2: on UNBLOCK/BLOCK: check if NS-VCI is correct, * if not answer STATUS with "NS-VC unknown" */ + /* TODO: handle RESET with different VCI */ /* TODO: handle BLOCK/UNBLOCK/ALIVE with different VCI */ if (gprs_ns2_validate(nsvc, nsh->pdu_type, msg, tp, &cause)) { @@ -776,19 +777,6 @@ int gprs_ns2_vc_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed } } - if (nsvc->nsvci_is_valid && TLVP_PRESENT(tp, NS_IE_VCI)) { - nsvci = tlvp_val16be(tp, NS_IE_VCI); - if (nsvci != nsvc->nsvci) { - /* 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 NSVCI=%05u. Ignoring PDU.\n", - get_value_string(gprs_ns_pdu_strings, nsh->pdu_type), nsvci); - goto out; - } - } - switch (nsh->pdu_type) { case NS_PDUT_RESET: osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET, tp); |