aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2018-07-17 18:35:05 +0200
committerHarald Welte <laforge@gnumonks.org>2018-07-29 14:35:00 +0000
commit49865053bc47c00ea50b6cee2eeecf61c2dd2fdb (patch)
tree0b1d11e69bec461d7a74997b620761e23bf0d742
parent95fdbc14ffaff5f5dd8fffadc4264f41fc621085 (diff)
ctrl/vty: fsm: use correct element when iterating over fsm->proc.children
Fixes crashes when using vty `show fsm-instances all` when fsm children are present. Change-Id: I4ae0bee7f7f57ec6675cfb52ca6cf0d523d15362
-rw-r--r--src/ctrl/fsm_ctrl_commands.c2
-rw-r--r--src/vty/fsm_vty.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ctrl/fsm_ctrl_commands.c b/src/ctrl/fsm_ctrl_commands.c
index 3c7e1bd..c93d3a5 100644
--- a/src/ctrl/fsm_ctrl_commands.c
+++ b/src/ctrl/fsm_ctrl_commands.c
@@ -156,7 +156,7 @@ static int get_fsm_inst_dump(struct ctrl_cmd *cmd, void *data)
if (fi->proc.parent)
cmd->reply = talloc_asprintf_append(cmd->reply, ",parent='%s'", fi->proc.parent->name);
- llist_for_each_entry(child, &fi->proc.children, list) {
+ llist_for_each_entry(child, &fi->proc.children, proc.child) {
cmd->reply = talloc_asprintf_append(cmd->reply, ",child='%s'", child->name);
}
diff --git a/src/vty/fsm_vty.c b/src/vty/fsm_vty.c
index 8628d15..9bde241 100644
--- a/src/vty/fsm_vty.c
+++ b/src/vty/fsm_vty.c
@@ -102,7 +102,7 @@ void vty_out_fsm_inst(struct vty *vty, struct osmo_fsm_inst *fsmi)
fsmi->proc.parent_term_event),
VTY_NEWLINE);
}
- llist_for_each_entry(child, &fsmi->proc.children, list) {
+ llist_for_each_entry(child, &fsmi->proc.children, proc.child) {
vty_out(vty, " Child: '%s'%s", child->name, VTY_NEWLINE);
}
}