cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Harald Welte 2017-12-18 17:57:35 +01:00
parent 3edbd0e065
commit e94d7d1bdf
9 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osmocom/bsc/osmo_bsc.h
View File

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

1
src/libfilter/Makefile.am
View File

@ -10,7 +10,6 @@ AM_CFLAGS = \
$(LIBOSMOGSM_CFLAGS) \
$(LIBOSMOVTY_CFLAGS) \
$(LIBOSMOABIS_CFLAGS) \
$(LIBOSMOSCCP_CFLAGS) \
$(COVERAGE_CFLAGS) \
$(NULL)

2
src/osmo-bsc/Makefile.am
View File

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

3
src/osmo-bsc/osmo_bsc_api.c
View File

@ -29,7 +29,6 @@
#include <osmocom/gsm/mncc.h>
#include <osmocom/gsm/gsm48.h>
#include <osmocom/sccp/sccp.h>
#include <osmocom/bsc/osmo_bsc_sigtran.h>
#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;

4
src/osmo-bsc/osmo_bsc_main.c
View File

@ -43,7 +43,6 @@
#include <osmocom/abis/abis.h>
#include <osmocom/sccp/sccp.h>
#include <osmocom/mgcp_client/mgcp_client.h>
#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) {

2
src/osmo-bsc/osmo_bsc_msc.c
View File

@ -34,8 +34,6 @@
#include <osmocom/gsm/gsm0808.h>
#include <osmocom/sccp/sccp.h>
#include <osmocom/abis/ipa.h>
#include <sys/socket.h>

6
src/osmo-bsc/osmo_bsc_sigtran.c
View File

@ -22,7 +22,6 @@
#include <osmocom/core/logging.h>
#include <osmocom/sigtran/osmo_ss7.h>
#include <osmocom/sigtran/sccp_sap.h>
#include <osmocom/sccp/sccp_types.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/gsm/gsm0808.h>
#include <osmocom/core/msgb.h>
@ -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,

7
src/osmo-bsc/osmo_bsc_vty.c
View File

@ -28,7 +28,6 @@
#include <osmocom/core/talloc.h>
#include <osmocom/vty/logging.h>
#include <osmocom/sccp/sccp_types.h>
#include <osmocom/mgcp_client/mgcp_client.h>
@ -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,

2
tests/bsc/Makefile.am
View File

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