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
常顺宇
OpenXG-RAN
Commits
9c120ed2
Commit
9c120ed2
authored
Mar 09, 2019
by
lfarizav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Solving an initialization issue related to ctxt->instance numbering
parent
86b0f4ce
Changes
23
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
118 additions
and
55 deletions
+118
-55
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+1
-1
openair2/COMMON/platform_types.h
openair2/COMMON/platform_types.h
+4
-2
openair2/LAYER2/MAC/main.c
openair2/LAYER2/MAC/main.c
+2
-2
openair2/LAYER2/MAC/openair2_proc.c
openair2/LAYER2/MAC/openair2_proc.c
+1
-1
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+2
-1
openair2/RRC/LITE/L2_interface.c
openair2/RRC/LITE/L2_interface.c
+4
-3
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+40
-14
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LITE/rrc_common.c
+2
-2
openair2/RRC/NAS/nas_config.c
openair2/RRC/NAS/nas_config.c
+1
-1
openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.c
...S/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.c
+3
-1
openair3/NAS/COMMON/ESM/MSG/esm_msg.c
openair3/NAS/COMMON/ESM/MSG/esm_msg.c
+25
-2
openair3/NAS/COMMON/UTIL/socket.c
openair3/NAS/COMMON/UTIL/socket.c
+1
-1
openair3/NAS/UE/API/USER/user_api.c
openair3/NAS/UE/API/USER/user_api.c
+2
-0
openair3/NAS/UE/EMM/SAP/emm_recv.c
openair3/NAS/UE/EMM/SAP/emm_recv.c
+2
-2
openair3/NAS/UE/EMM/SAP/emm_send.c
openair3/NAS/UE/EMM/SAP/emm_send.c
+4
-2
openair3/NAS/UE/ESM/PdnConnectivity.c
openair3/NAS/UE/ESM/PdnConnectivity.c
+0
-1
openair3/NAS/UE/ESM/SAP/esm_recv.c
openair3/NAS/UE/ESM/SAP/esm_recv.c
+2
-1
openair3/NAS/UE/ESM/SAP/esm_sap.c
openair3/NAS/UE/ESM/SAP/esm_sap.c
+5
-4
openair3/NAS/UE/ESM/SAP/esm_send.c
openair3/NAS/UE/ESM/SAP/esm_send.c
+1
-1
openair3/NAS/UE/ESM/esm_ebr_context.c
openair3/NAS/UE/ESM/esm_ebr_context.c
+2
-2
openair3/NAS/UE/nas_itti_messaging.c
openair3/NAS/UE/nas_itti_messaging.c
+5
-5
openair3/NAS/UE/nas_ue_task.c
openair3/NAS/UE/nas_ue_task.c
+6
-4
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+3
-2
No files found.
openair1/SCHED/phy_procedures_lte_ue.c
View file @
9c120ed2
...
...
@@ -5717,7 +5717,7 @@ void phy_procedures_UE_lte(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,u
if
(
msg_p
!=
NULL
)
{
msg_name
=
ITTI_MSG_NAME
(
msg_p
);
instance
=
ITTI_MSG_INSTANCE
(
msg_p
);
Mod_id
=
instance
-
NB_eNB_INST
;
Mod_id
=
instance
-
1
/*NB_eNB_INST*/
;
switch
(
ITTI_MSG_ID
(
msg_p
))
{
case
PHY_FIND_CELL_REQ
:
...
...
openair2/COMMON/platform_types.h
View file @
9c120ed2
...
...
@@ -221,9 +221,11 @@ typedef struct protocol_ctxt_s {
// warning time hardcoded
#define PROTOCOL_CTXT_TIME_MILLI_SECONDS(CtXt_h) ((CtXt_h)->frame*10+(CtXt_h)->subframe)
#define UE_MODULE_ID_TO_INSTANCE( mODULE_iD ) mODULE_iD + NB_eNB_INST
//#define UE_MODULE_ID_TO_INSTANCE( mODULE_iD ) mODULE_iD + NB_eNB_INST
#define UE_MODULE_ID_TO_INSTANCE( mODULE_iD ) mODULE_iD + 1
#define ENB_MODULE_ID_TO_INSTANCE( mODULE_iD ) mODULE_iD
#define UE_INSTANCE_TO_MODULE_ID( iNSTANCE ) iNSTANCE - NB_eNB_INST
//#define UE_INSTANCE_TO_MODULE_ID( iNSTANCE ) iNSTANCE - NB_eNB_INST
#define UE_INSTANCE_TO_MODULE_ID( iNSTANCE ) iNSTANCE - 1
#define ENB_INSTANCE_TO_MODULE_ID( iNSTANCE )iNSTANCE
...
...
openair2/LAYER2/MAC/main.c
View file @
9c120ed2
...
...
@@ -79,10 +79,10 @@ void dl_phy_sync_success(module_id_t module_idP,
//printf("mme_enabled? %d\n",mme_enabled);
if
(
first_sync
==
1
&&
!
(
mme_enabled
==
1
&&
abstraction_flag
==
0
))
{
layer2_init_UE
(
module_idP
);
openair_rrc_ue_init
(
module_idP
,
/*eNB_index*/
PHY_vars_UE_g
[
module_idP
][
0
]
->
common_vars
.
eNb_id
);
openair_rrc_ue_init
(
module_idP
,
eNB_index
/*PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id*/
);
}
else
{
rrc_in_sync_ind
(
module_idP
,
frameP
,
/*eNB_index*/
PHY_vars_UE_g
[
module_idP
][
0
]
->
common_vars
.
eNb_id
);
rrc_in_sync_ind
(
module_idP
,
frameP
,
eNB_index
/*PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id*/
);
}
}
...
...
openair2/LAYER2/MAC/openair2_proc.c
View file @
9c120ed2
...
...
@@ -80,7 +80,7 @@ int openair2_stats_read(char *buffer, char **my_buffer, off_t off, int length)
// UE part
for
(
ue_id
=
0
;
ue_id
<
NUM_UE_INST
;
ue_id
++
)
{
// mod_id used for PDCP and RLC
Mod_id
=
NB_eNB_INST
+
ue_id
;
Mod_id
=
1
/*NB_eNB_INST*/
+
ue_id
;
len
+=
sprintf
(
&
buffer
[
len
],
"UE RX TTI: %d
\n
"
,
UE_mac_inst
[
ue_id
].
rxFrame
);
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
9c120ed2
...
...
@@ -548,7 +548,8 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
LOG_D
(
PDCP
,
"[PDCP][NETLINK] Something in socket, length %zu
\n
"
,
nas_nlh_rx
->
nlmsg_len
-
sizeof
(
struct
nlmsghdr
));
#endif
printf
(
"[PDCP][NETLINK] Something in socket, length %zu
\n
"
,
nas_nlh_rx
->
nlmsg_len
-
sizeof
(
struct
nlmsghdr
));
#ifdef OAI_EMU
// overwrite function input parameters, because only one netlink socket for all instances
...
...
openair2/RRC/LITE/L2_interface.c
View file @
9c120ed2
...
...
@@ -72,7 +72,7 @@ mac_rrc_data_req(
)
//--------------------------------------------------------------------------
{
printf
(
"mac_rrc_data_req:eNB_index %d
\n
"
,
eNB_index
);
//eNB_index=ue->common_vars.enb_id
printf
(
"mac_rrc_data_req:eNB_index %d
, eNB %d, CC_id %d
\n
"
,
eNB_index
,
Mod_idP
,
CC_id
);
//eNB_index=ue->common_vars.enb_id
SRB_INFO
*
Srb_info
;
uint8_t
Sdu_size
=
0
;
...
...
@@ -348,7 +348,7 @@ mac_rrc_data_ind(
SRB_INFO
*
Srb_info
;
protocol_ctxt_t
ctxt
;
sdu_size_t
sdu_size
=
0
;
printf
(
"mac_rrc_data_ind: eNB_indexP %d
\n
"
,
eNB_indexP
);
//eNB_index=ue->common_vars.enb_id
printf
(
"mac_rrc_data_ind: eNB_indexP %d
, ctxt->instance %d, ctxt->module_id %d
\n
"
,
eNB_indexP
,
ctxt
.
instance
,
ctxt
.
module_id
);
//eNB_index=ue->common_vars.enb_id
/* for no gcc warnings */
(
void
)
sdu_size
;
...
...
@@ -536,6 +536,7 @@ rrc_data_req(
sdu_sizeP
);
#if defined(ENABLE_ITTI)
printf
(
"ENABLE_ITTI is on
\n
"
);
{
MessageDef
*
message_p
;
// Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
...
...
@@ -560,7 +561,7 @@ rrc_data_req(
RRC_DCCH_DATA_REQ
(
message_p
).
module_id
=
ctxt_pP
->
module_id
;
RRC_DCCH_DATA_REQ
(
message_p
).
rnti
=
ctxt_pP
->
rnti
;
RRC_DCCH_DATA_REQ
(
message_p
).
eNB_index
=
ctxt_pP
->
eNB_index
;
printf
(
"RRC_DCCH_DATA_REQ (message_p): frame %d, enb_flag %d, rb_id %d, muip %d, confirmp %d, sdu_size %d, sdu_p %d, mode %d, module_id %d, rnti %x, eNB_index %d
\n
"
,
ctxt_pP
->
frame
,
ctxt_pP
->
enb_flag
,
rb_idP
,
muiP
,
confirmP
,
sdu_sizeP
,
*
message_buffer
,
modeP
,
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
eNB_index
);
itti_send_msg_to_task
(
ctxt_pP
->
enb_flag
?
TASK_PDCP_ENB
:
TASK_PDCP_UE
,
ctxt_pP
->
instance
,
...
...
openair2/RRC/LITE/rrc_UE.c
View file @
9c120ed2
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/rrc_common.c
View file @
9c120ed2
...
...
@@ -74,8 +74,8 @@ openair_rrc_on(
eNB_rrc_inst
[
ctxt_pP
->
module_id
].
carrier
[
CC_id
].
Srb0
.
Active
=
1
;
}
}
else
{
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" OPENAIR RRC IN....
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
));
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" OPENAIR RRC IN....
UE %d
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
)
,
ctxt_pP
->
module_id
);
for
(
i
=
0
;
i
<
NB_eNB_INST
;
i
++
)
{
LOG_D
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" Activating CCCH (eNB %d)
\n
"
,
...
...
openair2/RRC/NAS/nas_config.c
View file @
9c120ed2
...
...
@@ -124,7 +124,7 @@ int set_gateway(char *interfaceName, char *gateway)
if
(
strstr
(
strerror
(
errno
),
"File exists"
)
==
NULL
)
{
LOG_E
(
OIP
,
"ioctl SIOCADDRT failed : %s
\n
"
,
strerror
(
errno
));
return
2
;
}
else
{
/*if SIOCADDRT error is route exist, ret
ru
n success*/
}
else
{
/*if SIOCADDRT error is route exist, ret
ur
n success*/
LOG_I
(
OIP
,
"File Exist ...
\n
"
);
LOG_I
(
OIP
,
"set_gateway OK!
\n
"
);
return
0
;
...
...
openair3/NAS/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.c
View file @
9c120ed2
...
...
@@ -48,8 +48,10 @@ int decode_activate_default_eps_bearer_context_request(activate_default_eps_bear
else
decoded
+=
decoded_result
;
if
((
decoded_result
=
decode_pdn_address
(
&
activate_default_eps_bearer_context_request
->
pdnaddress
,
0
,
buffer
+
decoded
,
len
-
decoded
))
<
0
)
if
((
decoded_result
=
decode_pdn_address
(
&
activate_default_eps_bearer_context_request
->
pdnaddress
,
0
,
buffer
+
decoded
,
len
-
decoded
))
<
0
){
printf
(
"decode_activate_default_eps_bearer_context_request:
\n
"
);
return
decoded_result
;
}
else
decoded
+=
decoded_result
;
...
...
openair3/NAS/COMMON/ESM/MSG/esm_msg.c
View file @
9c120ed2
...
...
@@ -84,7 +84,7 @@ int esm_msg_decode(ESM_msg *msg, uint8_t *buffer, uint32_t len)
{
int
header_result
;
int
decode_result
;
#if ((defined(NAS_BUILT_IN_EPC) && defined(NAS_MME)) || (defined(ENABLE_NAS_UE_LOGGING) && defined(NAS_BUILT_IN_UE) && defined(NAS_UE)))
uint8_t
*
buffer_log
=
buffer
;
uint32_t
len_log
=
len
;
...
...
@@ -110,97 +110,120 @@ int esm_msg_decode(ESM_msg *msg, uint8_t *buffer, uint32_t len)
buffer
+=
header_result
;
len
-=
header_result
;
printf
(
"esm_msg_decode: "
);
switch
(
msg
->
header
.
message_type
)
{
case
PDN_DISCONNECT_REQUEST
:
printf
(
"1
\n
"
);
decode_result
=
decode_pdn_disconnect_request
(
&
msg
->
pdn_disconnect_request
,
buffer
,
len
);
break
;
case
DEACTIVATE_EPS_BEARER_CONTEXT_ACCEPT
:
printf
(
"2
\n
"
);
decode_result
=
decode_deactivate_eps_bearer_context_accept
(
&
msg
->
deactivate_eps_bearer_context_accept
,
buffer
,
len
);
break
;
case
BEARER_RESOURCE_ALLOCATION_REQUEST
:
printf
(
"3
\n
"
);
decode_result
=
decode_bearer_resource_allocation_request
(
&
msg
->
bearer_resource_allocation_request
,
buffer
,
len
);
break
;
case
ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_ACCEPT
:
printf
(
"4
\n
"
);
decode_result
=
decode_activate_default_eps_bearer_context_accept
(
&
msg
->
activate_default_eps_bearer_context_accept
,
buffer
,
len
);
break
;
case
PDN_CONNECTIVITY_REJECT
:
printf
(
"5
\n
"
);
decode_result
=
decode_pdn_connectivity_reject
(
&
msg
->
pdn_connectivity_reject
,
buffer
,
len
);
break
;
case
MODIFY_EPS_BEARER_CONTEXT_REJECT
:
printf
(
"6
\n
"
);
decode_result
=
decode_modify_eps_bearer_context_reject
(
&
msg
->
modify_eps_bearer_context_reject
,
buffer
,
len
);
break
;
case
ACTIVATE_DEDICATED_EPS_BEARER_CONTEXT_REJECT
:
printf
(
"7
\n
"
);
decode_result
=
decode_activate_dedicated_eps_bearer_context_reject
(
&
msg
->
activate_dedicated_eps_bearer_context_reject
,
buffer
,
len
);
break
;
case
MODIFY_EPS_BEARER_CONTEXT_ACCEPT
:
printf
(
"8
\n
"
);
decode_result
=
decode_modify_eps_bearer_context_accept
(
&
msg
->
modify_eps_bearer_context_accept
,
buffer
,
len
);
break
;
case
DEACTIVATE_EPS_BEARER_CONTEXT_REQUEST
:
printf
(
"9
\n
"
);
decode_result
=
decode_deactivate_eps_bearer_context_request
(
&
msg
->
deactivate_eps_bearer_context_request
,
buffer
,
len
);
break
;
case
ACTIVATE_DEDICATED_EPS_BEARER_CONTEXT_ACCEPT
:
printf
(
"10
\n
"
);
decode_result
=
decode_activate_dedicated_eps_bearer_context_accept
(
&
msg
->
activate_dedicated_eps_bearer_context_accept
,
buffer
,
len
);
break
;
case
ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REJECT
:
printf
(
"11
\n
"
);
decode_result
=
decode_activate_default_eps_bearer_context_reject
(
&
msg
->
activate_default_eps_bearer_context_reject
,
buffer
,
len
);
break
;
case
MODIFY_EPS_BEARER_CONTEXT_REQUEST
:
printf
(
"12
\n
"
);
decode_result
=
decode_modify_eps_bearer_context_request
(
&
msg
->
modify_eps_bearer_context_request
,
buffer
,
len
);
break
;
case
PDN_DISCONNECT_REJECT
:
printf
(
"13
\n
"
);
decode_result
=
decode_pdn_disconnect_reject
(
&
msg
->
pdn_disconnect_reject
,
buffer
,
len
);
break
;
case
ACTIVATE_DEDICATED_EPS_BEARER_CONTEXT_REQUEST
:
printf
(
"14
\n
"
);
decode_result
=
decode_activate_dedicated_eps_bearer_context_request
(
&
msg
->
activate_dedicated_eps_bearer_context_request
,
buffer
,
len
);
break
;
case
BEARER_RESOURCE_MODIFICATION_REJECT
:
printf
(
"15
\n
"
);
decode_result
=
decode_bearer_resource_modification_reject
(
&
msg
->
bearer_resource_modification_reject
,
buffer
,
len
);
break
;
case
BEARER_RESOURCE_ALLOCATION_REJECT
:
printf
(
"16
\n
"
);
decode_result
=
decode_bearer_resource_allocation_reject
(
&
msg
->
bearer_resource_allocation_reject
,
buffer
,
len
);
break
;
case
ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST
:
printf
(
"17
\n
"
);
decode_result
=
decode_activate_default_eps_bearer_context_request
(
&
msg
->
activate_default_eps_bearer_context_request
,
buffer
,
len
);
break
;
case
PDN_CONNECTIVITY_REQUEST
:
printf
(
"18
\n
"
);
decode_result
=
decode_pdn_connectivity_request
(
&
msg
->
pdn_connectivity_request
,
buffer
,
len
);
break
;
case
ESM_INFORMATION_RESPONSE
:
printf
(
"19
\n
"
);
decode_result
=
decode_esm_information_response
(
&
msg
->
esm_information_response
,
buffer
,
len
);
break
;
case
BEARER_RESOURCE_MODIFICATION_REQUEST
:
printf
(
"20
\n
"
);
decode_result
=
decode_bearer_resource_modification_request
(
&
msg
->
bearer_resource_modification_request
,
buffer
,
len
);
break
;
case
ESM_INFORMATION_REQUEST
:
printf
(
"21
\n
"
);
decode_result
=
decode_esm_information_request
(
&
msg
->
esm_information_request
,
buffer
,
len
);
break
;
case
ESM_STATUS
:
printf
(
"22
\n
"
);
decode_result
=
decode_esm_status
(
&
msg
->
esm_status
,
buffer
,
len
);
break
;
default:
printf
(
"default
\n
"
);
LOG_TRACE
(
ERROR
,
"ESM-MSG - Unexpected message type: 0x%x"
,
msg
->
header
.
message_type
);
decode_result
=
TLV_DECODE_WRONG_MESSAGE_TYPE
;
...
...
openair3/NAS/COMMON/UTIL/socket.c
View file @
9c120ed2
...
...
@@ -172,7 +172,7 @@ void* socket_udp_open(int type, const char* host, const char* port)
for
(
sp
=
socket_addr
;
sp
!=
NULL
;
sp
=
sp
->
ai_next
)
{
/* Create the socket endpoint for communication */
sfd
=
socket
(
sp
->
ai_family
,
sp
->
ai_socktype
,
sp
->
ai_protocol
);
printf
(
"sfd0 %d
, sfp %x
\n
"
,
sfd
,
socket_addr
);
printf
(
"sfd0 %d
\n
"
,
sfd
);
if
(
sfd
<
0
)
{
continue
;
}
...
...
openair3/NAS/UE/API/USER/user_api.c
View file @
9c120ed2
...
...
@@ -122,6 +122,8 @@ int user_api_initialize(user_api_id_t *user_api_id, const char* host, const char
LOG_TRACE
(
INFO
,
"USR-API - User's communication device %d is OPENED "
"on %s/%s"
,
user_api_get_fd
(
user_api_id
),
user_api_id
->
send_buffer
,
devname
);
printf
(
"USR-API - User's communication device %d is OPENED "
"on %s/%s"
,
user_api_get_fd
(
user_api_id
),
user_api_id
->
send_buffer
,
devname
);
}
else
{
/* Initialize network socket handlers */
user_api_id
->
open
=
socket_udp_open
;
...
...
openair3/NAS/UE/EMM/SAP/emm_recv.c
View file @
9c120ed2
...
...
@@ -208,7 +208,7 @@ int emm_recv_attach_accept(nas_user_t *user, attach_accept_msg *msg, int *emm_ca
guti
.
gummei
.
MMEcode
=
msg
->
guti
.
guti
.
mmecode
;
guti
.
m_tmsi
=
msg
->
guti
.
guti
.
mtmsi
;
}
printf
(
"emm_recv_attach_accept: guti %d%d%d%d%d%d
\n
"
,
guti
.
gummei
.
plmn
.
MCCdigit1
,
guti
.
gummei
.
plmn
.
MCCdigit2
,
guti
.
gummei
.
plmn
.
MCCdigit3
,
guti
.
gummei
.
plmn
.
MNCdigit1
,
guti
.
gummei
.
plmn
.
MNCdigit2
,
guti
.
gummei
.
plmn
.
MNCdigit3
);
/* Get the list of equivalent PLMNs */
int
n_eplmns
=
0
;
plmn_t
eplmn
;
...
...
@@ -222,7 +222,7 @@ int emm_recv_attach_accept(nas_user_t *user, attach_accept_msg *msg, int *emm_ca
eplmn
.
MNCdigit2
=
msg
->
equivalentplmns
.
mncdigit2
;
eplmn
.
MNCdigit3
=
msg
->
equivalentplmns
.
mncdigit3
;
}
printf
(
"emm_recv_attach_accept: plmn %d%d%d%d%d%d
\n
"
,
eplmn
.
MCCdigit1
,
eplmn
.
MCCdigit2
,
eplmn
.
MCCdigit3
,
eplmn
.
MNCdigit1
,
eplmn
.
MNCdigit2
,
eplmn
.
MNCdigit3
);
/* Execute attach procedure accepted by the network */
rc
=
emm_proc_attach_accept
(
user
,
T3412
,
T3402
,
T3423
,
n_tais
,
tai
,
pguti
,
n_eplmns
,
&
eplmn
,
...
...
openair3/NAS/UE/EMM/SAP/emm_send.c
View file @
9c120ed2
...
...
@@ -213,7 +213,7 @@ int emm_send_attach_request(const emm_as_establish_t *msg,
guti
->
mncdigit2
=
msg
->
UEid
.
guti
->
gummei
.
plmn
.
MNCdigit2
;
guti
->
mncdigit3
=
msg
->
UEid
.
guti
->
gummei
.
plmn
.
MNCdigit3
;
}
else
if
(
msg
->
UEid
.
imsi
)
{
LOG_TRACE
(
INFO
,
"EMMAS-SAP - Send Attach Request message with IMSI"
);
//
LOG_TRACE(INFO, "EMMAS-SAP - Send Attach Request message with IMSI");
/* Set IMSI mobile identity */
ImsiEpsMobileIdentity_t
*
imsi
=
&
emm_msg
->
oldgutiorimsi
.
imsi
;
imsi
->
typeofidentity
=
EPS_MOBILE_IDENTITY_IMSI
;
...
...
@@ -233,8 +233,9 @@ int emm_send_attach_request(const emm_as_establish_t *msg,
imsi
->
digit13
=
msg
->
UEid
.
imsi
->
u
.
num
.
digit13
;
imsi
->
digit14
=
msg
->
UEid
.
imsi
->
u
.
num
.
digit14
;
imsi
->
digit15
=
msg
->
UEid
.
imsi
->
u
.
num
.
digit15
;
LOG_TRACE
(
INFO
,
"EMMAS-SAP - Send Attach Request message with IMSI %d%d%d%d%d%d%d%d%d%d%d%d%d%d%d"
,
imsi
->
digit1
,
imsi
->
digit2
,
imsi
->
digit3
,
imsi
->
digit4
,
imsi
->
digit5
,
imsi
->
digit6
,
imsi
->
digit7
,
imsi
->
digit8
,
imsi
->
digit9
,
imsi
->
digit10
,
imsi
->
digit11
,
imsi
->
digit12
,
imsi
->
digit13
,
imsi
->
digit14
,
imsi
->
digit15
);
}
else
if
(
msg
->
UEid
.
imei
)
{
LOG_TRACE
(
INFO
,
"EMMAS-SAP - Send Attach Request message with IMEI"
);
//
LOG_TRACE(INFO, "EMMAS-SAP - Send Attach Request message with IMEI");
/* Set IMEI mobile identity */
ImeiEpsMobileIdentity_t
*
imei
=
&
emm_msg
->
oldgutiorimsi
.
imei
;
imei
->
typeofidentity
=
EPS_MOBILE_IDENTITY_IMEI
;
...
...
@@ -254,6 +255,7 @@ int emm_send_attach_request(const emm_as_establish_t *msg,
imei
->
digit13
=
msg
->
UEid
.
imei
->
u
.
num
.
digit13
;
imei
->
digit14
=
msg
->
UEid
.
imei
->
u
.
num
.
digit14
;
imei
->
digit15
=
msg
->
UEid
.
imei
->
u
.
num
.
digit15
;
LOG_TRACE
(
INFO
,
"EMMAS-SAP - Send Attach Request message with IMEI %d%d%d%d%d%d%d%d%d%d%d%d%d%d%d"
,
imei
->
digit1
,
imei
->
digit2
,
imei
->
digit3
,
imei
->
digit4
,
imei
->
digit5
,
imei
->
digit6
,
imei
->
digit7
,
imei
->
digit8
,
imei
->
digit9
,
imei
->
digit10
,
imei
->
digit11
,
imei
->
digit12
,
imei
->
digit13
,
imei
->
digit14
,
imei
->
digit15
);
}
/* Mandatory - UE network capability */
...
...
openair3/NAS/UE/ESM/PdnConnectivity.c
View file @
9c120ed2
...
...
@@ -364,7 +364,6 @@ int esm_proc_pdn_connectivity_accept(nas_user_t *user, int pti, esm_proc_pdn_typ
}
else
{
sprintf
(
apn_first_char
,
"%02X"
,
apn
->
value
[
0
]);
}
LOG_TRACE
(
INFO
,
"ESM-PROC - PDN connectivity accepted by the network "
"(pti=%d) APN = %s
\"
%s
\"
, IP address = %s"
,
pti
,
apn_first_char
,
isprint
(
apn
->
value
[
0
])
?
&
apn
->
value
[
0
]
:
&
apn
->
value
[
1
],
(
pdn_type
==
ESM_PDN_TYPE_IPV4
)
?
esm_data_get_ipv4_addr
(
pdn_addr
,
str
)
:
...
...
openair3/NAS/UE/ESM/SAP/esm_recv.c
View file @
9c120ed2
...
...
@@ -282,7 +282,7 @@ int esm_recv_activate_default_eps_bearer_context_request(nas_user_t *user, int p
const
activate_default_eps_bearer_context_request_msg
*
msg
)
{
LOG_FUNC_IN
;
char
str
[
128
];
int
esm_cause
=
ESM_CAUSE_SUCCESS
;
esm_pt_data_t
*
esm_pt_data
=
user
->
esm_pt_data
;
...
...
@@ -374,6 +374,7 @@ int esm_recv_activate_default_eps_bearer_context_request(nas_user_t *user, int p
&
msg
->
pdnaddress
.
pdnaddressinformation
,
&
msg
->
accesspointname
.
accesspointnamevalue
,
&
esm_cause
);
printf
(
"esm_recv_activate_default_eps_bearer_context_request: %s
\n
"
,
esm_data_get_ipv4_addr
(
&
msg
->
pdnaddress
.
pdnaddressinformation
,
str
));
if
(
pid
!=
RETURNerror
)
{
/* Create local default EPS bearer context */
...
...
openair3/NAS/UE/ESM/SAP/esm_sap.c
View file @
9c120ed2
...
...
@@ -364,7 +364,7 @@ static int _esm_sap_recv(nas_user_t *user, int msg_type, int is_standalone,
int
esm_cause
=
ESM_CAUSE_SUCCESS
;
int
rc
=
RETURNerror
;
int
decoder_rc
;
char
str
[
128
];
ESM_msg
esm_msg
;
LOG_FUNC_IN
;
...
...
@@ -433,10 +433,11 @@ static int _esm_sap_recv(nas_user_t *user, int msg_type, int is_standalone,
* Process activate default EPS bearer context request message
* received from the MME
*/
//esm_msg.activate_default_eps_bearer_context_request.pdnaddress.pdnaddressinformation.value[3]=esm_msg.activate_default_eps_bearer_context_request.pdnaddress.pdnaddressinformation.value[3]-2;
printf
(
"_esm_sap_recv: ip_addr %s, ip_addr_offset4 %d
\n
"
,
esm_data_get_ipv4_addr
(
&
esm_msg
.
activate_default_eps_bearer_context_request
.
pdnaddress
.
pdnaddressinformation
,
str
),
esm_msg
.
activate_default_eps_bearer_context_request
.
pdnaddress
.
pdnaddressinformation
.
value
[
3
]);
esm_cause
=
esm_recv_activate_default_eps_bearer_context_request
(
user
,
pti
,
ebi
,
&
esm_msg
.
activate_default_eps_bearer_context_request
);
if
(
(
esm_cause
==
ESM_CAUSE_SUCCESS
)
||
(
esm_cause
==
ESM_CAUSE_PTI_ALREADY_IN_USE
)
)
{
/* Return accept message */
...
...
@@ -612,7 +613,7 @@ static int _esm_sap_recv(nas_user_t *user, int msg_type, int is_standalone,
esm_cause
=
ESM_CAUSE_MESSAGE_TYPE_NOT_IMPLEMENTED
;
break
;
}
if
(
(
esm_cause
!=
ESM_CAUSE_SUCCESS
)
&&
(
esm_procedure
==
NULL
)
)
{
/* ESM message processing failed */
if
(
!
is_discarded
)
{
...
...
@@ -643,7 +644,7 @@ static int _esm_sap_recv(nas_user_t *user, int msg_type, int is_standalone,
/* Complete the relevant ESM procedure */
rc
=
(
*
esm_procedure
)(
user
,
is_standalone
,
ebi
,
rsp
,
triggered_by_ue
);
printf
(
"Encoded ESM %s, Encoded ESM response %s
\n
"
,
esm_data_get_ipv4_addr
(
req
,
str
),
esm_data_get_ipv4_addr
(
rsp
,
str
));
if
(
is_discarded
)
{
/* Return indication that received message has been discarded */
*
err
=
ESM_SAP_DISCARDED
;
...
...
openair3/NAS/UE/ESM/SAP/esm_send.c
View file @
9c120ed2
...
...
@@ -173,7 +173,7 @@ int esm_send_pdn_connectivity_request(int pti, int is_emergency, int pdn_type,
msg
->
accesspointname
.
accesspointnamevalue
.
value
=
(
uint8_t
*
)
apn
;
}
}
printf
(
"The PDN connectivity request message is sent by the UE to the network: apn %s, pdn_type %d
\n
"
,(
uint8_t
*
)
apn
,
pdn_type
);
/* Add PCO */
# define CONFIGURATION_PROTOCOL_PPP 0
# define PROTOCOL_ID_IPCP 0x8021
...
...
openair3/NAS/UE/ESM/esm_ebr_context.c
View file @
9c120ed2
...
...
@@ -221,8 +221,8 @@ int esm_ebr_context_create(
in_addr
.
s_addr
=
pdn
->
ip_addr
[
0
]
<<
24
|
((
pdn
->
ip_addr
[
1
]
<<
16
)
&
0x00FF0000
)
|
((
pdn
->
ip_addr
[
2
]
<<
8
)
&
0x0000FF00
)
|
(
pdn
->
ip_addr
[
3
]
&
0x000000FF
);
(
(
pdn
->
ip_addr
[
3
])
&
0x000000FF
);
printf
(
"ip_addr %d
\n
"
,
pdn
->
ip_addr
[
3
]);
in_addr
.
s_addr
=
htonl
(
in_addr
.
s_addr
);
tmp
=
inet_ntoa
(
in_addr
);
...
...
openair3/NAS/UE/nas_itti_messaging.c
View file @
9c120ed2
...
...
@@ -210,7 +210,7 @@ int nas_itti_kenb_refresh_req(const Byte_t kenb[32])
kenb
[
24
],
kenb
[
25
],
kenb
[
26
],
kenb
[
27
],
kenb
[
28
],
kenb
[
29
],
kenb
[
30
],
kenb
[
31
]);
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
NB_eNB_INST
+
0
/* TODO to be virtualized */
,
message_p
);
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
1
/*NB_eNB_INST*/
+
0
/* TODO to be virtualized */
,
message_p
);
}
int
nas_itti_cell_info_req
(
const
plmn_t
plmnID
,
const
Byte_t
rat
,
int
user_id
)
...
...
@@ -230,7 +230,7 @@ int nas_itti_cell_info_req(const plmn_t plmnID, const Byte_t rat, int user_id)
plmnID
.
MCCdigit1
,
plmnID
.
MCCdigit2
,
plmnID
.
MCCdigit3
,
plmnID
.
MNCdigit1
,
plmnID
.
MNCdigit2
,
plmnID
.
MNCdigit3
);
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
NB_eNB_INST
+
user_id
,
message_p
);
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
1
/*NB_eNB_INST*/
+
user_id
,
message_p
);
}
int
nas_itti_nas_establish_req
(
as_cause_t
cause
,
as_call_type_t
type
,
as_stmsi_t
s_tmsi
,
plmn_t
plmnID
,
Byte_t
*
data
,
uint32_t
length
,
int
user_id
)
...
...
@@ -255,7 +255,7 @@ int nas_itti_nas_establish_req(as_cause_t cause, as_call_type_t type, as_stmsi_t
plmnID
.
MCCdigit1
,
plmnID
.
MCCdigit2
,
plmnID
.
MCCdigit3
,
plmnID
.
MNCdigit1
,
plmnID
.
MNCdigit2
,
plmnID
.
MNCdigit3
);
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
NB_eNB_INST
+
user_id
,
message_p
);
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
1
/*NB_eNB_INST*/
+
user_id
,
message_p
);
}
int
nas_itti_ul_data_req
(
const
uint32_t
ue_id
,
void
*
const
data
,
const
uint32_t
length
,
int
user_id
)
...
...
@@ -268,7 +268,7 @@ int nas_itti_ul_data_req(const uint32_t ue_id, void *const data, const uint32_t
NAS_UPLINK_DATA_REQ
(
message_p
).
nasMsg
.
data
=
data
;
NAS_UPLINK_DATA_REQ
(
message_p
).
nasMsg
.
length
=
length
;
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
NB_eNB_INST
+
user_id
,
message_p
);
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
1
/*NB_eNB_INST*/
+
user_id
,
message_p
);
}
int
nas_itti_rab_establish_rsp
(
const
as_stmsi_t
s_tmsi
,
const
as_rab_id_t
rabID
,
const
nas_error_code_t
errCode
,
int
user_id
)
...
...
@@ -287,5 +287,5 @@ int nas_itti_rab_establish_rsp(const as_stmsi_t s_tmsi, const as_rab_id_t rabID,
NULL
,
0
,
"0 NAS_RAB_ESTABLI_RSP MME code %u m-TMSI %u rb id %u status %u"
,
s_tmsi
.
MMEcode
,
s_tmsi
.
m_tmsi
,
rabID
,
errCode
);
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
NB_eNB_INST
+
user_id
,
message_p
);
return
itti_send_msg_to_task
(
TASK_RRC_UE
,
1
/*NB_eNB_INST*/
+
user_id
,
message_p
);
}
openair3/NAS/UE/nas_ue_task.c
View file @
9c120ed2
...
...
@@ -95,14 +95,14 @@ void *nas_ue_task(void *args_p)
unsigned
int
Mod_id
;
int
result
;
//NB_eNB_INST=
NB_eNB_INST-
1;
//NB_eNB_INST=1;
nas_user_container_t
*
users
=
args_p
;
itti_mark_task_ready
(
TASK_NAS_UE
);
MSC_START_USE
();
/* Initialize UE NAS (EURECOM-NAS) */
printf
(
"nas_ue_task: # UEs = %d,NB_eNB_INST %d, NB_UE_INST %d
\n
"
,
users
->
count
,
NB_eNB_INST
,
NB_UE_INST
);
printf
(
"nas_ue_task: # UEs = %d,NB_eNB_INST %d, NB_UE_INST %d
\n
"
,
users
->
count
,
NB_eNB_INST
,
NB_UE_INST
);
for
(
int
i
=
0
;
i
<
users
->
count
;
i
++
)
{
nas_user_t
*
user
=
&
users
->
item
[
i
];
...
...
@@ -140,7 +140,7 @@ void *nas_ue_task(void *args_p)
}
/* Set UE activation state */
for
(
instance
=
NB_eNB_INST
;
instance
<
(
NB_eNB_INST
+
NB_UE_INST
);
instance
++
)
{
for
(
instance
=
1
/*NB_eNB_INST*/
;
instance
<
(
1
/*NB_eNB_INST*/
+
NB_UE_INST
);
instance
++
)
{
MessageDef
*
message_p
;
message_p
=
itti_alloc_new_message
(
TASK_NAS_UE
,
DEACTIVATE_MESSAGE
);
...
...
@@ -154,7 +154,8 @@ void *nas_ue_task(void *args_p)
if
(
msg_p
!=
NULL
)
{
msg_name
=
ITTI_MSG_NAME
(
msg_p
);
instance
=
ITTI_MSG_INSTANCE
(
msg_p
);
Mod_id
=
instance
-
NB_eNB_INST
;
Mod_id
=
instance
-
1
/*NB_eNB_INST*/
;
printf
(
"nas_ue_task: instance %d, INSTANCE_DEFAULT %d
\n
"
,
instance
,
INSTANCE_DEFAULT
);
if
(
instance
==
INSTANCE_DEFAULT
)
{
printf
(
"%s:%d: FATAL: instance is INSTANCE_DEFAULT, should not happen.
\n
"
,
__FILE__
,
__LINE__
);
...
...
@@ -283,6 +284,7 @@ void *nas_ue_task(void *args_p)
}
free
(
users
);
//NB_eNB_INST-2;
return
NULL
;
}
...
...
targets/RT/USER/lte-ue.c
View file @
9c120ed2
...
...
@@ -941,9 +941,10 @@ void *UE_thread(void *arg) {
init_UE_threads
(
UE
);
#ifdef NAS_UE
printf
(
"UE_thread: NAS_UE
\n
"
);
MessageDef
*
message_p
;
message_p
=
itti_alloc_new_message
(
TASK_NAS_UE
,
INITIALIZE_MESSAGE
);
itti_send_msg_to_task
(
TASK_NAS_UE
,
UE
->
Mod_id
+
NB_eNB_INST
,
message_p
);
itti_send_msg_to_task
(
TASK_NAS_UE
,
UE
->
Mod_id
+
1
/*NB_eNB_INST*/
,
message_p
);
#endif
int
sub_frame
=-
1
;
...
...
@@ -1206,7 +1207,7 @@ void *UE_thread_freq(void *arg) {
#ifdef NAS_UE
MessageDef
*
message_p
;
message_p
=
itti_alloc_new_message
(
TASK_NAS_UE
,
INITIALIZE_MESSAGE
);
itti_send_msg_to_task
(
TASK_NAS_UE
,
UE
->
Mod_id
+
NB_eNB_INST
,
message_p
);
itti_send_msg_to_task
(
TASK_NAS_UE
,
UE
->
Mod_id
+
1
/*NB_eNB_INST*/
,
message_p
);
#endif
int
sub_frame
=-
1
;
...
...
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