From 784ca9c17969a18aabcde5b2278f1db4592b174d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 4 Jun 2011 16:59:37 +0200 Subject: bsc: Require osmo-sccp 0.0.6 and update the API --- openbsc/configure.ac | 2 +- openbsc/src/osmo-bsc/osmo_bsc_msc.c | 2 +- openbsc/src/osmo-bsc/osmo_bsc_sccp.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 59516187d..5ed53035b 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -35,7 +35,7 @@ AM_CONDITIONAL(BUILD_NAT, test "x$osmo_ac_build_nat" = "xyes") AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo BSC])], [ - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) + PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.6) osmo_ac_build_bsc="yes" ], [ diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c index 2a322271d..14a88d91f 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c @@ -376,7 +376,7 @@ static void initialize_if_needed(struct bsc_msc_connection *conn) return; } - sccp_write(msg, &sccp_ssn_bssap, &sccp_ssn_bssap, 0); + sccp_write(msg, &sccp_ssn_bssap, &sccp_ssn_bssap, 0, NULL); msgb_free(msg); conn->is_authenticated = 1; } diff --git a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c index f4cdf3637..c17690831 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c @@ -137,9 +137,10 @@ static void sccp_cc_timeout(void *_data) bsc_sccp_force_free(data); } -static void msc_sccp_write_ipa(struct sccp_connection *conn, struct msgb *msg, void *data) +static void msc_sccp_write_ipa(struct sccp_connection *conn, struct msgb *msg, + void *global_ctx, void *ctx) { - struct gsm_network *net = (struct gsm_network *) data; + struct gsm_network *net = (struct gsm_network *) global_ctx; msc_queue_write(net->msc_data->msc_con, msg, IPAC_PROTO_SCCP); } -- cgit v1.2.3