Change in osmo-pcu[master]: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack()

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25747 )

Change subject: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack()
......................................................................

pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack()

If we didn't expect this kind of UL messages according to pdch ULC, then
we shouldn't allow going forward and releasing the ULC entry: let it
time out instead so that TBF runs whatever appopiate action is needed in
this case, be it retransamission, releasing itself, etc.

Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714
---
M src/pdch.cpp
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, but someone else must approve
  fixeria: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  dexter: Looks good to me, but someone else must approve



diff --git a/src/pdch.cpp b/src/pdch.cpp
index cfec71e..807ce45 100644
--- a/src/pdch.cpp
+++ b/src/pdch.cpp
@@ -463,7 +463,8 @@
 
 	tfi = ack_nack->DOWNLINK_TFI;
 	poll = pdch_ulc_get_node(ulc, fn);
-	if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL) {
+	if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL ||
+	    poll->tbf_poll.reason != PDCH_ULC_POLL_DL_ACK) {
 		LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "PACKET DOWNLINK ACK with "
 			"unknown FN=%u TFI=%d (TRX %d TS %d)\n",
 			fn, tfi, trx_no(), ts_no);
@@ -532,7 +533,8 @@
 
 	tfi = ack_nack->DOWNLINK_TFI;
 	poll = pdch_ulc_get_node(ulc, fn);
-	if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL) {
+	if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL ||
+	    poll->tbf_poll.reason != PDCH_ULC_POLL_DL_ACK) {
 		LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "EGPRS PACKET DOWNLINK ACK with "
 			"unknown FN=%u TFI=%d (TRX %d TS %d)\n",
 			fn, tfi, trx_no(), ts_no);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25747
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714
Gerrit-Change-Number: 25747
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211012/8da04bb9/attachment.htm>