misc: Make the code compile with the latest libosmocore/libosmo-sccp

9 files changed, 13 insertions, 33 deletions

diff --git a/openbsc/configure.in b/openbsc/configure.in
index e159037c0..7209d2cb9 100644
--- a/openbsc/configure.in
+++ b/openbsc/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script
-AC_INIT(openbsc, 0.3.99.20onwaves)
+AC_INIT(openbsc, 0.3.99.21onwaves)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 dnl kernel style compile messages
@@ -15,9 +15,9 @@ dnl checks for libraries
 AC_SEARCH_LIBS(crypt, crypt,
     [LIBCRYPT="-lcrypt"; AC_DEFINE([VTY_CRYPT_PW], [], [Use crypt functionality of vty.])])
 
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.2.0)
-PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.3)
-PKG_CHECK_MODULES(LIBOSMOGSM,  libosmogsm >= 0.2.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.4.3)
+PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.6)
+PKG_CHECK_MODULES(LIBOSMOGSM,  libosmogsm >= 0.3.4.3)
 
 dnl checks for header files
 AC_HEADER_STDC
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index b0aca1292..a3df9a385 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -5,26 +5,6 @@
 
 struct bsc_msc_connection;
 
-enum gsm_phys_chan_config {
-	GSM_PCHAN_NONE,
-	GSM_PCHAN_CCCH,
-	GSM_PCHAN_CCCH_SDCCH4,
-	GSM_PCHAN_TCH_F,
-	GSM_PCHAN_TCH_H,
-	GSM_PCHAN_SDCCH8_SACCH8C,
-	GSM_PCHAN_PDCH,		/* GPRS PDCH */
-	GSM_PCHAN_TCH_F_PDCH,	/* TCH/F if used, PDCH otherwise */
-	GSM_PCHAN_UNKNOWN,
-};
-
-enum gsm_chan_t {
-	GSM_LCHAN_NONE,
-	GSM_LCHAN_SDCCH,
-	GSM_LCHAN_TCH_F,
-	GSM_LCHAN_TCH_H,
-	GSM_LCHAN_UNKNOWN,
-};
-
 /* RRLP mode of operation */
 enum rrlp_mode {
 	RRLP_MODE_NONE,
diff --git a/openbsc/src/bs11_config.c b/openbsc/src/bs11_config.c
index 8d1f05078..c8f809e4a 100644
--- a/openbsc/src/bs11_config.c
+++ b/openbsc/src/bs11_config.c
@@ -835,7 +835,7 @@ int main(int argc, char **argv)
 	struct gsm_network *gsmnet;
 	int rc;
 
-	log_init(&log_info);
+	log_init(&log_info, NULL);
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
 	log_set_all_filter(stderr_target, 1);
diff --git a/openbsc/src/bsc_hack.c b/openbsc/src/bsc_hack.c
index b82457af8..888beaaf3 100644
--- a/openbsc/src/bsc_hack.c
+++ b/openbsc/src/bsc_hack.c
@@ -211,7 +211,7 @@ int main(int argc, char **argv)
 {
 	int rc;
 
-	log_init(&log_info);
+	log_init(&log_info, NULL);
 	tall_bsc_ctx = talloc_named_const(NULL, 1, "openbsc");
 	talloc_ctx_init();
 	on_dso_load_token();
diff --git a/openbsc/src/bsc_msc_ip.c b/openbsc/src/bsc_msc_ip.c
index 33acf2872..5c771343f 100644
--- a/openbsc/src/bsc_msc_ip.c
+++ b/openbsc/src/bsc_msc_ip.c
@@ -748,7 +748,7 @@ static int msc_sccp_do_write(struct osmo_fd *fd, struct msgb *msg)
 	return ret;
 }
 
-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 *data, void *closure)
 {
 	msc_queue_write(msg, IPAC_PROTO_SCCP);
 }
@@ -921,7 +921,7 @@ static void initialize_if_needed(void)
 			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);
 		bsc_gsmnet->msc_con->is_authenticated = 1;
 	}
@@ -1246,7 +1246,7 @@ int main(int argc, char **argv)
 	char *msc;
 	int rc;
 
-	log_init(&log_info);
+	log_init(&log_info, NULL);
 	tall_bsc_ctx = talloc_named_const(NULL, 1, "openbsc");
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c
index 40976dee3..9067c2841 100644
--- a/openbsc/src/ipaccess/ipaccess-config.c
+++ b/openbsc/src/ipaccess/ipaccess-config.c
@@ -621,7 +621,7 @@ int main(int argc, char **argv)
 	int rc, option_index = 0, stream_id = 0xff;
 	struct log_target *stderr_target;
 
-	log_init(&log_info);
+	log_init(&log_info, NULL);
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
 	log_set_all_filter(stderr_target, 1);
diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c
index a1f0dade1..f1a983198 100644
--- a/openbsc/src/ipaccess/ipaccess-proxy.c
+++ b/openbsc/src/ipaccess/ipaccess-proxy.c
@@ -1109,7 +1109,7 @@ int main(int argc, char **argv)
 
 	tall_bsc_ctx = talloc_named_const(NULL, 1, "ipaccess-proxy");
 
-	log_init(&log_info);
+	log_init(&log_info, NULL);
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
 	log_set_all_filter(stderr_target, 1);
diff --git a/openbsc/src/mgcp/mgcp_main.c b/openbsc/src/mgcp/mgcp_main.c
index 7d47f4463..8f34a35f0 100644
--- a/openbsc/src/mgcp/mgcp_main.c
+++ b/openbsc/src/mgcp/mgcp_main.c
@@ -191,7 +191,7 @@ int main(int argc, char** argv)
 
 	tall_bsc_ctx = talloc_named_const(NULL, 1, "mgcp-callagent");
 
-	log_init(&log_info);
+	log_init(&log_info, NULL);
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
 	log_set_all_filter(stderr_target, 1);
diff --git a/openbsc/tests/debug/debug_test.c b/openbsc/tests/debug/debug_test.c
index f3e483703..5d578ecc2 100644
--- a/openbsc/tests/debug/debug_test.c
+++ b/openbsc/tests/debug/debug_test.c
@@ -26,7 +26,7 @@ int main(int argc, char** argv)
 {
 	struct log_target *stderr_target;
 
-	log_init(&log_info);
+	log_init(&log_info, NULL);
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
 	log_set_all_filter(stderr_target, 1);