diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-07-30 02:53:14 +0800 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-07-31 04:09:38 +0800 |
| commit | 30e1ae923db16c480cf210a29c8befa57a69202b (patch) | |
| tree | fc64d6d9e4b4b7e3bb5b5e798ed284a2206b821f /openbsc/src/bsc | |
| parent | c44db4a5341c1c86de784bb74d4dbd2063a4c010 (diff) | |
sccp: Use the external libosmo-sccp as sccp implementation
Add --enable-nat and --enable-osmo-bsc to build applications
requiring the Osmo SCCP library to be installed. We are not
using autodiscover as this is out of fashion.
Diffstat (limited to 'openbsc/src/bsc')
| -rw-r--r-- | openbsc/src/bsc/Makefile.am | 7 | ||||
| -rw-r--r-- | openbsc/src/bsc/osmo_bsc_main.c | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/openbsc/src/bsc/Makefile.am b/openbsc/src/bsc/Makefile.am index 3a289c52d..6e179a0c1 100644 --- a/openbsc/src/bsc/Makefile.am +++ b/openbsc/src/bsc/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOSCCP_CFLAGS) AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) bin_PROGRAMS = osmo-bsc @@ -8,5 +8,6 @@ bin_PROGRAMS = osmo-bsc osmo_bsc_SOURCES = osmo_bsc_main.c osmo_bsc_rf.c osmo_bsc_vty.c osmo_bsc_api.c \ $(top_srcdir)/src/debug.c $(top_srcdir)/src/bsc_msc.c \ $(top_srcdir)/src/bsc_init.c -osmo_bsc_LDADD = $(top_builddir)/src/libvty.a $(top_builddir)/src/libsccp.a \ - $(top_builddir)/src/libmgcp.a $(top_builddir)/src/libbsc.a +osmo_bsc_LDADD = $(top_builddir)/src/libvty.a \ + $(top_builddir)/src/libmgcp.a $(top_builddir)/src/libbsc.a \ + $(LIBOSMOSCCP_LIBS) diff --git a/openbsc/src/bsc/osmo_bsc_main.c b/openbsc/src/bsc/osmo_bsc_main.c index b1c5001a9..a6782276b 100644 --- a/openbsc/src/bsc/osmo_bsc_main.c +++ b/openbsc/src/bsc/osmo_bsc_main.c @@ -26,6 +26,8 @@ #include <osmocom/vty/command.h> #include <osmocore/talloc.h> +#include <sccp/sccp.h> + #define _GNU_SOURCE #include <getopt.h> @@ -158,6 +160,9 @@ int main(int argc, char **argv) /* seed the PRNG */ srand(time(NULL)); + /* initialize SCCP */ + sccp_set_log_area(DSCCP); + rc = bsc_bootstrap_network(NULL, config_file); if (rc < 0) { |