Review at https://gerrit.osmocom.org/5473
cosmetic: rename sccp_rx_udt and sccp_rx_dt to a_*
These rx functions are only used for the A interface, hence the names should
not suggest general SCCP rx (which Iu also has).
Change-Id: I6815c3d4dea4c2abfdff1cf0239ada6a9254f351
---
M include/osmocom/msc/a_iface_bssap.h
M src/libmsc/a_iface.c
M src/libmsc/a_iface_bssap.c
3 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/73/5473/1
diff --git a/include/osmocom/msc/a_iface_bssap.h
b/include/osmocom/msc/a_iface_bssap.h
index 237c618..79b8390 100644
--- a/include/osmocom/msc/a_iface_bssap.h
+++ b/include/osmocom/msc/a_iface_bssap.h
@@ -34,8 +34,8 @@
};
/* Receive incoming connection less data messages via sccp */
-void sccp_rx_udt(struct osmo_sccp_user *scu, const struct a_conn_info
*a_conn_info, struct msgb *msg);
+void a_sccp_rx_udt(struct osmo_sccp_user *scu, const struct a_conn_info
*a_conn_info, struct msgb *msg);
/* Receive incoming connection oriented data messages via sccp */
-int sccp_rx_dt(struct osmo_sccp_user *scu, const struct a_conn_info
*a_conn_info, struct msgb *msg);
+int a_sccp_rx_dt(struct osmo_sccp_user *scu, const struct a_conn_info
*a_conn_info, struct msgb *msg);
diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c
index 6f9bdd0..52987ba 100644
--- a/src/libmsc/a_iface.c
+++ b/src/libmsc/a_iface.c
@@ -520,7 +520,7 @@
if (msgb_l2len(oph->msg) > 0) {
LOGP(DMSC, LOGL_DEBUG, "N-CONNECT.ind(%u, %s)\n",
scu_prim->u.connect.conn_id,
osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg)));
- rc = sccp_rx_dt(scu, &a_conn_info, oph->msg);
+ rc = a_sccp_rx_dt(scu, &a_conn_info, oph->msg);
} else
LOGP(DMSC, LOGL_DEBUG, "N-CONNECT.ind(%u)\n",
scu_prim->u.connect.conn_id);
@@ -532,7 +532,7 @@
a_conn_info.conn_id = scu_prim->u.data.conn_id;
LOGP(DMSC, LOGL_DEBUG, "N-DATA.ind(%u, %s)\n",
scu_prim->u.data.conn_id, osmo_hexdump(msgb_l2(oph->msg),
msgb_l2len(oph->msg)));
- sccp_rx_dt(scu, &a_conn_info, oph->msg);
+ a_sccp_rx_dt(scu, &a_conn_info, oph->msg);
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION):
@@ -542,7 +542,7 @@
a_conn_info.bsc_addr = &scu_prim->u.unitdata.calling_addr;
a_conn_info.reset =
get_reset_ctx_by_sccp_addr(&scu_prim->u.unitdata.calling_addr);
DEBUGP(DMSC, "N-UNITDATA.ind(%s)\n",
osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg)));
- sccp_rx_udt(scu, &a_conn_info, oph->msg);
+ a_sccp_rx_udt(scu, &a_conn_info, oph->msg);
break;
default:
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c
index 8a1e39b..909a9f9 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -175,7 +175,7 @@
}
/* Receive incoming connection less data messages via sccp */
-void sccp_rx_udt(struct osmo_sccp_user *scu, const struct a_conn_info
*a_conn_info, struct msgb *msg)
+void a_sccp_rx_udt(struct osmo_sccp_user *scu, const struct a_conn_info
*a_conn_info, struct msgb *msg)
{
/* Note: The only valid message type that can be received
* via UNITDATA are BSS Management messages */
@@ -690,7 +690,7 @@
}
/* Handle incoming connection oriented messages */
-int sccp_rx_dt(struct osmo_sccp_user *scu, const struct a_conn_info
*a_conn_info, struct msgb *msg)
+int a_sccp_rx_dt(struct osmo_sccp_user *scu, const struct a_conn_info
*a_conn_info, struct msgb *msg)
{
OSMO_ASSERT(scu);
OSMO_ASSERT(a_conn_info);
--
To view, visit https://gerrit.osmocom.org/5473
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6815c3d4dea4c2abfdff1cf0239ada6a9254f351
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <[email protected]>
