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
ZhouShuya
OpenXG-RAN
Commits
fe2b7d80
Commit
fe2b7d80
authored
9 years ago
by
Wilson W.K. Thong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed 'wilson' from the codes
parent
6b48fd63
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
0 additions
and
24 deletions
+0
-24
openair2/COMMON/as_message.h
openair2/COMMON/as_message.h
+0
-2
openair2/COMMON/rrc_messages_def.h
openair2/COMMON/rrc_messages_def.h
+0
-2
openair2/COMMON/rrc_messages_types.h
openair2/COMMON/rrc_messages_types.h
+0
-4
openair2/RRC/LITE/defs.h
openair2/RRC/LITE/defs.h
+0
-4
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+0
-4
openair3/NAS/COMMON/API/NETWORK/l2_message.h
openair3/NAS/COMMON/API/NETWORK/l2_message.h
+0
-2
openair3/NAS/UE/EMM/SecurityModeControl.c
openair3/NAS/UE/EMM/SecurityModeControl.c
+0
-2
openair3/NAS/UE/nas_itti_messaging.c
openair3/NAS/UE/nas_itti_messaging.c
+0
-2
openair3/NAS/UE/nas_itti_messaging.h
openair3/NAS/UE/nas_itti_messaging.h
+0
-2
No files found.
openair2/COMMON/as_message.h
View file @
fe2b7d80
...
...
@@ -220,7 +220,6 @@ typedef struct broadcast_info_ind_s {
#define AS_HSDUPA (1 << NET_ACCESS_HSDUPA)
#define AS_EUTRAN (1 << NET_ACCESS_EUTRAN)
#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
/*
* NAS->AS -K_eNB refresh request
* NAS request AS to refresh its KeNB key
...
...
@@ -228,7 +227,6 @@ typedef struct broadcast_info_ind_s {
typedef
struct
kenb_refresh_req_s
{
Byte_t
kenb
[
32
];
}
kenb_refresh_req_t
;
#endif
/*
* NAS->AS - Cell Information request
...
...
This diff is collapsed.
Click to expand it.
openair2/COMMON/rrc_messages_def.h
View file @
fe2b7d80
...
...
@@ -64,9 +64,7 @@ MESSAGE_DEF(RRC_STATE_IND, MESSAGE_PRIORITY_MED, RrcStateInd,
MESSAGE_DEF
(
RRC_CONFIGURATION_REQ
,
MESSAGE_PRIORITY_MED
,
RrcConfigurationReq
,
rrc_configuration_req
)
// UE: NAS -> RRC messages
#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
MESSAGE_DEF
(
NAS_KENB_REFRESH_REQ
,
MESSAGE_PRIORITY_MED
,
NasKenbRefreshReq
,
nas_kenb_refresh_req
)
#endif
MESSAGE_DEF
(
NAS_CELL_SELECTION_REQ
,
MESSAGE_PRIORITY_MED
,
NasCellSelectionReq
,
nas_cell_selection_req
)
MESSAGE_DEF
(
NAS_CONN_ESTABLI_REQ
,
MESSAGE_PRIORITY_MED
,
NasConnEstabliReq
,
nas_conn_establi_req
)
MESSAGE_DEF
(
NAS_UPLINK_DATA_REQ
,
MESSAGE_PRIORITY_MED
,
NasUlDataReq
,
nas_ul_data_req
)
...
...
This diff is collapsed.
Click to expand it.
openair2/COMMON/rrc_messages_types.h
View file @
fe2b7d80
...
...
@@ -70,9 +70,7 @@ typedef UL_DCCH_Message_t RrcUlDcchMessage;
#define RRC_CONFIGURATION_REQ(mSGpTR) (mSGpTR)->ittiMsg.rrc_configuration_req
#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
#define NAS_KENB_REFRESH_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_kenb_refresh_req
#endif
#define NAS_CELL_SELECTION_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_cell_selection_req
#define NAS_CONN_ESTABLI_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_conn_establi_req
#define NAS_UPLINK_DATA_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_ul_data_req
...
...
@@ -186,9 +184,7 @@ typedef struct RrcConfigurationReq_s {
}
RrcConfigurationReq
;
// UE: NAS -> RRC messages
#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
typedef
kenb_refresh_req_t
NasKenbRefreshReq
;
#endif
typedef
cell_info_req_t
NasCellSelectionReq
;
typedef
nas_establish_req_t
NasConnEstabliReq
;
typedef
ul_info_transfer_req_t
NasUlDataReq
;
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/defs.h
View file @
fe2b7d80
...
...
@@ -182,11 +182,7 @@ typedef enum HO_STATE_e {
#define PAYLOAD_SIZE_MAX 1024
#define RRC_BUF_SIZE 255
#define UNDEF_SECURITY_MODE 0xff
#if 1 // wilson 2016-05-01 let RRC security mode command to return OK instead of failed
#define NO_SECURITY_MODE 0x20
#else
#define NO_SECURITY_MODE 0x33
#endif
#define CBA_OFFSET 0xfff4
// #define NUM_MAX_CBA_GROUP 4 // in the platform_constants
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/rrc_UE.c
View file @
fe2b7d80
...
...
@@ -1403,7 +1403,6 @@ rrc_ue_process_securityModeCommand(
}
#if 1 // wilson 2016-01-05 config PDCP security mode
#if defined(ENABLE_SECURITY)
uint8_t
*
kRRCenc
=
NULL
;
uint8_t
*
kUPenc
=
NULL
;
...
...
@@ -1458,7 +1457,6 @@ rrc_ue_process_securityModeCommand(
}
#endif //#if defined(ENABLE_SECURITY)
#endif //#if 1 //wilson
if
(
securityModeCommand
->
criticalExtensions
.
present
==
SecurityModeCommand__criticalExtensions_PR_c1
)
{
if
(
securityModeCommand
->
criticalExtensions
.
choice
.
c1
.
present
==
SecurityModeCommand__criticalExtensions__c1_PR_securityModeCommand_r8
)
{
...
...
@@ -4131,7 +4129,6 @@ void *rrc_ue_task( void *args_p )
# if defined(ENABLE_USE_MME)
#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
case
NAS_KENB_REFRESH_REQ
:
memcpy
((
void
*
)
UE_rrc_inst
[
ue_mod_id
].
kenb
,
(
void
*
)
NAS_KENB_REFRESH_REQ
(
msg_p
).
kenb
,
sizeof
(
UE_rrc_inst
[
ue_mod_id
].
kenb
));
...
...
@@ -4155,7 +4152,6 @@ void *rrc_ue_task( void *args_p )
UE_rrc_inst
[
ue_mod_id
].
kenb
[
28
],
UE_rrc_inst
[
ue_mod_id
].
kenb
[
29
],
UE_rrc_inst
[
ue_mod_id
].
kenb
[
30
],
UE_rrc_inst
[
ue_mod_id
].
kenb
[
31
]);
break
;
#endif
/* NAS messages */
case
NAS_CELL_SELECTION_REQ
:
...
...
This diff is collapsed.
Click to expand it.
openair3/NAS/COMMON/API/NETWORK/l2_message.h
View file @
fe2b7d80
...
...
@@ -124,7 +124,6 @@ typedef struct kenb_refresh_req_s {
Byte_t
kenb
[
32
];
}
kenb_refresh_req_t
;
#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
/*
* NAS->AS - Cell Information request
* NAS request AS to search for a suitable cell belonging to the selected
...
...
@@ -134,7 +133,6 @@ typedef struct {
plmn_t
plmnID
;
/* PLMN identifier */
Byte_t
rat
;
/* Bitmap - set of radio access technologies */
}
cell_info_req_t
;
#endif
/*
* AS->NAS - Cell Information response
...
...
This diff is collapsed.
Click to expand it.
openair3/NAS/UE/EMM/SecurityModeControl.c
View file @
fe2b7d80
...
...
@@ -295,9 +295,7 @@ int emm_proc_security_mode_command(int native_ksi, int ksi,
_emm_data
.
security
->
selected_algorithms
.
encryption
=
seea
;
_emm_data
.
security
->
selected_algorithms
.
integrity
=
seia
;
#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
nas_itti_kenb_refresh_req
(
_security_data
.
kenb
.
value
);
#endif
}
/*
* NAS security mode command not accepted by the UE
...
...
This diff is collapsed.
Click to expand it.
openair3/NAS/UE/nas_itti_messaging.c
View file @
fe2b7d80
...
...
@@ -187,7 +187,6 @@ int nas_itti_protected_msg(const char *buffer, const nas_message_t *msg, const i
extern
unsigned
char
NB_eNB_INST
;
#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
int
nas_itti_kenb_refresh_req
(
const
Byte_t
kenb
[
32
])
{
MessageDef
*
message_p
;
...
...
@@ -220,7 +219,6 @@ int nas_itti_kenb_refresh_req(const Byte_t kenb[32])
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
NB_eNB_INST
+
0
/* TODO to be virtualized */
,
message_p
);
}
#endif
int
nas_itti_cell_info_req
(
const
plmn_t
plmnID
,
const
Byte_t
rat
)
{
...
...
This diff is collapsed.
Click to expand it.
openair3/NAS/UE/nas_itti_messaging.h
View file @
fe2b7d80
...
...
@@ -55,9 +55,7 @@ int nas_itti_protected_msg(
# if defined(NAS_BUILT_IN_UE)
#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
int
nas_itti_kenb_refresh_req
(
const
Byte_t
kenb
[
32
]);
#endif
int
nas_itti_cell_info_req
(
const
plmn_t
plmnID
,
const
Byte_t
rat
);
...
...
This diff is collapsed.
Click to expand it.
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