mtp: Remove the bsc pointer from the MTP LinkSet

5 files changed, 7 insertions, 8 deletions

diff --git a/include/mtp_data.h b/include/mtp_data.h
index 7af263f..142c869 100644
--- a/include/mtp_data.h
+++ b/include/mtp_data.h
@@ -75,7 +75,6 @@ struct mtp_link_set {
 	struct rate_ctr_group *ctrg;
 
 	/* custom data */
-	struct bsc_data *bsc;
 	struct ss7_application *app;
 };
 
diff --git a/include/sctp_m2ua.h b/include/sctp_m2ua.h
index dcb6269..1c001cd 100644
--- a/include/sctp_m2ua.h
+++ b/include/sctp_m2ua.h
@@ -64,6 +64,7 @@ struct sctp_m2ua_conn {
 };
 
 struct sctp_m2ua_transport *sctp_m2ua_transp_create(const char *ip, int port);
-struct mtp_m2ua_link *mtp_m2ua_link_create(struct mtp_link_set *);
+struct mtp_m2ua_link *mtp_m2ua_link_create(struct sctp_m2ua_transport *transport,
+					   struct mtp_link_set *);
 
 #endif
diff --git a/src/links.c b/src/links.c
index a3874be..2db67bd 100644
--- a/src/links.c
+++ b/src/links.c
@@ -101,7 +101,6 @@ struct mtp_link_set *link_init(struct bsc_data *bsc)
 	set->sltm_once = bsc->once;
 	set->ni = bsc->ni_ni;
 	set->spare = bsc->ni_spare;
-	set->bsc = bsc;
 	set->pcap_fd = bsc->pcap_fd;
 
 	if (!bsc->src_port) {
diff --git a/src/main_stp.c b/src/main_stp.c
index 6af392e..0a502b4 100644
--- a/src/main_stp.c
+++ b/src/main_stp.c
@@ -262,7 +262,6 @@ int main(int argc, char **argv)
 	m2ua_set->sccp_opc = 9;
 	m2ua_set->isup_opc = 9;
 	m2ua_set->ni = 3;
-	m2ua_set->bsc = bsc;
 	m2ua_set->pcap_fd = bsc->pcap_fd;
 	m2ua_set->name = talloc_strdup(m2ua_set, "M2UA");
 
@@ -270,7 +269,7 @@ int main(int argc, char **argv)
 	set->pass_all_isup = bsc->isup_pass;
 	m2ua_set->pass_all_isup = bsc->isup_pass;
 
-	lnk = mtp_m2ua_link_create(m2ua_set);
+	lnk = mtp_m2ua_link_create(bsc->m2ua_trans, m2ua_set);
 	lnk->base.pcap_fd = -1;
 	mtp_link_set_add_link(m2ua_set, (struct mtp_link *) lnk);
 
diff --git a/src/sctp_m2ua.c b/src/sctp_m2ua.c
index 0e0c083..284bf8a 100644
--- a/src/sctp_m2ua.c
+++ b/src/sctp_m2ua.c
@@ -691,7 +691,8 @@ struct sctp_m2ua_transport *sctp_m2ua_transp_create(const char *ip, int port)
 	return trans;
 }
 
-struct mtp_m2ua_link *mtp_m2ua_link_create(struct mtp_link_set *set)
+struct mtp_m2ua_link *mtp_m2ua_link_create(struct sctp_m2ua_transport *trans,
+					   struct mtp_link_set *set)
 {
 	struct mtp_m2ua_link *lnk;
 
@@ -702,7 +703,7 @@ struct mtp_m2ua_link *mtp_m2ua_link_create(struct mtp_link_set *set)
 	}
 
 	/* remember we have a link here */
-	llist_add(&lnk->entry, &set->bsc->m2ua_trans->links);
+	llist_add(&lnk->entry, &trans->links);
 
 	lnk->base.shutdown = sctp_m2ua_reset;
 	lnk->base.clear_queue = sctp_m2ua_dummy;
@@ -710,6 +711,6 @@ struct mtp_m2ua_link *mtp_m2ua_link_create(struct mtp_link_set *set)
 	lnk->base.start = sctp_m2ua_start;
 	lnk->base.write = sctp_m2ua_write;
 
-	lnk->transport = set->bsc->m2ua_trans;
+	lnk->transport = trans;
 	return lnk;
 }