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
bb863f77
Commit
bb863f77
authored
Mar 18, 2021
by
David Kim
Browse files
Options
Browse Files
Download
Plain Diff
resolving conflict
parents
d50a985f
5601c542
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
+2
-2
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
+7
-7
No files found.
ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
View file @
bb863f77
...
...
@@ -198,7 +198,7 @@ eNBs =
ENB_PORT_FOR_S1U
=
2152
;
# Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C
=
"127.0.0.1"
;
ENB_PORT_FOR_X2C
=
36422
;
# Spec 36422
};
}
);
...
...
@@ -215,7 +215,7 @@ MACRLCs = (
remote_s_portd
=
50010
;
tr_s_preference
=
"nfapi"
;
tr_n_preference
=
"local_RRC"
;
}
}
);
THREAD_STRUCT
= (
...
...
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
View file @
bb863f77
...
...
@@ -6491,11 +6491,11 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked
{
nfapi_rx_indication_body_t
*
value
=
(
nfapi_rx_indication_body_t
*
)
tlv
;
NFAPI_TRACE
(
NFAPI_TRACE_
ERROR
,
"%s value->tl.length in unpack: %u
\n
"
,
__FUNCTION__
,
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"%s value->tl.length in unpack: %u
\n
"
,
__FUNCTION__
,
value
->
tl
.
length
);
uint8_t
*
rxBodyEnd
=
*
ppReadPackedMsg
+
value
->
tl
.
length
;
NFAPI_TRACE
(
NFAPI_TRACE_
ERROR
,
"%s rxBodyEnd: %p end: %p
\n
"
,
__FUNCTION__
,
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"%s rxBodyEnd: %p end: %p
\n
"
,
__FUNCTION__
,
rxBodyEnd
,
end
);
if
(
rxBodyEnd
>
end
)
{
...
...
@@ -6527,10 +6527,10 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked
value
->
rx_pdu_list
=
0
;
}
NFAPI_TRACE
(
NFAPI_TRACE_
ERROR
,
"%s number_of_pdus = %u
\n
"
,
__FUNCTION__
,
value
->
number_of_pdus
);
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"%s number_of_pdus = %u
\n
"
,
__FUNCTION__
,
value
->
number_of_pdus
);
for
(
int
i
=
0
;
i
<
value
->
number_of_pdus
;
i
++
)
{
NFAPI_TRACE
(
NFAPI_TRACE_
ERROR
,
"%s i = %u
\n
"
,
__FUNCTION__
,
i
);
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"%s i = %u
\n
"
,
__FUNCTION__
,
i
);
nfapi_tl_t
generic_tl
;
// NFAPI_RX_UE_INFORMATION_TAG
...
...
@@ -6540,7 +6540,7 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked
return
0
;
}
NFAPI_TRACE
(
NFAPI_TRACE_
ERROR
,
"%s generic_tl.tag = 0x%x length = %u
\n
"
,
__FUNCTION__
,
generic_tl
.
tag
,
generic_tl
.
length
);
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"%s generic_tl.tag = 0x%x length = %u
\n
"
,
__FUNCTION__
,
generic_tl
.
tag
,
generic_tl
.
length
);
if
(
generic_tl
.
tag
!=
NFAPI_RX_UE_INFORMATION_TAG
)
{
...
...
@@ -6565,7 +6565,7 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked
return
0
;
}
NFAPI_TRACE
(
NFAPI_TRACE_
ERROR
,
"%s generic_tl.tag = 0x%x length = %u
\n
"
,
__FUNCTION__
,
generic_tl
.
tag
,
generic_tl
.
length
);
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"%s generic_tl.tag = 0x%x length = %u
\n
"
,
__FUNCTION__
,
generic_tl
.
tag
,
generic_tl
.
length
);
if
(
generic_tl
.
tag
!=
NFAPI_RX_INDICATION_REL8_TAG
)
{
...
...
@@ -6589,7 +6589,7 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked
return
0
;
}
NFAPI_TRACE
(
NFAPI_TRACE_
ERROR
,
"%s generic_tl.tag = 0x%x length = %u
\n
"
,
__FUNCTION__
,
generic_tl
.
tag
,
generic_tl
.
length
);
NFAPI_TRACE
(
NFAPI_TRACE_
INFO
,
"%s generic_tl.tag = 0x%x length = %u
\n
"
,
__FUNCTION__
,
generic_tl
.
tag
,
generic_tl
.
length
);
if
(
generic_tl
.
tag
!=
NFAPI_RX_INDICATION_REL9_TAG
)
{
...
...
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