This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22357 ) Change subject: Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE" ...................................................................... Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE" This reverts commit 9c1e04e5802dfa25fcab3ca2c947897a1b7e7485. Related: OS#4965 Change-Id: Ic26e6ee8c225266dc31850e38976460cb0e81ebd --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 2 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index d4f4320..3ec6909 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -750,10 +750,11 @@ 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 @@ } } - 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); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic26e6ee8c225266dc31850e38976460cb0e81ebd Gerrit-Change-Number: 22357 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge at osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210121/53fdf5f2/attachment.htm>