From 7ca2b03aa68a4f74f36206ee608c168afbe36433 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 10 Feb 2011 18:28:30 +0100 Subject: bsc: Remove the m2ua_set pointer from the struct as well --- include/bsc_data.h | 1 - src/main_stp.c | 31 ++++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/bsc_data.h b/include/bsc_data.h index bd599df..c1e1658 100644 --- a/include/bsc_data.h +++ b/include/bsc_data.h @@ -123,7 +123,6 @@ struct bsc_data { int setup; int pcap_fd; int udp_reset_timeout; - struct mtp_link_set *m2ua_set; struct llist_head links; /* udp code */ diff --git a/src/main_stp.c b/src/main_stp.c index 3e83f56..9a5eb89 100644 --- a/src/main_stp.c +++ b/src/main_stp.c @@ -305,6 +305,7 @@ int main(int argc, char **argv) int rc; struct mtp_link *data; struct mtp_link_set *set; + struct mtp_link_set *m2ua_set; struct mtp_m2ua_link *lnk; INIT_LLIST_HEAD(&bsc.links); @@ -368,28 +369,28 @@ int main(int argc, char **argv) return -1; llist_add(&set->entry, &bsc.links); - bsc.m2ua_set = mtp_link_set_alloc(); - bsc.m2ua_set->dpc = 92; - bsc.m2ua_set->opc = 9; - bsc.m2ua_set->sccp_opc = 9; - bsc.m2ua_set->isup_opc = 9; - bsc.m2ua_set->ni = 3; - bsc.m2ua_set->bsc = &bsc; - bsc.m2ua_set->pcap_fd = bsc.pcap_fd; - bsc.m2ua_set->name = talloc_strdup(bsc.m2ua_set, "M2UA"); - llist_add(&bsc.m2ua_set->entry, &bsc.links); + m2ua_set = mtp_link_set_alloc(); + m2ua_set->dpc = 92; + m2ua_set->opc = 9; + 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"); + llist_add(&m2ua_set->entry, &bsc.links); /* setup things */ set->pass_all_isup = bsc.isup_pass; - set->forward = bsc.m2ua_set; - bsc.m2ua_set->pass_all_isup = bsc.isup_pass; - bsc.m2ua_set->forward = set; + set->forward = m2ua_set; + m2ua_set->pass_all_isup = bsc.isup_pass; + m2ua_set->forward = set; lnk = sctp_m2ua_transp_create("0.0.0.0", 2904); lnk->base.pcap_fd = -1; - mtp_link_set_add_link(bsc.m2ua_set, (struct mtp_link *) lnk); + mtp_link_set_add_link(m2ua_set, (struct mtp_link *) lnk); - llist_for_each_entry(data, &bsc.m2ua_set->links, entry) + llist_for_each_entry(data, &m2ua_set->links, entry) data->start(data); while (1) { -- cgit v1.2.3