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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
1f4a9f34
Commit
1f4a9f34
authored
Oct 17, 2018
by
Y_Tomita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for abnormal exit because L2sim doesn't use pointer of D2D test.
parent
1791574d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
3 deletions
+35
-3
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+35
-3
No files found.
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
100644 → 100755
View file @
1f4a9f34
...
@@ -85,7 +85,7 @@ unsigned char pdcp_read_state_g = 0;
...
@@ -85,7 +85,7 @@ unsigned char pdcp_read_state_g = 0;
#endif
#endif
extern
Packet_OTG_List_t
*
otg_pdcp_buffer
;
extern
Packet_OTG_List_t
*
otg_pdcp_buffer
;
extern
uint8_t
nfapi_mode
;
#if defined(LINK_ENB_PDCP_TO_GTPV1U)
#if defined(LINK_ENB_PDCP_TO_GTPV1U)
# include "gtpv1u_eNB_task.h"
# include "gtpv1u_eNB_task.h"
# include "gtpv1u_eNB_defs.h"
# include "gtpv1u_eNB_defs.h"
...
@@ -1072,7 +1072,22 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
...
@@ -1072,7 +1072,22 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
pdcp_read_header_g
.
rb_id
,
pdcp_read_header_g
.
rb_id
,
rab_id
,
rab_id
,
pdcp_read_header_g
.
data_size
);
pdcp_read_header_g
.
data_size
);
if
(
nfapi_mode
==
3
){
pdcp_data_req
(
&
ctxt
,
SRB_FLAG_NO
,
rab_id
,
RLC_MUI_UNDEFINED
,
RLC_SDU_CONFIRM_NO
,
pdcp_read_header_g
.
data_size
,
(
unsigned
char
*
)
NLMSG_DATA
(
nas_nlh_rx
),
PDCP_TRANSMISSION_MODE_DATA
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
}
else
{
pdcp_data_req
(
pdcp_data_req
(
&
ctxt
,
&
ctxt
,
SRB_FLAG_NO
,
SRB_FLAG_NO
,
...
@@ -1087,6 +1102,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
...
@@ -1087,6 +1102,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
,
&
pdcp_read_header_g
.
destinationL2Id
,
&
pdcp_read_header_g
.
destinationL2Id
#endif
#endif
);
);
}
}
else
{
}
else
{
MSC_LOG_RX_DISCARDED_MESSAGE
(
MSC_LOG_RX_DISCARDED_MESSAGE
(
(
ctxt_pP
->
enb_flag
==
ENB_FLAG_YES
)
?
MSC_PDCP_ENB
:
MSC_PDCP_UE
,
(
ctxt_pP
->
enb_flag
==
ENB_FLAG_YES
)
?
MSC_PDCP_ENB
:
MSC_PDCP_UE
,
...
@@ -1130,7 +1146,22 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
...
@@ -1130,7 +1146,22 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
pdcp_read_header_g
.
rb_id
,
pdcp_read_header_g
.
rb_id
,
DEFAULT_RAB_ID
,
DEFAULT_RAB_ID
,
pdcp_read_header_g
.
data_size
);
pdcp_read_header_g
.
data_size
);
if
(
nfapi_mode
==
3
){
pdcp_data_req
(
&
ctxt
,
SRB_FLAG_NO
,
DEFAULT_RAB_ID
,
RLC_MUI_UNDEFINED
,
RLC_SDU_CONFIRM_NO
,
pdcp_read_header_g
.
data_size
,
(
unsigned
char
*
)
NLMSG_DATA
(
nas_nlh_rx
),
PDCP_TRANSMISSION_MODE_DATA
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
NULL
,
NULL
#endif
);
}
else
{
pdcp_data_req
(
pdcp_data_req
(
&
ctxt
,
&
ctxt
,
SRB_FLAG_NO
,
SRB_FLAG_NO
,
...
@@ -1145,6 +1176,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
...
@@ -1145,6 +1176,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
,
&
pdcp_read_header_g
.
destinationL2Id
,
&
pdcp_read_header_g
.
destinationL2Id
#endif
#endif
);
);
}
}
}
}
}
...
...
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