Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG-RAN
Commits
0a9d013f
Commit
0a9d013f
authored
Dec 09, 2016
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
integration fix: LOG_I/LOG_D do not exist when compiling at_nas_ue
Use LOG_TRACE instead.
parent
8db3583b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
openair3/NAS/COMMON/EMM/MSG/SecurityModeCommand.c
openair3/NAS/COMMON/EMM/MSG/SecurityModeCommand.c
+1
-1
openair3/NAS/COMMON/EMM/MSG/SecurityModeComplete.c
openair3/NAS/COMMON/EMM/MSG/SecurityModeComplete.c
+3
-3
openair3/NAS/COMMON/IES/MobileIdentity.c
openair3/NAS/COMMON/IES/MobileIdentity.c
+1
-1
openair3/NAS/UE/EMM/SAP/emm_recv.c
openair3/NAS/UE/EMM/SAP/emm_recv.c
+2
-2
No files found.
openair3/NAS/COMMON/EMM/MSG/SecurityModeCommand.c
View file @
0a9d013f
...
@@ -72,7 +72,7 @@ int decode_security_mode_command(security_mode_command_msg *security_mode_comman
...
@@ -72,7 +72,7 @@ int decode_security_mode_command(security_mode_command_msg *security_mode_comman
decoded
+=
decoded_result
;
decoded
+=
decoded_result
;
/* Set corresponding mask to 1 in presencemask */
/* Set corresponding mask to 1 in presencemask */
security_mode_command
->
presencemask
|=
SECURITY_MODE_COMMAND_IMEISV_REQUEST_PRESENT
;
security_mode_command
->
presencemask
|=
SECURITY_MODE_COMMAND_IMEISV_REQUEST_PRESENT
;
LOG_
I
(
NAS
,
" SECURITY MODE COMMAND: IMEISV_REQUEST: %d
\n
"
,
security_mode_command
->
imeisvrequest
);
LOG_
TRACE
(
INFO
,
" SECURITY MODE COMMAND: IMEISV_REQUEST: %d
\n
"
,
security_mode_command
->
imeisvrequest
);
break
;
break
;
...
...
openair3/NAS/COMMON/EMM/MSG/SecurityModeComplete.c
View file @
0a9d013f
...
@@ -76,11 +76,11 @@ int encode_security_mode_complete(security_mode_complete_msg *security_mode_comp
...
@@ -76,11 +76,11 @@ int encode_security_mode_complete(security_mode_complete_msg *security_mode_comp
/* Checking IEI and pointer */
/* Checking IEI and pointer */
CHECK_PDU_POINTER_AND_LENGTH_ENCODER
(
buffer
,
SECURITY_MODE_COMPLETE_MINIMUM_LENGTH
,
len
);
CHECK_PDU_POINTER_AND_LENGTH_ENCODER
(
buffer
,
SECURITY_MODE_COMPLETE_MINIMUM_LENGTH
,
len
);
LOG_
I
(
NAS
,
"SECURITY MODE COMMAND COMPLETE: presencemask: %d
\n
"
,
security_mode_complete
->
presencemask
);
LOG_
TRACE
(
INFO
,
"SECURITY MODE COMMAND COMPLETE: presencemask: %d
\n
"
,
security_mode_complete
->
presencemask
);
if
((
security_mode_complete
->
presencemask
&
SECURITY_MODE_COMPLETE_IMEISV_PRESENT
)
if
((
security_mode_complete
->
presencemask
&
SECURITY_MODE_COMPLETE_IMEISV_PRESENT
)
==
SECURITY_MODE_COMPLETE_IMEISV_PRESENT
)
{
==
SECURITY_MODE_COMPLETE_IMEISV_PRESENT
)
{
LOG_
I
(
NAS
,
"SECURITY MODE COMMAND COMPLETE: encode imeisv
\n
"
);
LOG_
TRACE
(
INFO
,
"SECURITY MODE COMMAND COMPLETE: encode imeisv
\n
"
);
if
((
encode_result
=
if
((
encode_result
=
encode_mobile_identity
(
&
security_mode_complete
->
imeisv
,
encode_mobile_identity
(
&
security_mode_complete
->
imeisv
,
SECURITY_MODE_COMPLETE_IMEISV_IEI
,
buffer
+
encoded
,
len
-
SECURITY_MODE_COMPLETE_IMEISV_IEI
,
buffer
+
encoded
,
len
-
...
@@ -90,7 +90,7 @@ int encode_security_mode_complete(security_mode_complete_msg *security_mode_comp
...
@@ -90,7 +90,7 @@ int encode_security_mode_complete(security_mode_complete_msg *security_mode_comp
else
else
encoded
+=
encode_result
;
encoded
+=
encode_result
;
}
}
LOG_
I
(
NAS
,
"SECURITY MODE COMMAND COMPLETE done !!!
\n
"
);
LOG_
TRACE
(
INFO
,
"SECURITY MODE COMMAND COMPLETE done !!!
\n
"
);
return
encoded
;
return
encoded
;
}
}
openair3/NAS/COMMON/IES/MobileIdentity.c
View file @
0a9d013f
...
@@ -575,7 +575,7 @@ static int encode_imei_mobile_identity(ImeiMobileIdentity_t *imei, uint8_t *buff
...
@@ -575,7 +575,7 @@ static int encode_imei_mobile_identity(ImeiMobileIdentity_t *imei, uint8_t *buff
static
int
encode_imeisv_mobile_identity
(
ImeisvMobileIdentity_t
*
imeisv
,
uint8_t
*
buffer
)
static
int
encode_imeisv_mobile_identity
(
ImeisvMobileIdentity_t
*
imeisv
,
uint8_t
*
buffer
)
{
{
uint32_t
encoded
=
0
;
uint32_t
encoded
=
0
;
LOG_
I
(
NAS
,
"SECURITY MODE COMMAND COMPLETE: encode_imeisv_mobile_identity
\n
"
);
LOG_
TRACE
(
INFO
,
"SECURITY MODE COMMAND COMPLETE: encode_imeisv_mobile_identity
\n
"
);
*
(
buffer
+
encoded
)
=
0x00
|
(
imeisv
->
digit1
<<
4
)
|
(
imeisv
->
oddeven
<<
3
)
|
*
(
buffer
+
encoded
)
=
0x00
|
(
imeisv
->
digit1
<<
4
)
|
(
imeisv
->
oddeven
<<
3
)
|
(
imeisv
->
typeofidentity
);
(
imeisv
->
typeofidentity
);
...
...
openair3/NAS/UE/EMM/SAP/emm_recv.c
View file @
0a9d013f
...
@@ -140,7 +140,7 @@ int emm_recv_attach_accept(attach_accept_msg *msg, int *emm_cause)
...
@@ -140,7 +140,7 @@ int emm_recv_attach_accept(attach_accept_msg *msg, int *emm_cause)
// supported cases:
// supported cases:
// typeoflist = 1 Or
// typeoflist = 1 Or
// typeoflist = 0 and numberofelements = 1 (ie numberofelements equal to zero see 3gpp 24.301 9.9.3.33.1)
// typeoflist = 0 and numberofelements = 1 (ie numberofelements equal to zero see 3gpp 24.301 9.9.3.33.1)
LOG_
D
(
NAS
,
"attach accept type of list: %d, number of element: %d
\n
"
,
msg
->
tailist
.
typeoflist
,
msg
->
tailist
.
numberofelements
);
LOG_
TRACE
(
DEBUG
,
"attach accept type of list: %d, number of element: %d
\n
"
,
msg
->
tailist
.
typeoflist
,
msg
->
tailist
.
numberofelements
);
if
(
!
(
(
msg
->
tailist
.
typeoflist
==
TRACKING_AREA_IDENTITY_LIST_ONE_PLMN_CONSECUTIVE_TACS
)
||
if
(
!
(
(
msg
->
tailist
.
typeoflist
==
TRACKING_AREA_IDENTITY_LIST_ONE_PLMN_CONSECUTIVE_TACS
)
||
((
msg
->
tailist
.
typeoflist
==
0
)
&&
(
msg
->
tailist
.
numberofelements
==
0
))
((
msg
->
tailist
.
typeoflist
==
0
)
&&
(
msg
->
tailist
.
numberofelements
==
0
))
)
)
...
@@ -472,7 +472,7 @@ int emm_recv_security_mode_command(security_mode_command_msg *msg,
...
@@ -472,7 +472,7 @@ int emm_recv_security_mode_command(security_mode_command_msg *msg,
* Message processing
* Message processing
*/
*/
/* Execute the security mode control procedure initiated by the network */
/* Execute the security mode control procedure initiated by the network */
LOG_
I
(
NAS
,
"Execute the security mode control procedure initiated by the network: imeisvrequest %d
\n
"
,
msg
->
imeisvrequest
);
LOG_
TRACE
(
INFO
,
"Execute the security mode control procedure initiated by the network: imeisvrequest %d
\n
"
,
msg
->
imeisvrequest
);
rc
=
emm_proc_security_mode_command
(
rc
=
emm_proc_security_mode_command
(
msg
->
naskeysetidentifier
.
tsc
!=
NAS_KEY_SET_IDENTIFIER_MAPPED
,
msg
->
naskeysetidentifier
.
tsc
!=
NAS_KEY_SET_IDENTIFIER_MAPPED
,
msg
->
naskeysetidentifier
.
naskeysetidentifier
,
msg
->
naskeysetidentifier
.
naskeysetidentifier
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment