neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32039 )

Change subject: log: in new RUA,SCCP FSM IDs, indicate CS/PS ......................................................................

log: in new RUA,SCCP FSM IDs, indicate CS/PS

During tests without an SGSN, I noticed SCCP connections failing, and I also noticed that I couldn't tell if they were CS or PS related. Add a "CS"/"PS" indicator to FSM instance IDs for RUA and SCCP.

Change-Id: I5b8242196af3b08eaf64ca5ac1c257a97a5d02cb --- M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c 2 files changed, 17 insertions(+), 2 deletions(-)

Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved

diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index 980fad2..12a428b 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -72,7 +72,8 @@ { struct osmo_fsm_inst *fi = osmo_fsm_inst_alloc(&map_rua_fsm, map, map, LOGL_DEBUG, NULL); OSMO_ASSERT(fi); - osmo_fsm_inst_update_id_f_sanitize(fi, '-', "%s-RUA-%u", hnb_context_name(map->hnb_ctx), map->rua_ctx_id); + osmo_fsm_inst_update_id_f_sanitize(fi, '-', "%s-%s-RUA-%u", hnb_context_name(map->hnb_ctx), + map->is_ps ? "PS" : "CS", map->rua_ctx_id);

OSMO_ASSERT(map->rua_fi == NULL); map->rua_fi = fi; diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index cea0817..65939f3 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -78,7 +78,8 @@ { struct osmo_fsm_inst *fi = osmo_fsm_inst_alloc(&map_sccp_fsm, map, map, LOGL_DEBUG, NULL); OSMO_ASSERT(fi); - osmo_fsm_inst_update_id_f_sanitize(fi, '-', "%s-SCCP-%u", hnb_context_name(map->hnb_ctx), map->scu_conn_id); + osmo_fsm_inst_update_id_f_sanitize(fi, '-', "%s-%s-SCCP-%u", hnb_context_name(map->hnb_ctx), + map->is_ps ? "PS" : "CS", map->scu_conn_id);

OSMO_ASSERT(map->sccp_fi == NULL); map->sccp_fi = fi;