aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2020-05-05 20:03:22 +0200
committerSylvain Munaut <tnt@246tNt.com>2020-05-05 21:15:49 +0200
commite619675d8408aab3a09e56e2267de51f2c113a7d (patch)
tree9f70b9b7bcb4a36c8190c9d6b46a87ccf0ebc564
parent1d7349ffc9aaab2bd144d670af35616a972227c2 (diff)
om2k: Don't use slashes in FSM IDs and use dashes instead
slashes are invalid so we can't use om2k_mo_name() directly, so we just build it manually with dashes. Signed-off-by: Sylvain Munaut <tnt@246tNt.com> Change-Id: I3cfc19670e6d7bb607d796cabcee5e86a15d1985
-rw-r--r--src/osmo-bsc/abis_om2000.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c
index b221441ff..d5eb24a2c 100644
--- a/src/osmo-bsc/abis_om2000.c
+++ b/src/osmo-bsc/abis_om2000.c
@@ -1880,8 +1880,9 @@ struct osmo_fsm_inst *om2k_mo_fsm_start(struct osmo_fsm_inst *parent,
struct om2k_mo_fsm_priv *omfp;
char idbuf[64];
- snprintf(idbuf, sizeof(idbuf), "%s-%s", parent->id,
- om2k_mo_name(&mo->addr));
+ snprintf(idbuf, sizeof(idbuf), "%s-%s-%02x-%02x-%02x", parent->id,
+ get_value_string(om2k_mo_class_short_vals, mo->addr.class),
+ mo->addr.bts, mo->addr.assoc_so, mo->addr.inst);
fi = osmo_fsm_inst_alloc_child_id(&om2k_mo_fsm, parent,
term_event, idbuf);
@@ -2143,7 +2144,7 @@ struct osmo_fsm_inst *om2k_trx_fsm_start(struct osmo_fsm_inst *parent,
struct om2k_trx_fsm_priv *otfp;
char idbuf[32];
- snprintf(idbuf, sizeof(idbuf), "%u/%u", trx->bts->nr, trx->nr);
+ snprintf(idbuf, sizeof(idbuf), "%u-%u", trx->bts->nr, trx->nr);
fi = osmo_fsm_inst_alloc_child_id(&om2k_trx_fsm, parent, term_event,
idbuf);