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
wangjie
OpenXG-RAN
Commits
03f7decc
Commit
03f7decc
authored
Jun 18, 2021
by
hardy
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/512-dataplane-bug-in-l2nfapi_nos1' into integration_2021_wk24
parents
b1df028c
2632d81d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
2 deletions
+32
-2
ci-scripts/runTestOnVM.sh
ci-scripts/runTestOnVM.sh
+6
-0
cmake_targets/tools/setup_routes.sh
cmake_targets/tools/setup_routes.sh
+13
-0
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+7
-1
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+6
-1
No files found.
ci-scripts/runTestOnVM.sh
View file @
03f7decc
...
...
@@ -964,6 +964,12 @@ function start_l2_sim_ue {
echo
"ifconfig"
>
$1
ssh
-T
-o
StrictHostKeyChecking
=
no ubuntu@
$LOC_UE_VM_IP_ADDR
<
$1
rm
$1
else
echo
"Setting Routes for all UEs"
echo
"cd /home/ubuntu/tmp/cmake_targets/tools"
>
$1
echo
"./setup_routes.sh
$LOC_NB_UES
"
>>
$1
ssh
-T
-o
StrictHostKeyChecking
=
no ubuntu@
$LOC_UE_VM_IP_ADDR
<
$1
rm
$1
fi
}
...
...
cmake_targets/tools/setup_routes.sh
0 → 100755
View file @
03f7decc
#!/bin/bash
for
i
in
$(
seq
1
$1
)
;
do
let
table
=
1000+
$i
echo
"sudo ip route add 10.0.1.0/24 dev oaitun_ue
$i
table
$table
"
sudo
ip route add 10.0.1.0/24 dev oaitun_ue
$i
table
$table
echo
"sudo ip route add default via 10.0.1.1 dev oaitun_ue
$i
table
$table
"
sudo
ip route add default via 10.0.1.1 dev oaitun_ue
$i
table
$table
let
octet
=
$i
+1
echo
"sudo ip rule add from 10.0.1.
$octet
table
$table
"
sudo
ip rule add from 10.0.1.
$octet
table
$table
done
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
03f7decc
...
...
@@ -1081,7 +1081,13 @@ pdcp_data_ind(
pdcpHead
->
inst
=
1
;
}
}
// nfapi_mode
}
}
else
{
if
(
UE_NAS_USE_TUN
)
{
pdcpHead
->
inst
=
ctxt_pP
->
module_id
;
}
else
if
(
ENB_NAS_USE_TUN
)
{
pdcpHead
->
inst
=
0
;
}
}
}
else
{
pdcpHead
->
rb_id
=
rb_id
+
(
ctxt_pP
->
module_id
*
LTE_maxDRB
);
pdcpHead
->
inst
=
ctxt_pP
->
module_id
;
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
03f7decc
...
...
@@ -43,6 +43,7 @@ extern int otg_enabled;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <netinet/ip.h>
#define rtf_put write
#define rtf_get read
...
...
@@ -222,7 +223,11 @@ int pdcp_fifo_read_input_sdus_fromtun (const protocol_ctxt_t *const ctxt_pP) {
key
=
PDCP_COLL_KEY_DEFAULT_DRB_VALUE
(
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
);
h_rc
=
hashtable_get
(
pdcp_coll_p
,
key
,
(
void
**
)
&
pdcp_p
);
}
else
{
// => ENB_NAS_USE_TUN
ctxt
.
rnti
=
pdcp_eNB_UE_instance_to_rnti
[
0
];
/* Get the IP from a packet */
struct
ip
*
ip_pack
=
(
struct
ip
*
)
nl_rx_buf
;
/* Use last octet of destination IP to get index of UE */
int
ue_indx
=
((
ip_pack
->
ip_dst
.
s_addr
>>
24
)
-
2
)
%
MAX_MOBILES_PER_ENB
;
ctxt
.
rnti
=
pdcp_eNB_UE_instance_to_rnti
[
ue_indx
];
ctxt
.
enb_flag
=
ENB_FLAG_YES
;
ctxt
.
module_id
=
0
;
key
=
PDCP_COLL_KEY_VALUE
(
ctxt
.
module_id
,
ctxt
.
rnti
,
ctxt
.
enb_flag
,
rab_id
,
SRB_FLAG_NO
);
...
...
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