Change in osmo-msc[master]: vlr_access_req_fsm: use correct cause codes
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/9169 )
Change subject: vlr_access_req_fsm: use correct cause codes
..
vlr_access_req_fsm: use correct cause codes
The FSM that controls the VLR ACCESS uses cause code 9
(GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE) to signal that the
identity of the MS is currently not known in VLR (MSC-Reboot)
However, this cause code is from the GMM domain and is interpreted
as GSM48_REJECT_SRV_OPT_TMP_OUT_OF_ORDER by the MS, which cauese
the MS not to make a new LOCATION UPDATE on CM SERVICE REQUEST
- use GSM48_REJECT_IMSI_UNKNOWN_IN_VLR and
GSM48_REJECT_IMSI_UNKNOWN_IN_VLR instead of
GSM48_REJECT_IMSI_UNKNOWN_IN_VLR
Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370
Closes: OS#3266
---
M src/libvlr/vlr_access_req_fsm.c
M tests/msc_vlr/msc_vlr_test_rest.err
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c
index dd95821..79eb75f 100644
--- a/src/libvlr/vlr_access_req_fsm.c
+++ b/src/libvlr/vlr_access_req_fsm.c
@@ -381,7 +381,7 @@
if (!par->by_tmsi) {
/* We couldn't find a subscriber even by IMSI,
* Set User Error: Unidentified Subscriber */
- proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);
+ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR);
return;
} else {
/* TMSI was included, are we permitted to use it? */
@@ -392,7 +392,7 @@
return;
} else {
/* Set User Error: Unidentified Subscriber */
- proc_arq_fsm_done(fi,
GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);
+ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR);
return;
}
}
@@ -411,7 +411,7 @@
vsub = vlr_subscr_find_by_imsi(vlr, par->imsi);
if (!vsub) {
/* Set User Error: Unidentified Subscriber */
- proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);
+ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR);
return;
}
assoc_par_with_subscr(fi, vsub);
@@ -687,7 +687,7 @@
case GSM_MI_TYPE_IMEI:
/* TODO: IMEI (emergency call) */
default:
- proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);
+ proc_arq_fsm_done(fi, GSM48_REJECT_INVALID_MANDANTORY_INF);
return;
}
diff --git a/tests/msc_vlr/msc_vlr_test_rest.err
b/tests/msc_vlr/msc_vlr_test_rest.err
index 5f2d30f..e71295a 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.err
+++ b/tests/msc_vlr/msc_vlr_test_rest.err
@@ -63,10 +63,10 @@
DVLR
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_INIT}: is
child of Subscr_Conn(CM_SERVICE_REQ:90170004620)
DVLR
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_INIT}:
rev=GSM net=GERAN (no Auth)
DVLR
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_INIT}:
Received Event PR_ARQ_E_START
-DVLR
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_INIT}:
proc_arq_fsm_done(MS_IDENTITY_NOT_DERVIVABLE)
+DVLR
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_INIT}:
proc_arq_fsm_done(IMSI_UNKNOWN_IN_VLR)
DVLR
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_INIT}:
state_chg to PR_ARQ_S_DONE
-DVLR
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_DONE}:
Process Access Request result: MS_IDENTITY_NOT_DERVIVABLE
-- sending CM Service Reject for unknown, cause: MS_IDENTITY_NOT_DERVIVABLE
+DVLR
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_DONE}:
Process Access Request result: IMSI_UNKNOWN_IN_VLR
+- sending CM Service Reject for unknown, cause: IMSI_UNKNOWN_IN_VLR
DMM Subscr_Conn(CM_SERVICE_REQ:90170004620){SUBSCR_CONN_S_NEW}: Received
Event SUBSCR_CONN_E_CN_CLOSE
DMM Subscr_Conn(CM_SERVICE_REQ:90170004620){SUBSCR_CONN_S_NEW}: state_chg
to SUBSCR_CONN_S_RELEASING
DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
--
To view, visit https://gerrit.osmocom.org/9169
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370
Gerrit-Change-Number: 9169
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr
Change in osmo-msc[master]: vlr_access_req_fsm: use correct cause codes
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9169 ) Change subject: vlr_access_req_fsm: use correct cause codes .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Gerrit-Change-Number: 9169 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 16 May 2018 08:53:26 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: vlr_access_req_fsm: use correct cause codes
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9169 to look at the new patch set (#2). Change subject: vlr_access_req_fsm: use correct cause codes .. vlr_access_req_fsm: use correct cause codes The FSM that controls the VLR ACCESS uses cause code 9 (GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE) to signal that the identity of the MS is currently not known in VLR (MSC-Reboot) However, this cause code is from the GMM domain and is interpreted as GSM48_REJECT_SRV_OPT_TMP_OUT_OF_ORDER by the MS, which cauese the MS not to make a new LOCATION UPDATE on CM SERVICE REQUEST - use GSM48_REJECT_IMSI_UNKNOWN_IN_VLR and GSM48_REJECT_IMSI_UNKNOWN_IN_VLR instead of GSM48_REJECT_IMSI_UNKNOWN_IN_VLR Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Closes: OS#3266 --- M src/libvlr/vlr_access_req_fsm.c M tests/msc_vlr/msc_vlr_test_rest.err 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/69/9169/2 -- To view, visit https://gerrit.osmocom.org/9169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Gerrit-Change-Number: 9169 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
Change in osmo-msc[master]: vlr_access_req_fsm: use correct cause codes
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9169 ) Change subject: vlr_access_req_fsm: use correct cause codes .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Gerrit-Change-Number: 9169 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 20:57:24 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: vlr_access_req_fsm: use correct cause codes
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9169
Change subject: vlr_access_req_fsm: use correct cause codes
..
vlr_access_req_fsm: use correct cause codes
The FSM that controls the VLR ACCESS uses cause code 9
(GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE) to signal that the
identity of the MS is currently not known in VLR (MSC-Reboot)
However, this cause code is from the GMM domain and is interpreted
as GSM48_REJECT_SRV_OPT_TMP_OUT_OF_ORDER by the MS, which cauese
the MS not to make a new LOCATION UPDATE on CM SERVICE REQUEST
- use GSM48_REJECT_IMSI_UNKNOWN_IN_VLR and
GSM48_REJECT_IMSI_UNKNOWN_IN_VLR instead of
GSM48_REJECT_IMSI_UNKNOWN_IN_VLR
Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370
Closes: OS#3266
---
M src/libvlr/vlr_access_req_fsm.c
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/69/9169/1
diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c
index dd95821..79eb75f 100644
--- a/src/libvlr/vlr_access_req_fsm.c
+++ b/src/libvlr/vlr_access_req_fsm.c
@@ -381,7 +381,7 @@
if (!par->by_tmsi) {
/* We couldn't find a subscriber even by IMSI,
* Set User Error: Unidentified Subscriber */
- proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);
+ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR);
return;
} else {
/* TMSI was included, are we permitted to use it? */
@@ -392,7 +392,7 @@
return;
} else {
/* Set User Error: Unidentified Subscriber */
- proc_arq_fsm_done(fi,
GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);
+ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR);
return;
}
}
@@ -411,7 +411,7 @@
vsub = vlr_subscr_find_by_imsi(vlr, par->imsi);
if (!vsub) {
/* Set User Error: Unidentified Subscriber */
- proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);
+ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR);
return;
}
assoc_par_with_subscr(fi, vsub);
@@ -687,7 +687,7 @@
case GSM_MI_TYPE_IMEI:
/* TODO: IMEI (emergency call) */
default:
- proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);
+ proc_arq_fsm_done(fi, GSM48_REJECT_INVALID_MANDANTORY_INF);
return;
}
--
To view, visit https://gerrit.osmocom.org/9169
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370
Gerrit-Change-Number: 9169
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
