diff options
author | Andreas Eversberg <jolly@eversberg.eu> | 2013-02-05 16:47:57 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2015-09-22 16:41:25 +0200 |
commit | 7a0d11dd68528d96afff61083c3cf90a50af11bb (patch) | |
tree | f026dcdae8b564b6e0d197e7822b5a11a99dcc9a /src | |
parent | cd0581d815f76dd159406a2e797ad554df82c761 (diff) |
ABIS: Introduce bts_model_abis_close to indicate ABIS link failure.
sysmocom-bts model shuts down on link loss, but other models may not want
this, so shutdown is moved tor bts_model_abis_close of osmo-bts-sysmo.
Diffstat (limited to 'src')
-rw-r--r-- | src/common/abis.c | 3 | ||||
-rw-r--r-- | src/common/bts.c | 2 | ||||
-rw-r--r-- | src/osmo-bts-sysmo/main.c | 6 | ||||
-rw-r--r-- | src/osmo-bts-trx/main.c | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/src/common/abis.c b/src/common/abis.c index 3b9bcdd2..3b8a7af1 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -47,6 +47,7 @@ #include <osmo-bts/bts.h> #include <osmo-bts/rsl.h> #include <osmo-bts/oml.h> +#include <osmo-bts/bts_model.h> static struct gsm_bts *g_bts; @@ -114,7 +115,7 @@ static void sign_link_down(struct e1inp_line *line) e1inp_sign_link_destroy(g_bts->oml_link); g_bts->oml_link = NULL; - bts_shutdown(g_bts, "Abis close"); + bts_model_abis_close(g_bts); } diff --git a/src/common/bts.c b/src/common/bts.c index 77302e2f..3fa2bddc 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -242,6 +242,8 @@ int trx_link_estab(struct gsm_bts_trx *trx) if (link) rsl_tx_rf_res(trx); + else + bts_model_trx_deact_rf(trx); return 0; } diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 72c8cfd7..bee5bda2 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -420,3 +420,9 @@ int main(int argc, char **argv) osmo_select_main(0); } } + +void bts_model_abis_close(struct gsm_bts *bts) +{ + /* for now, we simply terminate the program and re-spawn */ + bts_shutdown(bts, "Abis close"); +} diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 1b3359aa..4e942499 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -400,3 +400,6 @@ int main(int argc, char **argv) return 0; } +void bts_model_abis_close(struct gsm_bts *bts) +{ +} |