Change in osmo-bts[master]: log reception of PCU_IF_MSG_PAG_REQ messages from osmo-pcu

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9727 )

Change subject: log reception of PCU_IF_MSG_PAG_REQ messages from osmo-pcu
......................................................................

log reception of PCU_IF_MSG_PAG_REQ messages from osmo-pcu

osmo-pcu currently sends paging requests in PCU_IF_MSG_DATA_REQ
messages, rather than PCU_IF_MSG_PAG_REQ. Clarify a comment which
already alluded to this, and leave an explicit log entry if a
PCU_IF_MSG_PAG_REQ message is received.

Change-Id: I75fd8f051f943d876b5614fa088fff7e56b310ab
Related: OS#3018
---
M src/common/pcu_sock.c
1 file changed, 22 insertions(+), 8 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index bdebf65..7f32f32 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -481,13 +481,7 @@
 
 	switch (data_req->sapi) {
 	case PCU_IF_SAPI_PCH:
-		if (msg_type == PCU_IF_MSG_PAG_REQ) {
-			/* FIXME: Add function to schedule paging request.
-			 * This might not be required, if PCU_IF_MSG_DATA_REQ
-			 * is used instead. */
-		} else {
-			paging_add_imm_ass(bts->paging_state, data_req->data, data_req->len);
-		}
+		paging_add_imm_ass(bts->paging_state, data_req->data, data_req->len);
 		break;
 	case PCU_IF_SAPI_AGCH:
 		msg = msgb_alloc(data_req->len, "pcu_agch");
@@ -543,6 +537,24 @@
 	return rc;
 }
 
+static int pcu_rx_pag_req(struct gsm_bts *bts, uint8_t msg_type,
+	struct gsm_pcu_if_pag_req *pag_req)
+{
+	int rc = 0;
+
+	OSMO_ASSERT(msg_type == PCU_IF_MSG_PAG_REQ);
+
+	/* FIXME: Add function to schedule paging request.
+	 * At present, osmo-pcu sends paging requests in PCU_IF_MSG_DATA_REQ
+	 * messages which are processed by pcu_rx_data_req().
+	 * This code path is not triggered in practice. */
+	LOGP(DPCU, LOGL_NOTICE, "Paging request received: chan_needed=%d length=%d "
+	     "(dropping message because support for PCU_IF_MSG_PAG_REQ is not yet implemented)\n",
+	     pag_req->chan_needed, pag_req->identity_lv[0]);
+
+	return rc;
+}
+
 int pcu_tx_si13(const struct gsm_bts *bts, bool enable)
 {
 	/* the SI is per-BTS so it doesn't matter which TRX we use */
@@ -631,9 +643,11 @@
 
 	switch (msg_type) {
 	case PCU_IF_MSG_DATA_REQ:
-	case PCU_IF_MSG_PAG_REQ:
 		rc = pcu_rx_data_req(bts, msg_type, &pcu_prim->u.data_req);
 		break;
+	case PCU_IF_MSG_PAG_REQ:
+		rc = pcu_rx_pag_req(bts, msg_type, &pcu_prim->u.pag_req);
+		break;
 	case PCU_IF_MSG_ACT_REQ:
 		rc = pcu_rx_act_req(bts, &pcu_prim->u.act_req);
 		break;

-- 
To view, visit https://gerrit.osmocom.org/9727
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I75fd8f051f943d876b5614fa088fff7e56b310ab
Gerrit-Change-Number: 9727
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling <ssperling at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180625/ff11074a/attachment.htm>