From d381c64f383c2feb8efcf9f8edf0b2ed191f3a96 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Fri, 10 Oct 2014 11:45:34 +0000
Subject: [PATCH] mnc ascii/bin
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5864 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/MME_APP/mme_app_authentication.c | 40 ++++++++++-----------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/openair-cn/MME_APP/mme_app_authentication.c b/openair-cn/MME_APP/mme_app_authentication.c
index ee0e16dc4a..5ea1ad442c 100644
--- a/openair-cn/MME_APP/mme_app_authentication.c
+++ b/openair-cn/MME_APP/mme_app_authentication.c
@@ -326,23 +326,6 @@ void
mme_app_handle_nas_auth_param_req(
const nas_auth_param_req_t * const nas_auth_param_req_pP)
{
- static const plmn_t visited_plmn_eur = {
- .MCCdigit3 = 2,
- .MCCdigit2 = 0,
- .MCCdigit1 = 8,
- .MNCdigit1 = 0,
- .MNCdigit2 = 1,
- .MNCdigit3 = 0,
- };
- static const plmn_t visited_plmn_dongle = {
- .MCCdigit3 = 2,
- .MCCdigit2 = 0,
- .MCCdigit1 = 8,
- .MNCdigit3 = 2,
- .MNCdigit2 = 9,
- .MNCdigit1 = 0xF,
- };
-
plmn_t *visited_plmn = NULL;
struct ue_context_s *ue_context = NULL;
uint64_t imsi = 0;
@@ -357,8 +340,6 @@ mme_app_handle_nas_auth_param_req(
};
DevAssert(nas_auth_param_req_pP != NULL);
- //visited_plmn = &visited_plmn_eur;
- //visited_plmn = &visited_plmn_dongle;
visited_plmn = &visited_plmn_from_req;
visited_plmn_from_req.MCCdigit1 = nas_auth_param_req_pP->imsi[0];
@@ -372,10 +353,11 @@ mme_app_handle_nas_auth_param_req(
nas_auth_param_req_pP->imsi[4],
nas_auth_param_req_pP->imsi[5]
);
+
if (mnc_length == 2) {
visited_plmn_from_req.MNCdigit1 = nas_auth_param_req_pP->imsi[3];
visited_plmn_from_req.MNCdigit2 = nas_auth_param_req_pP->imsi[4];
- visited_plmn_from_req.MNCdigit3 = "F";
+ visited_plmn_from_req.MNCdigit3 = 15;
} else if (mnc_length == 3) {
visited_plmn_from_req.MNCdigit1 = nas_auth_param_req_pP->imsi[3];
visited_plmn_from_req.MNCdigit2 = nas_auth_param_req_pP->imsi[4];
@@ -383,6 +365,24 @@ mme_app_handle_nas_auth_param_req(
} else {
AssertFatal(0, "MNC Not found (mcc_mnc_list)");
}
+ if (mnc_length == 3) {
+ MME_APP_DEBUG("%s visited_plmn_from_req %1d%1d%1d.%1d%1d%1d\n",
+ __FUNCTION__,
+ visited_plmn_from_req.MCCdigit1,
+ visited_plmn_from_req.MCCdigit2,
+ visited_plmn_from_req.MCCdigit3,
+ visited_plmn_from_req.MNCdigit1,
+ visited_plmn_from_req.MNCdigit2,
+ visited_plmn_from_req.MNCdigit3);
+ } else {
+ MME_APP_DEBUG("%s visited_plmn_from_req %1d%1d%1d.%1d%1d\n",
+ __FUNCTION__,
+ visited_plmn_from_req.MCCdigit1,
+ visited_plmn_from_req.MCCdigit2,
+ visited_plmn_from_req.MCCdigit3,
+ visited_plmn_from_req.MNCdigit1,
+ visited_plmn_from_req.MNCdigit2);
+ }
MME_APP_STRING_TO_IMSI(nas_auth_param_req_pP->imsi, &imsi);
--
GitLab