<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16388">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">check for osmo_fsm_register() failures and propagate error<br><br>Change-Id: Id8861144e4880383a173b7e6ae7860beebac09d9<br>---<br>M examples/sccp_demo_user.c<br>M src/osmo_ss7.c<br>M stp/stp_main.c<br>M tests/ss7/ss7_test.c<br>M tests/vty/ss7_asp_vty_test.c<br>5 files changed, 22 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c</span><br><span>index 28dd166..b55b50c 100644</span><br><span>--- a/examples/sccp_demo_user.c</span><br><span>+++ b/examples/sccp_demo_user.c</span><br><span>@@ -230,7 +230,7 @@</span><br><span>  signal(SIGUSR2, &signal_handler);</span><br><span> </span><br><span>    init_logging();</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ss7_init();</span><br><span style="color: hsl(120, 100%, 40%);">+      OSMO_ASSERT(osmo_ss7_init() == 0);</span><br><span>   osmo_fsm_log_addr(false);</span><br><span>    vty_init(&vty_info);</span><br><span>     osmo_ss7_vty_init_asp(NULL);</span><br><span>diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index a07fbed..1ca8b5e 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -2061,13 +2061,26 @@</span><br><span> </span><br><span> int osmo_ss7_init(void)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+       int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    if (ss7_initialized)</span><br><span>                 return 1;</span><br><span style="color: hsl(0, 100%, 40%);">-       osmo_fsm_register(&sccp_scoc_fsm);</span><br><span style="color: hsl(0, 100%, 40%);">-  osmo_fsm_register(&xua_as_fsm);</span><br><span style="color: hsl(0, 100%, 40%);">-     osmo_fsm_register(&xua_asp_fsm);</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_fsm_register(&ipa_asp_fsm);</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_fsm_register(&xua_default_lm_fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+   rc = osmo_fsm_register(&sccp_scoc_fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+    rc = osmo_fsm_register(&xua_as_fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+    rc = osmo_fsm_register(&xua_asp_fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+    rc = osmo_fsm_register(&ipa_asp_fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+    rc = osmo_fsm_register(&xua_default_lm_fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         ss7_initialized = true;</span><br><span>      return 0;</span><br><span> }</span><br><span>diff --git a/stp/stp_main.c b/stp/stp_main.c</span><br><span>index 4cc2586..3923ed2 100644</span><br><span>--- a/stp/stp_main.c</span><br><span>+++ b/stp/stp_main.c</span><br><span>@@ -175,7 +175,7 @@</span><br><span>    fputs(stp_copyright, stdout);</span><br><span>        fputs("\n", stdout);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      osmo_ss7_init();</span><br><span style="color: hsl(120, 100%, 40%);">+      OSMO_ASSERT(osmo_ss7_init() == 0);</span><br><span>   osmo_fsm_log_addr(false);</span><br><span>    logging_vty_add_cmds();</span><br><span>      osmo_stats_vty_add_cmds();</span><br><span>diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c</span><br><span>index a3f47b6..ae96a4b 100644</span><br><span>--- a/tests/ss7/ss7_test.c</span><br><span>+++ b/tests/ss7/ss7_test.c</span><br><span>@@ -302,7 +302,7 @@</span><br><span>        osmo_fsm_log_addr(false);</span><br><span> </span><br><span>        /* init */</span><br><span style="color: hsl(0, 100%, 40%);">-      osmo_ss7_init();</span><br><span style="color: hsl(120, 100%, 40%);">+      OSMO_ASSERT(osmo_ss7_init() == 0);</span><br><span>   s7i = osmo_ss7_instance_find_or_create(NULL, 0);</span><br><span>     OSMO_ASSERT(osmo_ss7_instance_find(0) == s7i);</span><br><span>       OSMO_ASSERT(osmo_ss7_instance_find(23) == NULL);</span><br><span>diff --git a/tests/vty/ss7_asp_vty_test.c b/tests/vty/ss7_asp_vty_test.c</span><br><span>index 76ffcf2..eb575bc 100644</span><br><span>--- a/tests/vty/ss7_asp_vty_test.c</span><br><span>+++ b/tests/vty/ss7_asp_vty_test.c</span><br><span>@@ -164,7 +164,7 @@</span><br><span>  osmo_init_logging2(root_ctx, &log_info);</span><br><span>         logging_vty_add_cmds();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     osmo_ss7_init();</span><br><span style="color: hsl(120, 100%, 40%);">+      OSMO_ASSERT(osmo_ss7_init() == 0);</span><br><span>   osmo_ss7_vty_init_asp(root_ctx);</span><br><span>     osmo_sccp_vty_init();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16388">change 16388</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16388"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id8861144e4880383a173b7e6ae7860beebac09d9 </div>
<div style="display:none"> Gerrit-Change-Number: 16388 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>