lynxis lazus has uploaded this change for review.
libvlr: correct utran warning when no auth is required
UTRAN requires a valid security context, but there is no need to
have an authentication every time if there is a valid security context present.
Change-Id: Ia4c5b28b9a6aba387b43b7802ab55565a11a4348
---
M src/libvlr/vlr_access_req_fsm.c
M src/libvlr/vlr_lu_fsm.c
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/08/43508/1
diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c
index 53caae5..b1a75fd 100644
--- a/src/libvlr/vlr_access_req_fsm.c
+++ b/src/libvlr/vlr_access_req_fsm.c
@@ -716,9 +716,9 @@
(is_ciphering_to_be_attempted ? "+Ciph" : " (no Ciph)")
: "");
- if (is_utran && !authentication_required)
+ if (is_utran && (!authentication_required && !is_ciphering_required))
LOGPFSML(fi, LOGL_ERROR,
- "Authentication off on UTRAN network. Good luck.\n");
+ "Authentication & Ciphering is off on UTRAN network. Good luck.\n");
switch (mi->type) {
case GSM_MI_TYPE_IMSI:
diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c
index e63f1ee..2c8dc87 100644
--- a/src/libvlr/vlr_lu_fsm.c
+++ b/src/libvlr/vlr_lu_fsm.c
@@ -1735,9 +1735,9 @@
(is_ciphering_to_be_attempted ? "+Ciph" : " (no Ciph)")
: "");
- if (is_utran && !authentication_required)
+ if (is_utran && (!authentication_required && !is_ciphering_required))
LOGPFSML(fi, LOGL_ERROR,
- "Authentication off on UTRAN network. Good luck.\n");
+ "Authentication & Ciphering is off on UTRAN network. Good luck.\n");
osmo_fsm_inst_dispatch(fi, VLR_ULA_E_UPDATE_LA, NULL);
@@ -1793,9 +1793,9 @@
(is_ciphering_to_be_attempted ? "+Ciph" : " (no Ciph)")
: "");
- if (is_utran && !authentication_required)
+ if (is_utran && (!authentication_required && !is_ciphering_required))
LOGPFSML(fi, LOGL_ERROR,
- "Authentication off on UTRAN network. Good luck.\n");
+ "Authentication & Ciphering is off on UTRAN network. Good luck.\n");
osmo_fsm_inst_dispatch(fi, VLR_ULA_E_UPDATE_LA, NULL);
To view, visit change 43508. To unsubscribe, or for help writing mail filters, visit settings.