Change in libosmocore[master]: ctrl/vty: fsm: use correct element when iterating over fsm->proc.chil...

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10031


Change subject: ctrl/vty: fsm: use correct element when iterating over fsm->proc.children
......................................................................

ctrl/vty: fsm: use correct element when iterating over fsm->proc.children

Fixes crashs when using vty `show fsm-instances all`
when fsm childs are present.

Change-Id: I4ae0bee7f7f57ec6675cfb52ca6cf0d523d15362
---
M src/ctrl/fsm_ctrl_commands.c
M src/vty/fsm_vty.c
2 files changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/10031/1

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 @@
 	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 @@
 					    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);
 	}
 }

-- 
To view, visit https://gerrit.osmocom.org/10031
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ae0bee7f7f57ec6675cfb52ca6cf0d523d15362
Gerrit-Change-Number: 10031
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180717/724b952c/attachment.htm>