diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-07-09 22:09:18 +0200 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-08-30 14:11:25 +0200 |
commit | 7b656884cfadfd8c56355e8a6c690721827b5b30 (patch) | |
tree | 7f3357a94992d953021a28ec20336c4578f23052 /src/osmo-bsc | |
parent | 31a11aa75b5aad8887213bcd88cddc1b79b5954f (diff) |
split off osmo-bsc: remove files, apply build
Change-Id: I64d84c52f6e38e98144eb9be8f0ab82e0e1f6cca
Diffstat (limited to 'src/osmo-bsc')
-rw-r--r-- | src/osmo-bsc/Makefile.am | 1 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_api.c | 3 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_bssap.c | 16 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_filter.c | 2 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_main.c | 2 |
5 files changed, 19 insertions, 5 deletions
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 5642fb2ed..dfc4defcb 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -43,7 +43,6 @@ osmo_bsc_LDADD = \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libtrau/libtrau.a \ $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOSCCP_LIBS) \ diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c index f7343f743..8e47069c1 100644 --- a/src/osmo-bsc/osmo_bsc_api.c +++ b/src/osmo-bsc/osmo_bsc_api.c @@ -22,9 +22,12 @@ #include <openbsc/debug.h> #include <openbsc/gsm_04_80.h> +#include <openbsc/gsm_04_08_utils.h> #include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/gsm/gsm0808.h> +#include <osmocom/gsm/mncc.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/sccp/sccp.h> #include <openbsc/osmo_bsc_sigtran.h> diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 9a5288bdc..3417783a6 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -26,10 +26,12 @@ #include <openbsc/bsc_subscriber.h> #include <osmocom/legacy_mgcp/mgcp.h> #include <openbsc/paging.h> +#include <openbsc/gsm_04_08_utils.h> #include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/gsm/gsm0808.h> #include <osmocom/gsm/gsm0808_utils.h> +#include <osmocom/gsm/gsm48.h> #include <openbsc/osmo_bsc_sigtran.h> #include <openbsc/a_reset.h> #include <osmocom/core/byteswap.h> @@ -42,8 +44,7 @@ /* Helper function for match_codec_pref(), looks up a matching permitted speech * value for a given msc audio codec pref */ -enum gsm0808_permitted_speech audio_support_to_gsm88(struct gsm_audio_support - *audio) +enum gsm0808_permitted_speech audio_support_to_gsm88(struct gsm_audio_support *audio) { if (audio->hr) { switch (audio->ver) { @@ -517,9 +518,18 @@ static int bssmap_handle_assignm_req(struct osmo_bsc_sccp_con *conn, * local preferences of the BSC */ rc = match_codec_pref(&full_rate, &chan_mode, &ct, scl_ptr, msc); if (rc < 0) { - LOGP(DMSC, LOGL_ERROR, "No supported audio type found.\n"); + LOGP(DMSC, LOGL_ERROR, "No supported audio type found for channel_type =" + " { ch_indctr=0x%x, ch_rate_type=0x%x, perm_spch=[ %s] }\n", + ct.ch_indctr, ct.ch_rate_type, osmo_hexdump(ct.perm_spch, ct.perm_spch_len)); + /* TODO: actually output codec names, e.g. implement gsm0808_permitted_speech_names[] and + * iterate perm_spch. */ goto reject; } + DEBUGP(DMSC, "Found matching audio type: %s %s for channel_type =" + " { ch_indctr=0x%x, ch_rate_type=0x%x, perm_spch=[ %s] }\n", + full_rate? "full rate" : "half rate", + get_value_string(gsm48_chan_mode_names, chan_mode), + ct.ch_indctr, ct.ch_rate_type, osmo_hexdump(ct.perm_spch, ct.perm_spch_len)); if (aoip == false) { /* map it to a MGCP Endpoint and a RTP port */ diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c index 2c84b169f..2a9820d40 100644 --- a/src/osmo-bsc/osmo_bsc_filter.c +++ b/src/osmo-bsc/osmo_bsc_filter.c @@ -17,6 +17,8 @@ * */ +#include <osmocom/gsm/gsm48.h> + #include <openbsc/osmo_bsc.h> #include <openbsc/bsc_msc_data.h> #include <openbsc/gsm_04_80.h> diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index cf188a9e0..61ef33cb4 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -58,7 +58,7 @@ #include "../../bscconfig.h" struct gsm_network *bsc_gsmnet = 0; -static const char *config_file = "openbsc.cfg"; +static const char *config_file = "osmo-bsc.cfg"; static const char *rf_ctrl = NULL; extern const char *openbsc_copyright; static int daemonize = 0; |