cellular-infrastructure
/
cellmgr-ng
Archived
9
0
Fork 0
Code Releases Activity

mtp: Remove the bsc pointer from the MTP LinkSet

This commit is contained in:
Holger Hans Peter Freyther 2011-02-16 23:47:25 +01:00
parent a33b23f293
commit b27c9626e8
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mtp_data.h
View File

@ -75,7 +75,6 @@ struct mtp_link_set {
struct rate_ctr_group *ctrg;
/* custom data */
struct bsc_data *bsc;
struct ss7_application *app;
};

3
include/sctp_m2ua.h
View File

@ -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

1
src/links.c
View File

@ -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) {

3
src/main_stp.c
View File

@ -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);

7
src/sctp_m2ua.c
View File

@ -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;
}