Change in libosmocore[master]: gprs_ns2: remove the nsvc fsm timer when cleaning up the fsm

[lynxis lazus]

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20933 )

Change subject: gprs_ns2: remove the nsvc fsm timer when cleaning up the fsm
......................................................................

gprs_ns2: remove the nsvc fsm timer when cleaning up the fsm

Change-Id: I9c7f767077ed2e354d0980a9f11246c1151c65e2
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  fixeria: Looks good to me, but someone else must approve
  lynxis lazus: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index d13f1ce..451437f 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -540,6 +540,14 @@
 	}
 }
 
+static void gprs_ns2_vc_fsm_clean(struct osmo_fsm_inst *fi,
+				  enum osmo_fsm_term_cause cause)
+{
+	struct gprs_ns2_vc_priv *priv = fi->priv;
+
+	osmo_timer_del(&priv->alive.timer);
+}
+
 static struct osmo_fsm gprs_ns2_vc_fsm = {
 	.name = "GPRS-NS2-VC",
 	.states = gprs_ns2_vc_states,
@@ -549,7 +557,7 @@
 			       S(GPRS_NS2_EV_ALIVE) |
 			       S(GPRS_NS2_EV_ALIVE_ACK),
 	.allstate_action = gprs_ns2_vc_fsm_allstate_action,
-	.cleanup = NULL,
+	.cleanup = gprs_ns2_vc_fsm_clean,
 	.timer_cb = gprs_ns2_vc_fsm_timer_cb,
 	/* .log_subsys = DNS, "is not constant" */
 	.event_names = gprs_ns2_vc_event_names,

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I9c7f767077ed2e354d0980a9f11246c1151c65e2
Gerrit-Change-Number: 20933
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201027/5dc07c6e/attachment.htm>