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/libbsc | |
parent | 31a11aa75b5aad8887213bcd88cddc1b79b5954f (diff) |
split off osmo-bsc: remove files, apply build
Change-Id: I64d84c52f6e38e98144eb9be8f0ab82e0e1f6cca
Diffstat (limited to 'src/libbsc')
-rw-r--r-- | src/libbsc/abis_rsl.c | 3 | ||||
-rw-r--r-- | src/libbsc/bsc_api.c | 3 | ||||
-rw-r--r-- | src/libbsc/bsc_init.c | 1 | ||||
-rw-r--r-- | src/libbsc/bsc_vty.c | 28 | ||||
-rw-r--r-- | src/libbsc/chan_alloc.c | 1 | ||||
-rw-r--r-- | src/libbsc/gsm_04_08_utils.c | 2 | ||||
-rw-r--r-- | src/libbsc/handover_logic.c | 6 | ||||
-rw-r--r-- | src/libbsc/net_init.c | 1 | ||||
-rw-r--r-- | src/libbsc/paging.c | 1 | ||||
-rw-r--r-- | src/libbsc/system_information.c | 4 |
10 files changed, 16 insertions, 34 deletions
diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index 66cda8200..75229a55f 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -28,7 +28,7 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <openbsc/gsm_04_08.h> +#include <openbsc/gsm_04_08_utils.h> #include <osmocom/gsm/gsm_utils.h> #include <openbsc/abis_rsl.h> #include <openbsc/chan_alloc.h> @@ -46,6 +46,7 @@ #include <osmocom/gsm/rsl.h> #include <osmocom/core/talloc.h> #include <openbsc/pcu_if.h> +#include <openbsc/bsc_api.h> #define RSL_ALLOC_SIZE 1024 #define RSL_ALLOC_HEADROOM 128 diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index c60f8182a..a0ba69a91 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -30,9 +30,8 @@ #include <openbsc/chan_alloc.h> #include <openbsc/handover.h> #include <openbsc/debug.h> -#include <openbsc/gsm_04_08.h> #include <openbsc/trau_mux.h> -#include <openbsc/vlr.h> +#include <openbsc/gsm_04_08_utils.h> #include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/gsm/gsm48.h> diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index 78ca2ab4d..a99eea27f 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -21,7 +21,6 @@ #include <openbsc/gsm_data.h> #include <osmocom/gsm/gsm_utils.h> -#include <openbsc/gsm_04_08.h> #include <openbsc/abis_rsl.h> #include <openbsc/abis_nm.h> #include <openbsc/debug.h> diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index d55c6eb30..abfff0cd5 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -31,6 +31,7 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/gsm0502.h> #include <osmocom/ctrl/control_if.h> +#include <osmocom/gsm/gsm48.h> #include <arpa/inet.h> @@ -44,7 +45,6 @@ #include <osmocom/gsm/abis_nm.h> #include <openbsc/chan_alloc.h> #include <openbsc/meas_rep.h> -#include <openbsc/db.h> #include <openbsc/vty.h> #include <osmocom/gprs/gprs_ns.h> #include <openbsc/system_information.h> @@ -56,8 +56,8 @@ #include <openbsc/osmo_bsc_rf.h> #include <openbsc/pcu_if.h> #include <openbsc/common_cs.h> -#include <openbsc/vlr.h> #include <openbsc/handover.h> +#include <openbsc/gsm_04_08_utils.h> #include <inttypes.h> @@ -1021,26 +1021,6 @@ DEFUN(show_ts, return CMD_SUCCESS; } -static void subscr_dump_vty(struct vty *vty, struct vlr_subscr *vsub) -{ - OSMO_ASSERT(vsub); - if (strlen(vsub->name)) - vty_out(vty, " Name: '%s'%s", vsub->name, VTY_NEWLINE); - if (strlen(vsub->msisdn)) - vty_out(vty, " Extension: %s%s", vsub->msisdn, - VTY_NEWLINE); - if (strlen(vsub->imsi)) - vty_out(vty, " IMSI: %s%s", vsub->imsi, VTY_NEWLINE); - if (vsub->tmsi != GSM_RESERVED_TMSI) - vty_out(vty, " TMSI: %08X%s", vsub->tmsi, - VTY_NEWLINE); - if (vsub->tmsi_new != GSM_RESERVED_TMSI) - vty_out(vty, " new TMSI: %08X%s", vsub->tmsi_new, - VTY_NEWLINE); - - vty_out(vty, " Use count: %u%s", vsub->use_count, VTY_NEWLINE); -} - static void bsc_subscr_dump_vty(struct vty *vty, struct bsc_subscr *bsub) { if (strlen(bsub->imsi)) @@ -1166,9 +1146,9 @@ static void lchan_dump_full_vty(struct vty *vty, struct gsm_lchan *lchan) vty_out(vty, " Channel Mode / Codec: %s%s", get_value_string(gsm48_cmode_names, lchan->tch_mode), VTY_NEWLINE); - if (lchan->conn && lchan->conn->vsub) { + if (lchan->conn && lchan->conn->bsub) { vty_out(vty, " Subscriber:%s", VTY_NEWLINE); - subscr_dump_vty(vty, lchan->conn->vsub); + bsc_subscr_dump_vty(vty, lchan->conn->bsub); } else vty_out(vty, " No Subscriber%s", VTY_NEWLINE); if (is_ipaccess_bts(lchan->ts->trx->bts)) { diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index 33b79a0b2..4192d65f7 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -32,6 +32,7 @@ #include <openbsc/debug.h> #include <openbsc/rtp_proxy.h> #include <openbsc/signal.h> +#include <openbsc/gsm_04_08_utils.h> #include <osmocom/core/talloc.h> diff --git a/src/libbsc/gsm_04_08_utils.c b/src/libbsc/gsm_04_08_utils.c index 7c5e0e97a..109beda49 100644 --- a/src/libbsc/gsm_04_08_utils.c +++ b/src/libbsc/gsm_04_08_utils.c @@ -32,11 +32,11 @@ #include <openbsc/abis_rsl.h> #include <openbsc/debug.h> -#include <openbsc/gsm_04_08.h> #include <openbsc/transaction.h> #include <openbsc/paging.h> #include <openbsc/signal.h> #include <openbsc/bsc_api.h> +#include <openbsc/gsm_04_08_utils.h> /* should ip.access BTS use direct RTP streams between each other (1), * or should OpenBSC always act as RTP relay/proxy in between (0) ? */ diff --git a/src/libbsc/handover_logic.c b/src/libbsc/handover_logic.c index 14566cfa1..8ced74fd5 100644 --- a/src/libbsc/handover_logic.c +++ b/src/libbsc/handover_logic.c @@ -33,14 +33,14 @@ #include <openbsc/gsm_data.h> #include <osmocom/gsm/gsm_utils.h> #include <openbsc/gsm_subscriber.h> -#include <openbsc/gsm_04_08.h> #include <openbsc/abis_rsl.h> #include <openbsc/chan_alloc.h> #include <openbsc/signal.h> #include <osmocom/core/talloc.h> #include <openbsc/transaction.h> #include <openbsc/trau_mux.h> -#include <openbsc/vlr.h> +#include <openbsc/bsc_subscriber.h> +#include <openbsc/gsm_04_08_utils.h> struct bsc_handover { struct llist_head list; @@ -262,7 +262,7 @@ static int ho_gsm48_ho_compl(struct gsm_lchan *new_lchan) net = new_lchan->ts->trx->bts->network; LOGP(DHO, LOGL_INFO, "Subscriber %s HO from BTS %u->%u on ARFCN " - "%u->%u\n", vlr_subscr_name(ho->old_lchan->conn->vsub), + "%u->%u\n", bsc_subscr_name(ho->old_lchan->conn->bsub), ho->old_lchan->ts->trx->bts->nr, new_lchan->ts->trx->bts->nr, ho->old_lchan->ts->trx->arfcn, new_lchan->ts->trx->arfcn); diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c index 9d5431964..0dd37534e 100644 --- a/src/libbsc/net_init.c +++ b/src/libbsc/net_init.c @@ -20,6 +20,7 @@ #include <openbsc/common_cs.h> #include <openbsc/osmo_bsc.h> #include <openbsc/bsc_msc_data.h> +#include <openbsc/gsm_04_08_utils.h> struct gsm_network *bsc_network_init(void *ctx, uint16_t country_code, diff --git a/src/libbsc/paging.c b/src/libbsc/paging.c index e19c2d1c4..02212a352 100644 --- a/src/libbsc/paging.c +++ b/src/libbsc/paging.c @@ -50,7 +50,6 @@ #include <openbsc/gsm_data.h> #include <openbsc/chan_alloc.h> #include <openbsc/bsc_api.h> -#include <openbsc/vlr.h> void *tall_paging_ctx; diff --git a/src/libbsc/system_information.c b/src/libbsc/system_information.c index dcabbbdd1..fe0b23d02 100644 --- a/src/libbsc/system_information.c +++ b/src/libbsc/system_information.c @@ -30,13 +30,15 @@ #include <osmocom/core/bitvec.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/sysinfo.h> +#include <osmocom/gsm/gsm48_ie.h> +#include <osmocom/gsm/gsm48.h> #include <openbsc/debug.h> -#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_rsl.h> #include <openbsc/rest_octets.h> #include <openbsc/arfcn_range_encode.h> +#include <openbsc/gsm_04_08_utils.h> /* * DCS1800 and PCS1900 have overlapping ARFCNs. We would need to set the |