diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-03-04 14:37:31 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-03-04 14:57:09 +0100 |
| commit | a4198d192234a8180a89be8b91e867a1cbc1f512 (patch) | |
| tree | d75d1d9d2fb9e50b94927a85161eab59489e1f86 /openbsc/src/osmo-cscn | |
| parent | 544a203f677d0f060d2d1bd31f72f9ae450e138f (diff) | |
create libxsc and move some code, never link libbsc and libmsc
libbsc and libmsc have conflicting definitions of gsm_subscriber_connection
and do no longer belong together anyway.
Create libxsc, meaning 'lib[bm]sc', to hold all code used by both libmsc
and libbsc, and make sure gsm_subscriber_connection isn't used there.
In various binaries and tests, do not link libbsc and libmsc.
(Note: this commit was reshaped out of a large wip chunk, it may not
compile properly without the subsequent commits)
Diffstat (limited to 'openbsc/src/osmo-cscn')
| -rw-r--r-- | openbsc/src/osmo-cscn/Makefile.am | 3 | ||||
| -rw-r--r-- | openbsc/src/osmo-cscn/cscn_main.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openbsc/src/osmo-cscn/Makefile.am b/openbsc/src/osmo-cscn/Makefile.am index 3a1021304..66109ff38 100644 --- a/openbsc/src/osmo-cscn/Makefile.am +++ b/openbsc/src/osmo-cscn/Makefile.am @@ -11,12 +11,11 @@ bin_PROGRAMS = osmo-cscn osmo_cscn_SOURCES = cscn_main.c osmo_cscn_LDADD = \ - $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libiu/libiu.a \ $(top_builddir)/src/libmsc/libmsc.a \ - $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libtrau/libtrau.a \ $(top_builddir)/src/libcommon/libcommon.a \ + $(top_builddir)/src/libxsc/libxsc.a \ -ldbi $(LIBCRYPT) \ $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCTRL_LIBS) $(LIBOSMOABIS_LIBS) $(LIBSMPP34_LIBS) $(LIBCRYPTO_LIBS) \ diff --git a/openbsc/src/osmo-cscn/cscn_main.c b/openbsc/src/osmo-cscn/cscn_main.c index 463b7f141..374f9bd82 100644 --- a/openbsc/src/osmo-cscn/cscn_main.c +++ b/openbsc/src/osmo-cscn/cscn_main.c @@ -344,7 +344,8 @@ int main(int argc, char **argv) vty_init(&cscn_vty_info); ctrl_vty_init(tall_cscn_ctx); - bsc_vty_init(&log_info, cscn_network); + logging_vty_add_cmds(&log_info); + xsc_vty_init(cscn_network); rc = vty_read_config_file(cscn_cmdline_config.config_file, NULL); if (rc < 0) { LOGP(DNM, LOGL_FATAL, "Failed to parse the config file: '%s'\n", |