<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21452">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OML: ip.access: move NSVC MO into a fsm<br><br>It now waits for feature negotiation before configuring<br>the NSVC MO.<br><br>Todo: need to be tested with nanobts!<br>Change-Id: I381472532c2622a8dba7c81ae00ea873c2e58ae1<br>---<br>M include/osmocom/bsc/nm_common_fsm.h<br>M src/ipaccess/Makefile.am<br>M src/osmo-bsc/Makefile.am<br>M src/osmo-bsc/abis_nm.c<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c<br>A src/osmo-bsc/nm_nsvc_fsm.c<br>M src/utils/Makefile.am<br>M tests/abis/Makefile.am<br>M tests/acc/Makefile.am<br>M tests/bsc/Makefile.am<br>M tests/gsm0408/Makefile.am<br>M tests/handover/Makefile.am<br>M tests/nanobts_omlattr/Makefile.am<br>15 files changed, 412 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/21452/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/nm_common_fsm.h b/include/osmocom/bsc/nm_common_fsm.h</span><br><span>index 00031fb..58bc8c9 100644</span><br><span>--- a/include/osmocom/bsc/nm_common_fsm.h</span><br><span>+++ b/include/osmocom/bsc/nm_common_fsm.h</span><br><span>@@ -35,6 +35,7 @@</span><br><span> NM_EV_OPSTART_NACK,</span><br><span> NM_EV_OML_DOWN,</span><br><span> NM_EV_FORCE_LOCK, /* Only supported by RadioCarrier so far */</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_EV_FEATURE_NEGOTIATED,</span><br><span> };</span><br><span> extern const struct value_string nm_fsm_event_names[];</span><br><span> </span><br><span>@@ -82,3 +83,12 @@</span><br><span> NM_CHAN_ST_OP_ENABLED,</span><br><span> };</span><br><span> extern struct osmo_fsm nm_chan_fsm;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* NSVC */</span><br><span style="color: hsl(120, 100%, 40%);">+enum nm_nsvc_fsm_states {</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_NSVC_ST_OP_DISABLED_NOTINSTALLED,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_NSVC_ST_OP_DISABLED_DEPENDENCY,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_NSVC_ST_OP_DISABLED_OFFLINE,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_NSVC_ST_OP_ENABLED,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct osmo_fsm nm_nsvc_fsm;</span><br><span>diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am</span><br><span>index 1574a8b..a39186b 100644</span><br><span>--- a/src/ipaccess/Makefile.am</span><br><span>+++ b/src/ipaccess/Makefile.am</span><br><span>@@ -59,6 +59,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/nm_nsvc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span> $(OSMO_LIBS) \</span><br><span> $(NULL)</span><br><span>@@ -80,6 +81,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/nm_nsvc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span> $(OSMO_LIBS) \</span><br><span> $(NULL)</span><br><span>diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am</span><br><span>index 5739885..51292d7 100644</span><br><span>--- a/src/osmo-bsc/Makefile.am</span><br><span>+++ b/src/osmo-bsc/Makefile.am</span><br><span>@@ -81,6 +81,7 @@</span><br><span> nm_bts_sm_fsm.c \</span><br><span> nm_bts_fsm.c \</span><br><span> nm_channel_fsm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm.c \</span><br><span> nm_rcarrier_fsm.c \</span><br><span> gsm_08_08.c \</span><br><span> osmo_bsc_bssap.c \</span><br><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index dab5bb6..b0ef649 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -49,6 +49,7 @@</span><br><span> #include <osmocom/abis/e1_input.h></span><br><span> #include <osmocom/bsc/chan_alloc.h></span><br><span> #include <osmocom/bsc/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/nm_common_fsm.h></span><br><span> #include <osmocom/gsm/bts_features.h></span><br><span> </span><br><span> #define OM_ALLOC_SIZE 1024</span><br><span>@@ -598,6 +599,8 @@</span><br><span> }</span><br><span> </span><br><span> bts->ip_access.feature_negotiated = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bts->gprs.nsvc[i].mo.fi, NM_EV_FEATURE_NEGOTIATED, NULL);</span><br><span> }</span><br><span> </span><br><span> /* Parse Attribute Response Info content for 3GPP TS 52.021 ยง9.4.28 Manufacturer Dependent State */</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 065b8ab..6837925 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -195,6 +195,10 @@</span><br><span> for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) {</span><br><span> bts->gprs.nsvc[i].bts = bts;</span><br><span> bts->gprs.nsvc[i].id = i;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.nsvc[i].mo.fi = osmo_fsm_inst_alloc(</span><br><span style="color: hsl(120, 100%, 40%);">+ &nm_nsvc_fsm, bts, &bts->gprs.nsvc[i],</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGL_INFO, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_update_id_f(bts->mo.fi, "bts%d-nsvc%d", bts->nr, i);</span><br><span> gsm_mo_init(&bts->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC,</span><br><span> bts->nr, i, 0xff);</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index 32823bb..e397c5f 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -214,30 +214,12 @@</span><br><span> bts = nsvc->bts;</span><br><span> if (bts->gprs.mode == BTS_GPRS_NONE)</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* We skip NSVC1 since we only use NSVC0 */</span><br><span> if (nsvc->id == 1)</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_IPV6_NSVC) &&</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->remote.u.sa.sa_family == AF_INET6) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_ERROR, "BTS %d does not support IPv6 but an IPv6 address was configured!\n", bts->nr);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if ((new_state->availability == NM_AVSTATE_OFF_LINE) ||</span><br><span style="color: hsl(0, 100%, 40%);">- (new_state->availability == NM_AVSTATE_DEPENDENCY)) {</span><br><span style="color: hsl(0, 100%, 40%);">- msgb = nanobts_attr_nscv_get(bts);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!msgb)</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_ipaccess_set_attr(bts, obj_class, bts->bts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->id, 0xff,</span><br><span style="color: hsl(0, 100%, 40%);">- msgb->data, msgb->len);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msgb);</span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_chg_adm_state(bts, obj_class, bts->bts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->id, 0xff,</span><br><span style="color: hsl(0, 100%, 40%);">- NM_STATE_UNLOCKED);</span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_opstart(bts, obj_class, bts->bts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->id, 0xff);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_STATE_CHG_REP, nsd);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>index 6d64a4b..48dd613 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>@@ -202,6 +202,13 @@</span><br><span> {</span><br><span> struct msgb *msgb;</span><br><span> uint8_t buf[256];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_IPV6_NSVC) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.nsvc[0].remote.u.sa.sa_family == AF_INET6) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_ERROR, "BTS %d does not support IPv6 but an IPv6 address was configured!\n", bts->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msgb = msgb_alloc(1024, "nanobts_attr_bts");</span><br><span> if (!msgb)</span><br><span> return NULL;</span><br><span>diff --git a/src/osmo-bsc/nm_nsvc_fsm.c b/src/osmo-bsc/nm_nsvc_fsm.c</span><br><span>new file mode 100644</span><br><span>index 0000000..131fb54</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo-bsc/nm_nsvc_fsm.c</span><br><span>@@ -0,0 +1,374 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* NM NSVC FSM */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2020 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * Author: Alexander Couzens <lynxis@fe80.eu></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * based on the nm_bts_fsm.c</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/tdef.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_12_21.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/signal.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/abis_nm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/nm_common_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/debug.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define X(s) (1 << (s))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define nm_nsvc_fsm_state_chg(fi, NEXT_STATE) \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+//////////////////////////</span><br><span style="color: hsl(120, 100%, 40%);">+// FSM STATE ACTIONS</span><br><span style="color: hsl(120, 100%, 40%);">+//////////////////////////</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_gprs_nsvc *nsvc = (struct gsm_bts_gprs_nsvc *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_ack_received = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.adm_unlock_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.opstart_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nm_statechg_signal_data *nsd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_nm_state *new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SW_ACT_REP:</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_FEATURE_NEGOTIATED:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_STATE_CHG_REP:</span><br><span style="color: hsl(120, 100%, 40%);">+ nsd = (struct nm_statechg_signal_data *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ new_state = nsd->new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_state->operational == NM_OPSTATE_ENABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*should not happen... */</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_ENABLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (new_state->availability) { /* operational = DISABLED */</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_DEPENDENCY);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_OFF_LINE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_OK:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_OFFLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void configure_loop(struct gsm_bts_gprs_nsvc *nsvc, struct gsm_nm_state *state, bool allow_opstart) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msgb;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nsvc->mo.set_attr_sent && !nsvc->mo.set_attr_ack_received) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* IPv6 require to wait for negotiated features */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->bts->ip_access.feature_dynamic &&</span><br><span style="color: hsl(120, 100%, 40%);">+ !nsvc->bts->ip_access.feature_negotiated)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_sent = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb = nanobts_attr_nscv_get(nsvc->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_nm_ipaccess_set_attr(nsvc->bts, NM_OC_GPRS_NSVC, nsvc->bts->bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->id, 0xff,</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb->data, msgb->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msgb);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (state->administrative != NM_STATE_UNLOCKED && !nsvc->mo.adm_unlock_sent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.adm_unlock_sent = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_nm_chg_adm_state(nsvc->bts, NM_OC_GPRS_NSVC,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->bts->bts_nr, nsvc->id, 0xff,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_STATE_UNLOCKED);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (allow_opstart && state->administrative == NM_STATE_UNLOCKED &&</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_ack_received) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nsvc->mo.opstart_sent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.opstart_sent = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_nm_opstart(nsvc->bts, NM_OC_GPRS_NSVC, nsvc->bts->bts_nr, nsvc->id, 0xff);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_gprs_nsvc *nsvc = (struct gsm_bts_gprs_nsvc *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* nanoBTS is broken, doesn't follow TS 12.21. Opstart MUST be sent</span><br><span style="color: hsl(120, 100%, 40%);">+ during Dependency, so we simply move to OFFLINE state here to avoid</span><br><span style="color: hsl(120, 100%, 40%);">+ duplicating code */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->bts->site_mgr.peer_has_no_avstate_offline) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_OFFLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_loop(nsvc, &nsvc->mo.nm_state, false);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_gprs_nsvc *nsvc = (struct gsm_bts_gprs_nsvc *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nm_statechg_signal_data *nsd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_nm_state *new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_FEATURE_NEGOTIATED:</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_loop(nsvc, &nsvc->mo.nm_state, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SET_ATTR_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_ack_received = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_loop(nsvc, &nsvc->mo.nm_state, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_STATE_CHG_REP:</span><br><span style="color: hsl(120, 100%, 40%);">+ nsd = (struct nm_statechg_signal_data *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ new_state = nsd->new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_state->operational == NM_OPSTATE_ENABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* should not happen... */</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_ENABLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (new_state->availability) { /* operational = DISABLED */</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_NOT_INSTALLED:</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_POWER_OFF:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_OFF_LINE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_OK:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_OFFLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_loop(nsvc, new_state, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_offline_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_gprs_nsvc *nsvc = (struct gsm_bts_gprs_nsvc *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Warning: In here we may be acessing an state older than new_state</span><br><span style="color: hsl(120, 100%, 40%);">+ from prev (syncrhonous) FSM state */</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_loop(nsvc, &nsvc->mo.nm_state, true);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_gprs_nsvc *nsvc = (struct gsm_bts_gprs_nsvc *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nm_statechg_signal_data *nsd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_nm_state *new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_FEATURE_NEGOTIATED:</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_loop(nsvc, &nsvc->mo.nm_state, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_SET_ATTR_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_ack_received = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_loop(nsvc, &nsvc->mo.nm_state, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_STATE_CHG_REP:</span><br><span style="color: hsl(120, 100%, 40%);">+ nsd = (struct nm_statechg_signal_data *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ new_state = nsd->new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_state->operational == NM_OPSTATE_ENABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_ENABLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (new_state->availability) { /* operational = DISABLED */</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_NOT_INSTALLED:</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_POWER_OFF:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* There's no point in moving back to Dependency, since it's broken</span><br><span style="color: hsl(120, 100%, 40%);">+ and it acts actually as if it was in Offline state */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nsvc->bts->site_mgr.peer_has_no_avstate_offline) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_DEPENDENCY);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Moreover, in nanoBTS we need to check here for tx</span><br><span style="color: hsl(120, 100%, 40%);">+ Opstart since we may have gone Unlocked state</span><br><span style="color: hsl(120, 100%, 40%);">+ in this event, which means Opstart may be txed here. */</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_loop(nsvc, new_state, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_OFF_LINE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_OK:</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_loop(nsvc, new_state, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_enabled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_gprs_nsvc *nsvc = (struct gsm_bts_gprs_nsvc *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Reset state, we don't need it in this state and it will need to be</span><br><span style="color: hsl(120, 100%, 40%);">+ reused as soon as we move back to Disabled */</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.opstart_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.adm_unlock_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.set_attr_ack_received = false;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nm_statechg_signal_data *nsd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_nm_state *new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_STATE_CHG_REP:</span><br><span style="color: hsl(120, 100%, 40%);">+ nsd = (struct nm_statechg_signal_data *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ new_state = nsd->new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_state->operational == NM_OPSTATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (new_state->availability) { /* operational = DISABLED */</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_NOT_INSTALLED:</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_POWER_OFF:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_DEPENDENCY);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_OFF_LINE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_AVSTATE_OK:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_OFFLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_op_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_gprs_nsvc *nsvc = (struct gsm_bts_gprs_nsvc *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_OPSTART_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_OPSTART_NACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: if on state OFFLINE and rx NACK, try again? */</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->mo.opstart_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_EV_OML_DOWN:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_nsvc_fsm_state_chg(fi, NM_NSVC_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_fsm_state nm_nsvc_fsm_states[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [NM_NSVC_ST_OP_DISABLED_NOTINSTALLED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_SW_ACT_REP) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_STATE_CHG_REP) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_FEATURE_NEGOTIATED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_DISABLED_DEPENDENCY) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_DISABLED_OFFLINE) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_ENABLED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DISABLED_NOTINSTALLED",</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = st_op_disabled_notinstalled_on_enter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_op_disabled_notinstalled,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [NM_NSVC_ST_OP_DISABLED_DEPENDENCY] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_STATE_CHG_REP) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_SET_ATTR_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_FEATURE_NEGOTIATED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_DISABLED_OFFLINE) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_ENABLED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DISABLED_DEPENDENCY",</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = st_op_disabled_dependency_on_enter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_op_disabled_dependency,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [NM_NSVC_ST_OP_DISABLED_OFFLINE] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_STATE_CHG_REP) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_SET_ATTR_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_FEATURE_NEGOTIATED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_DISABLED_DEPENDENCY) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_ENABLED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DISABLED_OFFLINE",</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = st_op_disabled_offline_on_enter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_op_disabled_offline,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [NM_NSVC_ST_OP_ENABLED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_STATE_CHG_REP),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_DISABLED_DEPENDENCY) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_NSVC_ST_OP_DISABLED_OFFLINE),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "ENABLED",</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = st_op_enabled_on_enter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_op_enabled,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_fsm nm_nsvc_fsm = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "NM_NSVC_OP",</span><br><span style="color: hsl(120, 100%, 40%);">+ .states = nm_nsvc_fsm_states,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_states = ARRAY_SIZE(nm_nsvc_fsm_states),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_OPSTART_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_OPSTART_NACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_OML_DOWN),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_action = st_op_allstate,</span><br><span style="color: hsl(120, 100%, 40%);">+ .event_names = nm_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ .log_subsys = DNM,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static __attribute__((constructor)) void nm_nsvc_fsm_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(osmo_fsm_register(&nm_nsvc_fsm) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am</span><br><span>index 65fd8fa..6a3ab00 100644</span><br><span>--- a/src/utils/Makefile.am</span><br><span>+++ b/src/utils/Makefile.am</span><br><span>@@ -61,6 +61,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/nm_nsvc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span>@@ -138,6 +139,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/nm_nsvc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span>diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am</span><br><span>index d7d53b7..f13d64a 100644</span><br><span>--- a/tests/abis/Makefile.am</span><br><span>+++ b/tests/abis/Makefile.am</span><br><span>@@ -37,6 +37,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/nm_nsvc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOABIS_LIBS) \</span><br><span>diff --git a/tests/acc/Makefile.am b/tests/acc/Makefile.am</span><br><span>index b1315e3..c8399c2 100644</span><br><span>--- a/tests/acc/Makefile.am</span><br><span>+++ b/tests/acc/Makefile.am</span><br><span>@@ -37,6 +37,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/nm_nsvc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOABIS_LIBS) \</span><br><span>diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am</span><br><span>index f040cbc..8f6893f 100644</span><br><span>--- a/tests/bsc/Makefile.am</span><br><span>+++ b/tests/bsc/Makefile.am</span><br><span>@@ -51,6 +51,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/nm_nsvc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span>diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am</span><br><span>index de38747..75ad1b5 100644</span><br><span>--- a/tests/gsm0408/Makefile.am</span><br><span>+++ b/tests/gsm0408/Makefile.am</span><br><span>@@ -40,6 +40,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/nm_nsvc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span>diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am</span><br><span>index 42bb937..b4d40c1 100644</span><br><span>--- a/tests/handover/Makefile.am</span><br><span>+++ b/tests/handover/Makefile.am</span><br><span>@@ -85,6 +85,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/nm_nsvc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/osmo_bsc_ctrl.o \</span><br><span> $(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \</span><br><span>diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am</span><br><span>index 3dd7f2f..7fd6ed3 100644</span><br><span>--- a/tests/nanobts_omlattr/Makefile.am</span><br><span>+++ b/tests/nanobts_omlattr/Makefile.am</span><br><span>@@ -34,6 +34,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/nm_nsvc_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21452">change 21452</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/osmo-bsc/+/21452"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I381472532c2622a8dba7c81ae00ea873c2e58ae1 </div>
<div style="display:none"> Gerrit-Change-Number: 21452 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>