summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2011-06-04 15:34:37 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2012-05-02 19:24:28 +0200
commitb87b8a6205572748ae401197b33e4305d0c8c6dd (patch)
tree5a64617b9580fd61c115bfb2dd6ac731ad44df00
parent661a8319e828018c896365c596216095d4e378fa (diff)
bsc: Move more things to use osmo_msc_data* directly
-rw-r--r--openbsc/include/openbsc/osmo_msc_data.h2
-rw-r--r--openbsc/src/osmo-bsc/osmo_bsc_main.c2
-rw-r--r--openbsc/src/osmo-bsc/osmo_bsc_msc.c4
3 files changed, 3 insertions, 5 deletions
diff --git a/openbsc/include/openbsc/osmo_msc_data.h b/openbsc/include/openbsc/osmo_msc_data.h
index 6f9f3a2b0..384549ec0 100644
--- a/openbsc/include/openbsc/osmo_msc_data.h
+++ b/openbsc/include/openbsc/osmo_msc_data.h
@@ -81,7 +81,7 @@ struct osmo_bsc_data {
};
-int osmo_bsc_msc_init(struct gsm_network *network);
+int osmo_bsc_msc_init(struct osmo_msc_data *msc);
int osmo_bsc_sccp_init(struct gsm_network *gsmnet);
int msc_queue_write(struct bsc_msc_connection *conn, struct msgb *msg, int proto);
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c
index 4665a62ef..65ef4e0a2 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_main.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c
@@ -232,7 +232,7 @@ int main(int argc, char **argv)
}
}
- if (osmo_bsc_msc_init(bsc_gsmnet) != 0) {
+ if (osmo_bsc_msc_init(&bsc_gsmnet->bsc_data->msc) != 0) {
LOGP(DNAT, LOGL_ERROR, "Failed to start up. Exiting.\n");
exit(1);
}
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c
index b44c8ad09..35d504ec3 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c
@@ -427,10 +427,8 @@ static void send_id_get_response(struct osmo_msc_data *data, int fd)
msc_queue_write(data->msc_con, msg, IPAC_PROTO_IPACCESS);
}
-int osmo_bsc_msc_init(struct gsm_network *network)
+int osmo_bsc_msc_init(struct osmo_msc_data *data)
{
- struct osmo_msc_data *data = &network->bsc_data->msc;
-
if (mgcp_create_port(data) != 0)
return -1;