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
zzha zzha
OpenXG-RAN
Commits
2b22daa4
Commit
2b22daa4
authored
Sep 11, 2020
by
zhenghuangkun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Warning
parent
5dc6712c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
openair3/NGAP/ngap_gNB.c
openair3/NGAP/ngap_gNB.c
+3
-2
openair3/NGAP/ngap_gNB_defs.h
openair3/NGAP/ngap_gNB_defs.h
+1
-1
openair3/NGAP/ngap_gNB_handlers.c
openair3/NGAP/ngap_gNB_handlers.c
+2
-2
openair3/UTILS/conversions.h
openair3/UTILS/conversions.h
+3
-3
No files found.
openair3/NGAP/ngap_gNB.c
View file @
2b22daa4
...
...
@@ -471,10 +471,11 @@ static int ngap_gNB_generate_ng_setup_request(
ie
->
value
.
choice
.
GlobalRANNodeID
.
choice
.
globalGNB_ID
.
gNB_ID
.
present
=
NGAP_GNB_ID_PR_gNB_ID
;
MACRO_GNB_ID_TO_BIT_STRING
(
instance_p
->
gNB_id
,
&
ie
->
value
.
choice
.
GlobalRANNodeID
.
choice
.
globalGNB_ID
.
gNB_ID
.
choice
.
gNB_ID
);
NGAP_INFO
(
"%
d ->
%02x%02x%02x
\n
"
,
instance_p
->
gNB_id
,
NGAP_INFO
(
"%
u -> %02x
%02x%02x%02x
\n
"
,
instance_p
->
gNB_id
,
ie
->
value
.
choice
.
GlobalRANNodeID
.
choice
.
globalGNB_ID
.
gNB_ID
.
choice
.
gNB_ID
.
buf
[
0
],
ie
->
value
.
choice
.
GlobalRANNodeID
.
choice
.
globalGNB_ID
.
gNB_ID
.
choice
.
gNB_ID
.
buf
[
1
],
ie
->
value
.
choice
.
GlobalRANNodeID
.
choice
.
globalGNB_ID
.
gNB_ID
.
choice
.
gNB_ID
.
buf
[
2
]);
ie
->
value
.
choice
.
GlobalRANNodeID
.
choice
.
globalGNB_ID
.
gNB_ID
.
choice
.
gNB_ID
.
buf
[
2
],
ie
->
value
.
choice
.
GlobalRANNodeID
.
choice
.
globalGNB_ID
.
gNB_ID
.
choice
.
gNB_ID
.
buf
[
3
]);
ASN_SEQUENCE_ADD
(
&
out
->
protocolIEs
.
list
,
ie
);
/* optional */
...
...
openair3/NGAP/ngap_gNB_defs.h
View file @
2b22daa4
...
...
@@ -245,7 +245,7 @@ typedef struct ngap_gNB_instance_s {
* In our case the gNB is a macro gNB so the id will be 20 bits long.
* For Home gNB id, this field should be 36 bits long.
*/
uint
64
_t
gNB_id
;
uint
32
_t
gNB_id
;
/* The type of the cell */
enum
cell_type_e
cell_type
;
...
...
openair3/NGAP/ngap_gNB_handlers.c
View file @
2b22daa4
...
...
@@ -334,7 +334,7 @@ int ngap_gNB_handle_ng_setup_response(uint32_t assoc_id,
for
(
i
=
0
;
i
<
ie
->
value
.
choice
.
ServedGUAMIList
.
list
.
count
;
i
++
)
{
NGAP_ServedGUAMIItem_t
*
guami_item_p
;
struct
served_guami_s
*
new_guami_p
;
int
j
;
guami_item_p
=
ie
->
value
.
choice
.
ServedGUAMIList
.
list
.
array
[
i
];
new_guami_p
=
calloc
(
1
,
sizeof
(
struct
served_guami_s
));
STAILQ_INIT
(
&
new_guami_p
->
served_plmns
);
...
...
@@ -1008,7 +1008,7 @@ int ngap_gNB_handle_initial_context_request(uint32_t assoc_id,
break
;
default:
NGAP_ERROR
(
"could not found protocolIEs id %d
\n
"
,
pdusessionTransfer_ies
->
id
);
NGAP_ERROR
(
"could not found protocolIEs id %
l
d
\n
"
,
pdusessionTransfer_ies
->
id
);
return
-
1
;
}
}
...
...
openair3/UTILS/conversions.h
View file @
2b22daa4
...
...
@@ -509,8 +509,8 @@ do { \
(bITsTRING)->buf = calloc(4, sizeof(uint8_t)); \
(bITsTRING)->buf[0] = ((mACRO) >> 20); \
(bITsTRING)->buf[1] = (mACRO) >> 12; \
(bITsTRING)->buf[
3] = (mACRO) >> 4; \
(
bITsTRING
)
->
buf
[
4
]
=
((
mACRO
)
&
0x0f
)
<<
4
;
\
(bITsTRING)->buf[
2] = (mACRO) >> 4; \
(bITsTRING)->buf[
3
] = ((mACRO) & 0x0f) << 4; \
(bITsTRING)->size = 4; \
(bITsTRING)->bits_unused = 4; \
} while(0)
...
...
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