diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-12-17 13:35:52 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-03-17 15:22:51 +0100 |
| commit | 553535f87b490a8b8a2ab2633417ab7c286907bd (patch) | |
| tree | b9d970393d6b191494c88778cd13d403a620b046 /src/common/oml.c | |
| parent | 6d0c67684c4ea8e1f767310636dbe840c36d54e2 (diff) | |
Add 'osmo-bts-omldummy' to bring up only OML without RSL
This is used only in integration testing, where in the TTCN-3 testsuite
we currently have no A-bis OML implementation, but only a RSL one.
Change-Id: Id8e5f34091e6e32621d8c8673de7ea848dfd252f
Diffstat (limited to 'src/common/oml.c')
| -rw-r--r-- | src/common/oml.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/common/oml.c b/src/common/oml.c index 139210ed..9dccdfdf 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -173,7 +173,7 @@ static inline void add_trx_attr(struct msgb *msg, struct gsm_bts_trx *trx) { const struct phy_instance *pinst = trx_phy_instance(trx); - abis_nm_put_sw_file(msg, btsatttr2str(TRX_PHY_VERSION), strlen(pinst->version) ? pinst->version : "Unknown", + abis_nm_put_sw_file(msg, btsatttr2str(TRX_PHY_VERSION), pinst && strlen(pinst->version) ? pinst->version : "Unknown", true); } @@ -1362,8 +1362,11 @@ static int rx_oml_ipa_rsl_connect(struct gsm_bts_trx *trx, struct msgb *msg, LOGP(DOML, LOGL_INFO, "Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", inet_ntoa(in), port, stream_id); - rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, inet_ntoa(in), port, - trx->nr); + if (trx->bts->variant != BTS_OSMO_OMLDUMMY) { + rc = 0; + LOGP(DOML, LOGL_NOTICE, "Not connecting RSL in OML-DUMMY!\n"); + } else + rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, inet_ntoa(in), port, trx->nr); if (rc < 0) { LOGP(DOML, LOGL_ERROR, "Error in abis_open(RSL): %d\n", rc); return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); |