From e94d7d1bdff6cbedc2394fa2ced8151c8da35fa5 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 18 Dec 2017 17:57:35 +0100 Subject: [PATCH] remove libosmo-sccp dependency for osmo-bsc libosmo-sccp is the old sccp-lite-focused SCCP implementation that we used before libosmo-sigtran was created. The new osmo-bsc in this repository is using libosmo-sigtran and shouldn't be using parts of libosmo-sccp anymore. We only keep it around in configure.ac and Makefile.am for osmo-bsc_nat, which is not even built in this repository anymore (or 'again yet'?) Change-Id: I8f274be7d196cd7a5b1ec9ada949130fb06e984d --- include/osmocom/bsc/osmo_bsc.h | 4 ---- src/libfilter/Makefile.am | 1 - src/osmo-bsc/Makefile.am | 2 -- src/osmo-bsc/osmo_bsc_api.c | 3 --- src/osmo-bsc/osmo_bsc_main.c | 4 ---- src/osmo-bsc/osmo_bsc_msc.c | 2 -- src/osmo-bsc/osmo_bsc_sigtran.c | 6 +++--- src/osmo-bsc/osmo_bsc_vty.c | 7 +++---- tests/bsc/Makefile.am | 2 -- 9 files changed, 6 insertions(+), 25 deletions(-) diff --git a/include/osmocom/bsc/osmo_bsc.h b/include/osmocom/bsc/osmo_bsc.h index 8a5cd3067..0fd29b731 100644 --- a/include/osmocom/bsc/osmo_bsc.h +++ b/include/osmocom/bsc/osmo_bsc.h @@ -15,7 +15,6 @@ enum bsc_con { BSC_CON_NO_MEM, }; -struct sccp_connection; struct bsc_msc_data; struct bsc_msc_connection; @@ -47,10 +46,7 @@ struct osmo_bsc_sccp_con { int send_ping; /* SCCP connection realted */ - struct sccp_connection *sccp; struct bsc_msc_data *msc; - struct osmo_timer_list sccp_it_timeout; - struct osmo_timer_list sccp_cc_timeout; struct llist_head sccp_queue; unsigned int sccp_queue_size; diff --git a/src/libfilter/Makefile.am b/src/libfilter/Makefile.am index 6d3db0b90..41a75bdd2 100644 --- a/src/libfilter/Makefile.am +++ b/src/libfilter/Makefile.am @@ -10,7 +10,6 @@ AM_CFLAGS = \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ - $(LIBOSMOSCCP_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 4acbe5623..79788526f 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -11,7 +11,6 @@ AM_CFLAGS = \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ - $(LIBOSMOSCCP_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ @@ -45,7 +44,6 @@ osmo_bsc_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOSCCP_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c index c388f5bd4..152b81837 100644 --- a/src/osmo-bsc/osmo_bsc_api.c +++ b/src/osmo-bsc/osmo_bsc_api.c @@ -29,7 +29,6 @@ #include #include -#include #include #define return_when_not_connected(conn) \ @@ -296,13 +295,11 @@ static int complete_layer3(struct gsm_subscriber_connection *conn, resp = gsm0808_create_layer3(msg, network_code, country_code, lac, ci); if (!resp) { LOGP(DMSC, LOGL_DEBUG, "Failed to create layer3 message.\n"); - sccp_connection_free(conn->sccp_con->sccp); osmo_bsc_sigtran_del_conn(conn->sccp_con); return BSC_API_CONN_POL_REJECT; } if (osmo_bsc_sigtran_open_conn(conn->sccp_con, resp) != 0) { - sccp_connection_free(conn->sccp_con->sccp); osmo_bsc_sigtran_del_conn(conn->sccp_con); msgb_free(resp); return BSC_API_CONN_POL_REJECT; diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 829f2075c..e4c8fc55f 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -43,7 +43,6 @@ #include -#include #include #define _GNU_SOURCE @@ -234,9 +233,6 @@ int main(int argc, char **argv) /* seed the PRNG */ srand(time(NULL)); - /* initialize SCCP */ - sccp_set_log_area(DSCCP); - /* Read the config */ rc = bsc_network_configure(config_file); if (rc < 0) { diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index 0e5777e53..46be2e644 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -34,8 +34,6 @@ #include -#include - #include #include diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index a18d4f3ad..7669b67b7 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -511,7 +510,8 @@ int osmo_bsc_sigtran_init(struct llist_head *mscs) /* If unset, use default local SCCP address */ if (!msc->a.bsc_addr.presence) - osmo_sccp_local_addr_by_instance(&msc->a.bsc_addr, msc->a.sccp, SCCP_SSN_BSSAP); + osmo_sccp_local_addr_by_instance(&msc->a.bsc_addr, msc->a.sccp, + OSMO_SCCP_SSN_BSSAP); if (!osmo_sccp_check_addr(&msc->a.bsc_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) { LOGP(DMSC, LOGL_ERROR, @@ -524,7 +524,7 @@ int osmo_bsc_sigtran_init(struct llist_head *mscs) if (!msc->a.msc_addr.presence) osmo_sccp_make_addr_pc_ssn(&msc->a.msc_addr, osmo_ss7_pointcode_parse(NULL, MSC_DEFAULT_PC), - SCCP_SSN_BSSAP); + OSMO_SCCP_SSN_BSSAP); if (!osmo_sccp_check_addr(&msc->a.msc_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) { LOGP(DMSC, LOGL_ERROR, diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index a87b20fff..f01e6f7e8 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -28,7 +28,6 @@ #include #include -#include #include @@ -663,14 +662,14 @@ DEFUN(cfg_msc_no_acc_lst_name, static void enforce_standard_ssn(struct vty *vty, struct osmo_sccp_addr *addr) { if (addr->presence & OSMO_SCCP_ADDR_T_SSN) { - if (addr->ssn != SCCP_SSN_BSSAP) + if (addr->ssn != OSMO_SCCP_SSN_BSSAP) vty_out(vty, "setting an SSN (%u) different from the standard (%u) is not allowd, will use standard SSN for address: %s%s", - addr->ssn, SCCP_SSN_BSSAP, osmo_sccp_addr_dump(addr), VTY_NEWLINE); + addr->ssn, OSMO_SCCP_SSN_BSSAP, osmo_sccp_addr_dump(addr), VTY_NEWLINE); } addr->presence |= OSMO_SCCP_ADDR_T_SSN; - addr->ssn = SCCP_SSN_BSSAP; + addr->ssn = OSMO_SCCP_SSN_BSSAP; } DEFUN(cfg_msc_cs7_bsc_addr, diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index 96f87f5a0..ebeb1edc0 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -8,7 +8,6 @@ AM_CFLAGS = \ -ggdb3 \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOSCCP_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOLEGACYMGCP_CFLAGS) \ $(COVERAGE_CFLAGS) \ @@ -37,7 +36,6 @@ bsc_test_LDADD = \ $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOSCCP_LIBS) \ $(LIBOSMOVTY_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOLEGACYMGCP_LIBS) \