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
Michael Black
OpenXG-RAN
Commits
a1d80515
Commit
a1d80515
authored
Nov 18, 2022
by
laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add a bug fix to takcly usefully CI run
parent
1e8719c1
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
78 deletions
+63
-78
openair2/RRC/LTE/rrc_eNB_M2AP.c
openair2/RRC/LTE/rrc_eNB_M2AP.c
+51
-72
openair2/UTIL/OPT/probe.c
openair2/UTIL/OPT/probe.c
+12
-6
No files found.
openair2/RRC/LTE/rrc_eNB_M2AP.c
View file @
a1d80515
This diff is collapsed.
Click to expand it.
openair2/UTIL/OPT/probe.c
View file @
a1d80515
...
...
@@ -286,7 +286,7 @@ static void SendFrame(guint8 radioType, guint8 direction, guint8 rntiType,
guint8
isPredefinedData
,
guint8
retx
,
guint8
crcStatus
,
guint8
oob_event
,
guint8
oob_event_value
,
uint8_t
*
pdu_buffer
,
unsigned
int
pdu_buffer_size
)
{
unsigned
char
frameBuffer
[
9
000
];
unsigned
char
frameBuffer
[
16
000
];
unsigned
int
frameOffset
;
ssize_t
bytesSent
;
frameOffset
=
0
;
...
...
@@ -385,8 +385,11 @@ static void SendFrame(guint8 radioType, guint8 direction, guint8 rntiType,
//memcpy(frameBuffer+frameOffset, g_PDUBuffer, g_PDUOffset);
//frameOffset += g_PDUOffset;
if
(
pdu_buffer
!=
NULL
)
{
memcpy
(
frameBuffer
+
frameOffset
,
(
void
*
)
pdu_buffer
,
pdu_buffer_size
);
frameOffset
+=
pdu_buffer_size
;
const
int
sz
=
min
(
pdu_buffer_size
,
sizeof
(
frameBuffer
)
-
frameOffset
);
memcpy
(
frameBuffer
+
frameOffset
,
(
void
*
)
pdu_buffer
,
sz
);
if
(
pdu_buffer_size
!=
sz
)
LOG_W
(
OPT
,
"pdu is huge : %d
\n
"
,
pdu_buffer_size
);
frameOffset
+=
sz
;
}
if
(
opt_type
==
OPT_WIRESHARK
)
...
...
@@ -408,7 +411,7 @@ static void SendFrameNR(guint8 radioType, guint8 direction, guint8 rntiType,
guint8
isPredefinedData
,
guint8
retx
,
guint8
crcStatus
,
guint8
oob_event
,
guint8
oob_event_value
,
uint8_t
*
pdu_buffer
,
unsigned
int
pdu_buffer_size
)
{
unsigned
char
frameBuffer
[
1
2000
];
unsigned
char
frameBuffer
[
3
2000
];
unsigned
int
frameOffset
;
ssize_t
bytesSent
;
frameOffset
=
0
;
...
...
@@ -454,8 +457,11 @@ static void SendFrameNR(guint8 radioType, guint8 direction, guint8 rntiType,
//memcpy(frameBuffer+frameOffset, g_PDUBuffer, g_PDUOffset);
//frameOffset += g_PDUOffset;
if
(
pdu_buffer
!=
NULL
)
{
memcpy
(
frameBuffer
+
frameOffset
,
(
void
*
)
pdu_buffer
,
pdu_buffer_size
);
frameOffset
+=
pdu_buffer_size
;
const
int
sz
=
min
(
pdu_buffer_size
,
sizeof
(
frameBuffer
)
-
frameOffset
);
memcpy
(
frameBuffer
+
frameOffset
,
(
void
*
)
pdu_buffer
,
sz
);
if
(
sz
!=
pdu_buffer_size
)
LOG_W
(
OPT
,
"large pdu: %d
\n
"
,
pdu_buffer_size
);
frameOffset
+=
sz
;
}
if
(
opt_type
==
OPT_WIRESHARK
)
...
...
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