Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
890a437d
Commit
890a437d
authored
Aug 05, 2019
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve x2ap_gNB_generate_ENDC_x2_setup_response
parent
4ad172c1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
+12
-4
openair2/X2AP/x2ap_eNB_generate_messages.c
openair2/X2AP/x2ap_eNB_generate_messages.c
+12
-4
No files found.
openair2/X2AP/x2ap_eNB_generate_messages.c
View file @
890a437d
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
#include "intertask_interface.h"
#include "intertask_interface.h"
#include "X2AP_LastVisitedCell-Item.h"
#include "X2AP_LastVisitedCell-Item.h"
#include "X2AP_FreqBandNrItem.h"
#include "x2ap_common.h"
#include "x2ap_common.h"
#include "x2ap_eNB.h"
#include "x2ap_eNB.h"
...
@@ -1345,7 +1346,7 @@ int x2ap_eNB_generate_ENDC_x2_setup_request(
...
@@ -1345,7 +1346,7 @@ int x2ap_eNB_generate_ENDC_x2_setup_request(
ASN_SEQUENCE_ADD
(
&
out
->
protocolIEs
.
list
,
ie
);
ASN_SEQUENCE_ADD
(
&
out
->
protocolIEs
.
list
,
ie
);
if
(
x2ap_eNB_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
if
(
x2ap_eNB_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
X2AP_ERROR
(
"Failed to encode
X2 setup response
\n
"
);
X2AP_ERROR
(
"Failed to encode
ENDC X2 setup request
\n
"
);
return
-
1
;
return
-
1
;
}
}
...
@@ -1442,9 +1443,17 @@ int x2ap_gNB_generate_ENDC_x2_setup_response(
...
@@ -1442,9 +1443,17 @@ int x2ap_gNB_generate_ENDC_x2_setup_response(
}
}
if
(
instance_p
->
frame_type
[
i
]
==
TDD
)
{
// Panos: Remember to change that to TDD
if
(
instance_p
->
frame_type
[
i
]
==
TDD
)
{
// Panos: Remember to change that to TDD
X2AP_FreqBandNrItem_t
*
freq_band
;
servedCellMember
->
servedNRCellInfo
.
nrModeInfo
.
present
=
X2AP_ServedNRCell_Information__nrModeInfo_PR_tdd
;
servedCellMember
->
servedNRCellInfo
.
nrModeInfo
.
present
=
X2AP_ServedNRCell_Information__nrModeInfo_PR_tdd
;
servedCellMember
->
servedNRCellInfo
.
nrModeInfo
.
choice
.
tdd
.
nRFreqInfo
.
nRARFCN
=
0
;
//instance_p->tdd_nRARFCN[i];
servedCellMember
->
servedNRCellInfo
.
nrModeInfo
.
choice
.
tdd
.
nRFreqInfo
.
nRARFCN
=
0
;
//instance_p->tdd_nRARFCN[i];
/*Missing addition of Frequency Band List item here, can't find it... */
/* addition of Frequency Band List */
freq_band
=
calloc
(
1
,
sizeof
(
X2AP_FreqBandNrItem_t
));
if
(
freq_band
==
NULL
)
exit
(
1
);
freq_band
->
freqBandIndicatorNr
=
1
;
/* TODO: put correct value */
ASN_SEQUENCE_ADD
(
&
servedCellMember
->
servedNRCellInfo
.
nrModeInfo
.
choice
.
tdd
.
nRFreqInfo
.
freqBandListNr
,
freq_band
);
switch
(
instance_p
->
N_RB_DL
[
i
])
{
switch
(
instance_p
->
N_RB_DL
[
i
])
{
case
50
:
case
50
:
//This is not correct. Just to be able to test X2 only using an eNB instead of gNB
//This is not correct. Just to be able to test X2 only using an eNB instead of gNB
...
@@ -1491,7 +1500,6 @@ int x2ap_gNB_generate_ENDC_x2_setup_response(
...
@@ -1491,7 +1500,6 @@ int x2ap_gNB_generate_ENDC_x2_setup_response(
}
}
/*Don't know where to extract the value of measurementTimingConfiguration from. Set it to 0 for now */
/*Don't know where to extract the value of measurementTimingConfiguration from. Set it to 0 for now */
INT8_TO_OCTET_STRING
(
0
,
&
servedCellMember
->
servedNRCellInfo
.
measurementTimingConfiguration
);
INT8_TO_OCTET_STRING
(
0
,
&
servedCellMember
->
servedNRCellInfo
.
measurementTimingConfiguration
);
}
}
ASN_SEQUENCE_ADD
(
&
ie_GNB_ENDC
->
value
.
choice
.
ServedNRcellsENDCX2ManagementList
.
list
,
servedCellMember
);
ASN_SEQUENCE_ADD
(
&
ie_GNB_ENDC
->
value
.
choice
.
ServedNRcellsENDCX2ManagementList
.
list
,
servedCellMember
);
}
}
...
@@ -1502,7 +1510,7 @@ int x2ap_gNB_generate_ENDC_x2_setup_response(
...
@@ -1502,7 +1510,7 @@ int x2ap_gNB_generate_ENDC_x2_setup_response(
ASN_SEQUENCE_ADD
(
&
out
->
protocolIEs
.
list
,
ie
);
ASN_SEQUENCE_ADD
(
&
out
->
protocolIEs
.
list
,
ie
);
if
(
x2ap_eNB_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
if
(
x2ap_eNB_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
X2AP_ERROR
(
"Failed to encode
X2 setup request
\n
"
);
X2AP_ERROR
(
"Failed to encode
ENDC X2 setup response
\n
"
);
return
-
1
;
return
-
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