[MERGED] osmo-msc[master]: vlr: fix post-auth LU failure handling

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: vlr: fix post-auth LU failure handling
......................................................................


vlr: fix post-auth LU failure handling

>From the vlr_loc_update() FSM, don't call the vlr_lu_compl_fsm_failure()
function. These are two distinct FSMs with distinct priv pointers, but they are
defined in the same .c file.

In vlr_loc_upd_post_auth(), change two erratic calls of
vlr_lu_compl_fsm_failure() to lu_fsm_failure(), so that the proper fi and priv
struct are used.

Fixes: OS#2947
Change-Id: I7fd2c6fa23254fffd0d526e53541f4068153929f
---
M src/libvlr/vlr_lu_fsm.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c
index 25deeb6..d0500c4 100644
--- a/src/libvlr/vlr_lu_fsm.c
+++ b/src/libvlr/vlr_lu_fsm.c
@@ -830,7 +830,7 @@
 
 	if (!vsub->last_tuple) {
 		LOGPFSML(fi, LOGL_ERROR, "No auth tuple available\n");
-		vlr_lu_compl_fsm_failure(fi, GSM48_REJECT_NETWORK_FAILURE);
+		lu_fsm_failure(fi, GSM48_REJECT_NETWORK_FAILURE);
 		return;
 	}
 
@@ -840,7 +840,7 @@
 			      vsub->vlr->cfg.retrieve_imeisv_ciphered)) {
 		LOGPFSML(fi, LOGL_ERROR,
 			 "Failed to send Ciphering Mode Command\n");
-		vlr_lu_compl_fsm_failure(fi, GSM48_REJECT_NETWORK_FAILURE);
+		lu_fsm_failure(fi, GSM48_REJECT_NETWORK_FAILURE);
 		return;
 	}
 

-- 
To view, visit https://gerrit.osmocom.org/7055
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fd2c6fa23254fffd0d526e53541f4068153929f
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder