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
wangjie
OpenXG-RAN
Commits
a205dcbf
Commit
a205dcbf
authored
May 31, 2021
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix GTP for LTE
parent
1145a551
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
15 deletions
+15
-15
executables/nr-softmodem.c
executables/nr-softmodem.c
+2
-2
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+1
-1
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+1
-1
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+1
-1
openair2/RRC/LTE/rrc_eNB_S1AP.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
+1
-1
openair2/RRC/NR/rrc_gNB_nsa.c
openair2/RRC/NR/rrc_gNB_nsa.c
+1
-1
openair3/ocp-gtpu/gtp_itf.h
openair3/ocp-gtpu/gtp_itf.h
+8
-8
No files found.
executables/nr-softmodem.c
View file @
a205dcbf
...
@@ -370,7 +370,7 @@ int create_gNB_tasks(uint32_t gnb_nb) {
...
@@ -370,7 +370,7 @@ int create_gNB_tasks(uint32_t gnb_nb) {
}
}
}
}
if
(
itti_create_task
(
TASK_GTPV1_U
,
&
nr_gtpv1u_gNB_task
,
NULL
)
<
0
)
{
if
(
itti_create_task
(
TASK_GTPV1_U
,
&
nr_gtpv1u_gNB_task
_var
,
NULL
)
<
0
)
{
LOG_E
(
GTPU
,
"Create task for GTPV1U failed
\n
"
);
LOG_E
(
GTPU
,
"Create task for GTPV1U failed
\n
"
);
return
-
1
;
return
-
1
;
}
}
...
@@ -395,7 +395,7 @@ int create_gNB_tasks(uint32_t gnb_nb) {
...
@@ -395,7 +395,7 @@ int create_gNB_tasks(uint32_t gnb_nb) {
}
}
}
}
if
(
itti_create_task
(
TASK_GTPV1_U
,
&
nr_gtpv1u_gNB_task
,
NULL
)
<
0
)
{
if
(
itti_create_task
(
TASK_GTPV1_U
,
&
nr_gtpv1u_gNB_task
_var
,
NULL
)
<
0
)
{
LOG_E
(
GTPU
,
"Create task for GTPV1U failed
\n
"
);
LOG_E
(
GTPU
,
"Create task for GTPV1U failed
\n
"
);
return
-
1
;
return
-
1
;
}
}
...
...
openair2/ENB_APP/enb_config.c
View file @
a205dcbf
...
@@ -2076,7 +2076,7 @@ int RCconfig_gtpu(void ) {
...
@@ -2076,7 +2076,7 @@ int RCconfig_gtpu(void ) {
GTPV1U_ENB_S1_REQ
(
message
).
enb_port_for_S1u_S12_S4_up
=
enb_port_for_S1U
;
GTPV1U_ENB_S1_REQ
(
message
).
enb_port_for_S1u_S12_S4_up
=
enb_port_for_S1U
;
strcpy
(
GTPV1U_ENB_S1_REQ
(
message
).
addrStr
,
address
);
strcpy
(
GTPV1U_ENB_S1_REQ
(
message
).
addrStr
,
address
);
sprintf
(
GTPV1U_ENB_S1_REQ
(
message
).
portStr
,
"%d"
,
enb_port_for_S1U
);
sprintf
(
GTPV1U_ENB_S1_REQ
(
message
).
portStr
,
"%d"
,
enb_port_for_S1U
);
itti_send_msg_to_task
(
TASK_
VARIABLE
,
0
,
message
);
// data model is wrong: gtpu doesn't have enb_id (or module_id)
itti_send_msg_to_task
(
TASK_
GTPV1_U
,
0
,
message
);
// data model is wrong: gtpu doesn't have enb_id (or module_id)
}
else
}
else
LOG_E
(
GTPU
,
"invalid address for S1U
\n
"
);
LOG_E
(
GTPU
,
"invalid address for S1U
\n
"
);
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
a205dcbf
...
@@ -1023,7 +1023,7 @@ pdcp_data_ind(
...
@@ -1023,7 +1023,7 @@ pdcp_data_ind(
GTPV1U_ENB_TUNNEL_DATA_REQ
(
message_p
).
offset
=
GTPU_HEADER_OVERHEAD_MAX
;
GTPV1U_ENB_TUNNEL_DATA_REQ
(
message_p
).
offset
=
GTPU_HEADER_OVERHEAD_MAX
;
GTPV1U_ENB_TUNNEL_DATA_REQ
(
message_p
).
rnti
=
ctxt_pP
->
rnti
;
GTPV1U_ENB_TUNNEL_DATA_REQ
(
message_p
).
rnti
=
ctxt_pP
->
rnti
;
GTPV1U_ENB_TUNNEL_DATA_REQ
(
message_p
).
rab_id
=
rb_id
+
4
;
GTPV1U_ENB_TUNNEL_DATA_REQ
(
message_p
).
rab_id
=
rb_id
+
4
;
itti_send_msg_to_task
(
TASK_
VARIABLE
,
INSTANCE_DEFAULT
,
message_p
);
itti_send_msg_to_task
(
TASK_
GTPV1_U
,
INSTANCE_DEFAULT
,
message_p
);
packet_forwarded
=
TRUE
;
packet_forwarded
=
TRUE
;
}
}
}
else
{
}
else
{
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
a205dcbf
...
@@ -4999,7 +4999,7 @@ void rrc_eNB_handover_ue_context_release(
...
@@ -4999,7 +4999,7 @@ void rrc_eNB_handover_ue_context_release(
ue_context_p
->
ue_context
.
enb_gtp_ebi
[
e_rab
]
=
0
;
ue_context_p
->
ue_context
.
enb_gtp_ebi
[
e_rab
]
=
0
;
}
}
itti_send_msg_to_task
(
TASK_
VARIABLE
,
ctxt_pP
->
module_id
,
msg_delete_tunnels_p
);
itti_send_msg_to_task
(
TASK_
GTPV1_U
,
ctxt_pP
->
module_id
,
msg_delete_tunnels_p
);
struct
rrc_ue_s1ap_ids_s
*
rrc_ue_s1ap_ids
=
NULL
;
struct
rrc_ue_s1ap_ids_s
*
rrc_ue_s1ap_ids
=
NULL
;
rrc_ue_s1ap_ids
=
rrc_eNB_S1AP_get_ue_ids
(
RC
.
rrc
[
ctxt_pP
->
module_id
],
0
,
eNB_ue_s1ap_id
);
rrc_ue_s1ap_ids
=
rrc_eNB_S1AP_get_ue_ids
(
RC
.
rrc
[
ctxt_pP
->
module_id
],
0
,
eNB_ue_s1ap_id
);
...
...
openair2/RRC/LTE/rrc_eNB_S1AP.c
View file @
a205dcbf
...
@@ -1788,7 +1788,7 @@ int rrc_eNB_process_S1AP_E_RAB_RELEASE_COMMAND(MessageDef *msg_p, const char *ms
...
@@ -1788,7 +1788,7 @@ int rrc_eNB_process_S1AP_E_RAB_RELEASE_COMMAND(MessageDef *msg_p, const char *ms
}
}
}
}
itti_send_msg_to_task
(
TASK_
VARIABLE
,
instance
,
msg_delete_tunnels_p
);
itti_send_msg_to_task
(
TASK_
GTPV1_U
,
instance
,
msg_delete_tunnels_p
);
//S1AP_E_RAB_RELEASE_RESPONSE
//S1AP_E_RAB_RELEASE_RESPONSE
rrc_eNB_send_S1AP_E_RAB_RELEASE_RESPONSE
(
&
ctxt
,
ue_context_p
,
xid
);
rrc_eNB_send_S1AP_E_RAB_RELEASE_RESPONSE
(
&
ctxt
,
ue_context_p
,
xid
);
}
}
...
...
openair2/RRC/NR/rrc_gNB_nsa.c
View file @
a205dcbf
...
@@ -292,7 +292,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
...
@@ -292,7 +292,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
create_tunnel_req
.
num_tunnels
=
m
->
nb_e_rabs_tobeadded
;
create_tunnel_req
.
num_tunnels
=
m
->
nb_e_rabs_tobeadded
;
RB_INSERT
(
rrc_nr_ue_tree_s
,
&
RC
.
nrrrc
[
rrc
->
module_id
]
->
rrc_ue_head
,
ue_context_p
);
RB_INSERT
(
rrc_nr_ue_tree_s
,
&
RC
.
nrrrc
[
rrc
->
module_id
]
->
rrc_ue_head
,
ue_context_p
);
PROTOCOL_CTXT_SET_BY_MODULE_ID
(
&
ctxt
,
rrc
->
module_id
,
GNB_FLAG_YES
,
ue_context_p
->
ue_id_rnti
,
0
,
0
,
rrc
->
module_id
);
PROTOCOL_CTXT_SET_BY_MODULE_ID
(
&
ctxt
,
rrc
->
module_id
,
GNB_FLAG_YES
,
ue_context_p
->
ue_id_rnti
,
0
,
0
,
rrc
->
module_id
);
gtpv1u_create_s1u_tunnel
(
gtpv1u_create_s1u_tunnel
_var
(
ctxt
.
instance
,
ctxt
.
instance
,
&
create_tunnel_req
,
&
create_tunnel_req
,
&
create_tunnel_resp
);
&
create_tunnel_resp
);
...
...
openair3/ocp-gtpu/gtp_itf.h
View file @
a205dcbf
...
@@ -9,12 +9,12 @@ extern "C" {
...
@@ -9,12 +9,12 @@ extern "C" {
#include <openair3/GTPV1-U/gtpv1u_eNB_defs.h>
#include <openair3/GTPV1-U/gtpv1u_eNB_defs.h>
#if defined(NEW_GTPU)
#if defined(NEW_GTPU)
#define gtpv1u_create_s1u_tunnel ocp_gtpv1u_create_s1u_tunnel
#define gtpv1u_create_s1u_tunnel
_var
ocp_gtpv1u_create_s1u_tunnel
#define gtpv1u_update_s1u_tunnel ocp_gtpv1u_update_s1u_tunnel
#define gtpv1u_update_s1u_tunnel
_var
ocp_gtpv1u_update_s1u_tunnel
#define gtpv1u_delete_s1u_tunnel ocp_gtpv1u_delete_s1u_tunnel
#define gtpv1u_delete_s1u_tunnel
_var
ocp_gtpv1u_delete_s1u_tunnel
#define gtpv1u_create_x2u_tunnel ocp_gtpv1u_create_x2u_tunnel
#define gtpv1u_create_x2u_tunnel
_var
ocp_gtpv1u_create_x2u_tunnel
#define gtpv1u_eNB_task ocp_gtpv1uTask
#define gtpv1u_eNB_task
_var
ocp_gtpv1uTask
#define nr_gtpv1u_gNB_task ocp_gtpv1uTask
#define nr_gtpv1u_gNB_task
_var
ocp_gtpv1uTask
#define TASK_VARIABLE OCP_GTPV1_U
#define TASK_VARIABLE OCP_GTPV1_U
#else
#else
#define TASK_VARIABLE TASK_GTPV1_U
#define TASK_VARIABLE TASK_GTPV1_U
...
...
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