pespin submitted this change.

View Change

cnlink: Fix several funcs missing prefix

Change-Id: If20890bb99885e8c18732588376f8fdaa326d639
---
M include/osmocom/hnbgw/cnlink.h
M include/osmocom/hnbgw/hnbgw_cn.h
M src/osmo-hnbgw/cnlink.c
M src/osmo-hnbgw/hnbgw_cn.c
M src/osmo-hnbgw/hnbgw_sccp.c
M src/osmo-hnbgw/hnbgw_vty.c
6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h
index 3aeed0b..3ede801 100644
--- a/include/osmocom/hnbgw/cnlink.h
+++ b/include/osmocom/hnbgw/cnlink.h
@@ -92,12 +92,13 @@
 	struct rate_ctr_group *ctrs;
 };
 
-struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr);
+struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr);
+void hnbgw_cnlink_term_and_free(struct hnbgw_cnlink *cnlink);
 void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink);
 int hnbgw_cnlink_tx_ranap_reset(struct hnbgw_cnlink *cnlink);
 int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink);
 
-static inline struct osmo_sccp_instance *cnlink_sccp(const struct hnbgw_cnlink *cnlink)
+static inline struct osmo_sccp_instance *hnbgw_cnlink_sccp(const struct hnbgw_cnlink *cnlink)
 {
 	if (!cnlink)
 		return NULL;
diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h
index d6098b4..5ca5675 100644
--- a/include/osmocom/hnbgw/hnbgw_cn.h
+++ b/include/osmocom/hnbgw/hnbgw_cn.h
@@ -70,4 +70,4 @@
 void hnbgw_cnpool_apply_cfg(struct hnbgw_cnpool *cnpool);
 
 int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink);
-char *cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr);
+char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr);
diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c
index cea2827..ae6b266 100644
--- a/src/osmo-hnbgw/cnlink.c
+++ b/src/osmo-hnbgw/cnlink.c
@@ -34,7 +34,7 @@
 #include <osmocom/hnbgw/tdefs.h>
 #include <osmocom/hnbgw/context_map.h>
 
-struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr)
+struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr)
 {
 	struct osmo_fsm_inst *fi;
 	struct hnbgw_cnlink *cnlink;
@@ -84,7 +84,7 @@
 	hnbgw_sccp_user_put(hsu, HSU_USE_CNLINK);
 }
 
-void cnlink_term_and_free(struct hnbgw_cnlink *cnlink)
+void hnbgw_cnlink_term_and_free(struct hnbgw_cnlink *cnlink)
 {
 	if (!cnlink)
 		return;
@@ -127,7 +127,7 @@
 
 	LOG_CNLINK(cnlink, DRANAP, LOGL_DEBUG, "Tx RANAP RESET to %s %s\n",
 		   cnlink_is_cs(cnlink) ? "IuCS" : "IuPS",
-		   cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr));
+		   hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr));
 
 	if (g_hnbgw->config.plmn.mcc) {
 		osmo_plmn_to_bcd(plmn_buf, &g_hnbgw->config.plmn);
@@ -162,7 +162,7 @@
 int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink)
 {
 	struct msgb *msg;
-	struct osmo_sccp_instance *sccp = cnlink_sccp(cnlink);
+	struct osmo_sccp_instance *sccp = hnbgw_cnlink_sccp(cnlink);
 	RANAP_GlobalRNC_ID_t grnc_id;
 	RANAP_GlobalRNC_ID_t *use_grnc_id = NULL;
 	uint8_t plmn_buf[3];
@@ -174,8 +174,8 @@
 
 	LOG_CNLINK(cnlink, DRANAP, LOGL_NOTICE, "Tx RANAP RESET ACK %s %s --> %s\n",
 		   cnlink_is_cs(cnlink) ? "IuCS" : "IuPS",
-		   cnlink_sccp_addr_to_str(cnlink, &cnlink->hnbgw_sccp_user->local_addr),
-		   cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr));
+		   hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->hnbgw_sccp_user->local_addr),
+		   hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr));
 
 	if (g_hnbgw->config.plmn.mcc) {
 		osmo_plmn_to_bcd(plmn_buf, &g_hnbgw->config.plmn);
diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c
index 121c77f..e03f3c7 100644
--- a/src/osmo-hnbgw/hnbgw_cn.c
+++ b/src/osmo-hnbgw/hnbgw_cn.c
@@ -247,7 +247,7 @@
 	if (!create_if_missing)
 		return NULL;
 
-	return cnlink_alloc(cnpool, nr);
+	return hnbgw_cnlink_alloc(cnpool, nr);
 }
 
 static bool is_cnlink_usable(struct hnbgw_cnlink *cnlink, bool is_emerg)
@@ -414,9 +414,9 @@
 #undef LOG_NRI
 }
 
-char *cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr)
+char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr)
 {
-	struct osmo_sccp_instance *sccp = cnlink_sccp(cnlink);
+	struct osmo_sccp_instance *sccp = hnbgw_cnlink_sccp(cnlink);
 	if (!sccp)
 		return osmo_sccp_addr_dump(addr);
 	return osmo_sccp_inst_addr_to_str_c(OTC_SELECT, sccp, addr);
diff --git a/src/osmo-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c
index 4699b2f..434c58e 100644
--- a/src/osmo-hnbgw/hnbgw_sccp.c
+++ b/src/osmo-hnbgw/hnbgw_sccp.c
@@ -123,9 +123,9 @@
 
 	LOGP(DCN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d, addrs: called=%s calling=%s responding=%s\n",
 	     param->conn_id,
-	     cnlink_sccp_addr_to_str(map->cnlink, &param->called_addr),
-	     cnlink_sccp_addr_to_str(map->cnlink, &param->calling_addr),
-	     cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr));
+	     hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->called_addr),
+	     hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->calling_addr),
+	     hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr));
 
 	CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_CONNECT_CNF);
 
@@ -159,7 +159,7 @@
 
 	LOGP(DCN, LOGL_DEBUG, "handle_cn_disc_ind() conn_id=%u responding_addr=%s cause=%s\n",
 	     param->conn_id,
-	     cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr),
+	     hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr),
 	     osmo_sua_sccp_cause_name(param->cause, cause_buf, sizeof(cause_buf)));
 
 	CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_DISCONNECT_IND);
diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c
index e2c3d8f..bfe0c73 100644
--- a/src/osmo-hnbgw/hnbgw_vty.c
+++ b/src/osmo-hnbgw/hnbgw_vty.c
@@ -154,7 +154,7 @@
 	vty_out(vty, " %s%s%s%s",
 		cnlink->use.remote_addr_name ? : "",
 		cnlink->use.remote_addr_name ? "=" : "",
-		cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr),
+		hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr),
 		VTY_NEWLINE);
 
 	rt = osmo_ss7_route_lookup(ss7, cnlink->remote_addr.pc);

To view, visit change 40263. To unsubscribe, or for help writing mail filters, visit settings.