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
alex037yang
OpenXG-RAN
Commits
a2bb236b
Commit
a2bb236b
authored
4 years ago
by
Chenyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
signal is ok pdu session response is ok
parent
65d86435
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
27 additions
and
22 deletions
+27
-22
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR/rrc_gNB_NGAP.c
+10
-8
openair3/GTPV1-U/gtpv1u_gNB.c
openair3/GTPV1-U/gtpv1u_gNB.c
+1
-0
openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
+2
-2
openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
+1
-1
openair3/NGAP/ngap_gNB_encoder.c
openair3/NGAP/ngap_gNB_encoder.c
+1
-1
openair3/NGAP/ngap_gNB_handlers.c
openair3/NGAP/ngap_gNB_handlers.c
+1
-0
openair3/NGAP/ngap_gNB_nas_procedures.c
openair3/NGAP/ngap_gNB_nas_procedures.c
+11
-10
No files found.
openair2/RRC/NR/rrc_gNB_NGAP.c
View file @
a2bb236b
...
@@ -972,6 +972,7 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
...
@@ -972,6 +972,7 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
ue_context_p
->
ue_context
.
pdusession
[
i
].
param
=
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
pdusession_setup_params
[
pdu_sessions_done
];
ue_context_p
->
ue_context
.
pdusession
[
i
].
param
=
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
pdusession_setup_params
[
pdu_sessions_done
];
create_tunnel_req
.
pdusession_id
[
pdu_sessions_done
]
=
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
pdusession_setup_params
[
pdu_sessions_done
].
pdusession_id
;
create_tunnel_req
.
pdusession_id
[
pdu_sessions_done
]
=
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
pdusession_setup_params
[
pdu_sessions_done
].
pdusession_id
;
create_tunnel_req
.
upf_NGu_teid
[
pdu_sessions_done
]
=
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
pdusession_setup_params
[
pdu_sessions_done
].
gtp_teid
;
create_tunnel_req
.
upf_NGu_teid
[
pdu_sessions_done
]
=
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
pdusession_setup_params
[
pdu_sessions_done
].
gtp_teid
;
printf
(
"----------------liuyu--------------teid from amf %x
\n
----------"
,
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
pdusession_setup_params
[
pdu_sessions_done
].
gtp_teid
);
memcpy
(
create_tunnel_req
.
upf_addr
[
pdu_sessions_done
].
buffer
,
memcpy
(
create_tunnel_req
.
upf_addr
[
pdu_sessions_done
].
buffer
,
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
pdusession_setup_params
[
i
].
upf_addr
.
buffer
,
NGAP_PDUSESSION_SETUP_REQ
(
msg_p
).
pdusession_setup_params
[
i
].
upf_addr
.
buffer
,
sizeof
(
uint8_t
)
*
20
);
sizeof
(
uint8_t
)
*
20
);
...
@@ -994,10 +995,11 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
...
@@ -994,10 +995,11 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
create_tunnel_req
.
rnti
=
ue_context_p
->
ue_context
.
rnti
;
create_tunnel_req
.
rnti
=
ue_context_p
->
ue_context
.
rnti
;
create_tunnel_req
.
num_tunnels
=
pdu_sessions_done
;
create_tunnel_req
.
num_tunnels
=
pdu_sessions_done
;
ret
=
gtpv1u_create_ngu_tunnel
(
//ret = gtpv1u_create_ngu_tunnel(
instance
,
// instance,
&
create_tunnel_req
,
// &create_tunnel_req,
&
create_tunnel_resp
);
// &create_tunnel_resp);
ret
=
0
;
if
(
ret
!=
0
)
{
if
(
ret
!=
0
)
{
LOG_E
(
NR_RRC
,
"rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ : gtpv1u_create_ngu_tunnel failed,start to release UE %x
\n
"
,
ue_context_p
->
ue_context
.
rnti
);
LOG_E
(
NR_RRC
,
"rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ : gtpv1u_create_ngu_tunnel failed,start to release UE %x
\n
"
,
ue_context_p
->
ue_context
.
rnti
);
ue_context_p
->
ue_context
.
ue_release_timer_ng
=
1
;
ue_context_p
->
ue_context
.
ue_release_timer_ng
=
1
;
...
@@ -1009,10 +1011,10 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
...
@@ -1009,10 +1011,10 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
ue_context_p
->
ue_context
.
ul_failure_timer
=
0
;
ue_context_p
->
ue_context
.
ul_failure_timer
=
0
;
return
(
0
);
return
(
0
);
}
}
nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP
(
//
nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
&
ctxt
,
//
&ctxt,
&
create_tunnel_resp
,
//
&create_tunnel_resp,
&
inde_list
[
0
]);
//
&inde_list[0]);
ue_context_p
->
ue_context
.
setup_pdu_sessions
+=
nb_pdusessions_tosetup
;
ue_context_p
->
ue_context
.
setup_pdu_sessions
+=
nb_pdusessions_tosetup
;
// TEST
// TEST
...
...
This diff is collapsed.
Click to expand it.
openair3/GTPV1-U/gtpv1u_gNB.c
View file @
a2bb236b
...
@@ -319,6 +319,7 @@ void *gtpv1u_gNB_task(void *args) {
...
@@ -319,6 +319,7 @@ void *gtpv1u_gNB_task(void *args) {
return
NULL
;
return
NULL
;
}
}
int
nr_gtpv1u_gNB_init
(
void
)
{
int
nr_gtpv1u_gNB_init
(
void
)
{
NwGtpv1uRcT
rc
=
NW_GTPV1U_FAILURE
;
NwGtpv1uRcT
rc
=
NW_GTPV1U_FAILURE
;
NwGtpv1uUlpEntityT
ulp
;
NwGtpv1uUlpEntityT
ulp
;
...
...
This diff is collapsed.
Click to expand it.
openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
View file @
a2bb236b
...
@@ -543,7 +543,7 @@ nwGtpv1uProcessGpdu( NwGtpv1uStackT *thiz,
...
@@ -543,7 +543,7 @@ nwGtpv1uProcessGpdu( NwGtpv1uStackT *thiz,
//pTunnelEndPoint = RB_FIND(NwGtpv1uTunnelEndPointIdentifierMap,
//pTunnelEndPoint = RB_FIND(NwGtpv1uTunnelEndPointIdentifierMap,
// &(thiz->teidMap), &tunnelEndPointKey);
// &(thiz->teidMap), &tunnelEndPointKey);
pTunnelEndPoint
=
(
char
*
)
malloc
(
1024
);
pTunnelEndPoint
=
(
char
*
)
malloc
(
1024
);
pTunnelEndPoint
->
teid
=
0x0
1
;
pTunnelEndPoint
->
teid
=
0x0
2
;
pTunnelEndPoint
->
peerAddr
=
peerIp
;
pTunnelEndPoint
->
peerAddr
=
peerIp
;
pTunnelEndPoint
->
hUlpSession
=
0x12
;
pTunnelEndPoint
->
hUlpSession
=
0x12
;
//pTunnelEndPoint->pStack->ulp.hUlp = 0x34;
//pTunnelEndPoint->pStack->ulp.hUlp = 0x34;
...
@@ -868,8 +868,8 @@ nwGtpv1uProcessUdpReq( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
...
@@ -868,8 +868,8 @@ nwGtpv1uProcessUdpReq( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
#endif
#endif
thiz
=
(
NwGtpv1uStackT
*
)
hGtpuStackHandle
;
thiz
=
(
NwGtpv1uStackT
*
)
hGtpuStackHandle
;
NW_ASSERT
(
thiz
);
NW_ASSERT
(
thiz
);
msgType
=
*
((
uint8_t
*
)(
udpData
+
1
));
msgType
=
*
((
uint8_t
*
)(
udpData
+
1
));
switch
(
msgType
)
{
switch
(
msgType
)
{
...
...
This diff is collapsed.
Click to expand it.
openair3/GTPV1-U/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
View file @
a2bb236b
...
@@ -118,7 +118,7 @@ nwGtpSessionSendMsgApiToUlpEntity(NwGtpv1uTunnelEndPointT *thiz,
...
@@ -118,7 +118,7 @@ nwGtpSessionSendMsgApiToUlpEntity(NwGtpv1uTunnelEndPointT *thiz,
api
.
apiType
=
NW_GTPV1U_ULP_API_RECV_TPDU
;
api
.
apiType
=
NW_GTPV1U_ULP_API_RECV_TPDU
;
api
.
apiInfo
.
recvMsgInfo
.
hUlpSession
=
thiz
->
hUlpSession
;
api
.
apiInfo
.
recvMsgInfo
.
hUlpSession
=
thiz
->
hUlpSession
;
api
.
apiInfo
.
recvMsgInfo
.
teid
=
0x0
1
;
api
.
apiInfo
.
recvMsgInfo
.
teid
=
0x0
2
;
//api.apiInfo.recvMsgInfo.teid = thiz->teid;
//api.apiInfo.recvMsgInfo.teid = thiz->teid;
api
.
apiInfo
.
recvMsgInfo
.
hMsg
=
(
NwGtpv1uMsgHandleT
)
pMsg
;
api
.
apiInfo
.
recvMsgInfo
.
hMsg
=
(
NwGtpv1uMsgHandleT
)
pMsg
;
...
...
This diff is collapsed.
Click to expand it.
openair3/NGAP/ngap_gNB_encoder.c
View file @
a2bb236b
...
@@ -73,7 +73,7 @@ int ngap_gNB_encode_pdu(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len) {
...
@@ -73,7 +73,7 @@ int ngap_gNB_encode_pdu(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len) {
return
-
1
;
return
-
1
;
}
}
ASN_STRUCT_FREE_CONTENTS_ONLY
(
asn_DEF_NGAP_NGAP_PDU
,
pdu
);
//
ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, pdu);
return
ret
;
return
ret
;
}
}
...
...
This diff is collapsed.
Click to expand it.
openair3/NGAP/ngap_gNB_handlers.c
View file @
a2bb236b
...
@@ -1369,6 +1369,7 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t assoc_id,
...
@@ -1369,6 +1369,7 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t assoc_id,
gTPTunnel_p
->
transportLayerAddress
.
size
*
8
-
gTPTunnel_p
->
transportLayerAddress
.
bits_unused
;
gTPTunnel_p
->
transportLayerAddress
.
size
*
8
-
gTPTunnel_p
->
transportLayerAddress
.
bits_unused
;
memcpy
(
NGAP_PDUSESSION_SETUP_REQ
(
message_p
).
pdusession_setup_params
[
i
].
upf_addr
.
buffer
,
memcpy
(
NGAP_PDUSESSION_SETUP_REQ
(
message_p
).
pdusession_setup_params
[
i
].
upf_addr
.
buffer
,
gTPTunnel_p
->
transportLayerAddress
.
buf
,
gTPTunnel_p
->
transportLayerAddress
.
size
);
gTPTunnel_p
->
transportLayerAddress
.
buf
,
gTPTunnel_p
->
transportLayerAddress
.
size
);
printf
(
"---liuyu-reveive teid ====%x
\n
"
,
NGAP_PDUSESSION_SETUP_REQ
(
message_p
).
pdusession_setup_params
[
i
].
gtp_teid
);
}
}
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
openair3/NGAP/ngap_gNB_nas_procedures.c
View file @
a2bb236b
...
@@ -1176,16 +1176,17 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance,
...
@@ -1176,16 +1176,17 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance,
/* Encode procedure has failed... */
/* Encode procedure has failed... */
return
-
1
;
return
-
1
;
}
}
printf
(
"----liuyu-----assoc_id-----------%d
\n
"
,
ue_context_p
->
amf_ref
->
assoc_id
);
MSC_LOG_TX_MESSAGE
(
MSC_NGAP_GNB
,
// MSC_LOG_TX_MESSAGE(
MSC_NGAP_AMF
,
// MSC_NGAP_GNB,
(
const
char
*
)
buffer
,
// MSC_NGAP_AMF,
length
,
// (const char *)buffer,
MSC_AS_TIME_FMT
" PduSession Setup successfulOutcome gNB_ue_ngap_id %u amf_ue_ngap_id %u"
,
// length,
0
,
0
,
//MSC_AS_TIME_ARGS(ctxt_pP),
// MSC_AS_TIME_FMT" PduSession Setup successfulOutcome gNB_ue_ngap_id %u amf_ue_ngap_id %u",
pdusession_setup_resp_p
->
gNB_ue_ngap_id
,
// 0,0,//MSC_AS_TIME_ARGS(ctxt_pP),
ue_context_p
->
amf_ue_ngap_id
);
// pdusession_setup_resp_p->gNB_ue_ngap_id,
// ue_context_p->amf_ue_ngap_id);
/* UE associated signalling -> use the allocated stream */
/* UE associated signalling -> use the allocated stream */
ngap_gNB_itti_send_sctp_data_req
(
ngap_gNB_instance_p
->
instance
,
ngap_gNB_itti_send_sctp_data_req
(
ngap_gNB_instance_p
->
instance
,
ue_context_p
->
amf_ref
->
assoc_id
,
buffer
,
ue_context_p
->
amf_ref
->
assoc_id
,
buffer
,
...
...
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