From 78826da96a0c47d926d76add6337392ffd748f27 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 26 Nov 2020 01:00:39 +0000 Subject: tmp Change-Id: I95ec3fbf6656424d67247d7855c692e50a513a31 --- src/osmo-bsc/bsc_vty.c | 1 + src/osmo-bsc/gsm_04_08_rr.c | 2 ++ src/osmo-bsc/lchan_fsm.c | 4 ++++ src/osmo-bsc/osmo_bsc_main.c | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index d8e968252..c6e49b51f 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4209,6 +4209,7 @@ static void get_amr_start_from_arg(struct vty *vty, const char *argv[], int full else mr_conf->smod = atoi(argv[0]) - 1; } + LOGP(DRR, LOGL_ERROR, "XXXXX vty: bts %d mr IE = %s\n", bts->nr, osmo_hexdump(mr->gsm48_ie, 2)); } /* Give the current amr configuration a final consistency check by feeding the diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index a44812618..829797d9e 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -414,6 +414,8 @@ int gsm48_multirate_config(uint8_t *lv, uint8_t *gsm48_ie = (uint8_t *) mr_conf; const struct amr_mode *modes_selected[4]; + LOGP(DRR, LOGL_ERROR, "XXXXX gsm48_multirate_config() mr IE = %s\n", osmo_hexdump(gsm48_ie, 2)); + /* Check if modes for consistency (order and duplicates) */ for (i = 0; i < num_modes; i++) { if (i > 0 && modes[i - 1].mode > modes[i].mode) { diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 190364557..0e2b5d01d 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -517,6 +517,10 @@ static int lchan_mr_config(struct gsm_lchan *lchan, uint16_t s15_s0) mr_conf_filtered.icmi = mr_conf_bts->icmi; mr_conf_filtered.smod = mr_conf_bts->smod; + LOG_LCHAN(lchan, LOGL_ERROR, "XXXXXXXXX lchan_mr_config() mr = %s mr_conf_filtered.icmi = %d\n", + osmo_hexdump(mr->gsm48_ie, 2), mr_conf_filtered.icmi); + + /* Proceed with the generation of the multirate configuration IE * (MS and BTS) */ rc = gsm48_multirate_config(lchan->mr_ms_lv, &mr_conf_filtered, mr->ms_mode, mr->num_modes); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index cc02c71fa..51c427875 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -691,7 +691,7 @@ static void signal_handler(int signum) case SIGTERM: bsc_shutdown_net(bsc_gsmnet); osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); - sleep(3); + //sleep(3); exit(0); break; case SIGABRT: -- cgit v1.2.3