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
lizhongxiao
OpenXG UE
Commits
8120eb68
Commit
8120eb68
authored
Nov 02, 2018
by
yoshio.inoue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed overflow related to oip generation
parent
d9ce21c2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
15 deletions
+15
-15
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+2
-2
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+1
-1
openair2/NETWORK_DRIVER/UE_IP/common.c
openair2/NETWORK_DRIVER/UE_IP/common.c
+3
-3
openair2/NETWORK_DRIVER/UE_IP/device.c
openair2/NETWORK_DRIVER/UE_IP/device.c
+6
-6
openair3/NAS/UE/ESM/esm_ebr_context.c
openair3/NAS/UE/ESM/esm_ebr_context.c
+3
-3
No files found.
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
8120eb68
...
...
@@ -800,9 +800,9 @@ pdcp_data_ind(
*/
if
(
nfapi_mode
==
3
)
{
#ifdef UESIM_EXPANSION
((
pdcp_data_ind_header_t
*
)
new_sdu_p
->
data
)
->
inst
=
1
;
((
pdcp_data_ind_header_t
*
)
new_sdu_p
->
data
)
->
inst
=
0
;
#else
((
pdcp_data_ind_header_t
*
)
new_sdu_p
->
data
)
->
inst
=
ctxt_pP
->
module_id
+
1
;
((
pdcp_data_ind_header_t
*
)
new_sdu_p
->
data
)
->
inst
=
ctxt_pP
->
module_id
;
#endif
}
else
{
((
pdcp_data_ind_header_t
*
)
new_sdu_p
->
data
)
->
inst
=
1
;
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
8120eb68
...
...
@@ -938,7 +938,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
#ifdef UESIM_EXPANSION
ctxt
.
module_id
=
inst_pdcp_list
[
pdcp_read_header_g
.
inst
];
#else
ctxt
.
module_id
=
pdcp_read_header_g
.
inst
-
1
;
ctxt
.
module_id
=
pdcp_read_header_g
.
inst
;
#endif
}
else
{
ctxt
.
module_id
=
0
;
...
...
openair2/NETWORK_DRIVER/UE_IP/common.c
View file @
8120eb68
...
...
@@ -306,10 +306,10 @@ ue_ip_common_ip2wireless(
}
// modify inst by IP address for the U-Plane of multiple UEs while L2 fapi simulator start
#ifdef UESIM_EXPANSION
if
((
src_addr
[
3
]
-
1
)
>
instP
)
{
pdcph
.
inst
=
src_addr
[
3
]
-
1
;
if
((
src_addr
[
3
]
-
2
)
>
instP
)
{
pdcph
.
inst
=
src_addr
[
3
]
-
2
;
printk
(
"[UE_IP_DRV] change INST from %d to %d
\n
"
,
instP
,
pdcph
.
inst
);
instP
=
src_addr
[
3
]
-
1
;
instP
=
src_addr
[
3
]
-
2
;
priv_p
=
netdev_priv
(
ue_ip_dev
[
instP
]);
}
#endif
...
...
openair2/NETWORK_DRIVER/UE_IP/device.c
View file @
8120eb68
...
...
@@ -61,7 +61,7 @@ int ue_ip_find_inst(struct net_device *dev_pP)
//---------------------------------------------------------------------------
int
i
;
for
(
i
=
1
;
i
<=
UE_IP_NB_INSTANCES_MAX
;
i
++
)
for
(
i
=
0
;
i
<
UE_IP_NB_INSTANCES_MAX
;
i
++
)
if
(
ue_ip_dev
[
i
]
==
dev_pP
)
{
return
(
i
);
}
...
...
@@ -194,7 +194,7 @@ void ue_ip_teardown(struct net_device *dev_pP)
priv_p
=
netdev_priv
(
dev_pP
);
inst
=
ue_ip_find_inst
(
dev_pP
);
if
((
inst
<
=
0
)
||
(
inst
>
UE_IP_NB_INSTANCES_MAX
))
{
if
((
inst
<
0
)
||
(
inst
>=
UE_IP_NB_INSTANCES_MAX
))
{
printk
(
"[UE_IP_DRV][%s] ERROR, couldn't find instance
\n
"
,
__FUNCTION__
);
return
;
}
...
...
@@ -243,7 +243,7 @@ int ue_ip_hard_start_xmit(struct sk_buff *skb_pP, struct net_device *dev_pP)
return
-
1
;
}
if
((
inst
>
0
)
&&
(
inst
<=
UE_IP_NB_INSTANCES_MAX
))
{
if
((
inst
>
=
0
)
&&
(
inst
<
UE_IP_NB_INSTANCES_MAX
))
{
#ifdef OAI_DRV_OAI_DRV_DEBUG_DEVICE
printk
(
"[UE_IP_DRV][%s] inst %d, begin
\n
"
,
__FUNCTION__
,
inst
);
#endif
...
...
@@ -392,9 +392,9 @@ int init_module (void)
// Initialize parameters shared with RRC
printk
(
"[UE_IP_DRV][%s] Starting OAI IP driver"
,
__FUNCTION__
);
for
(
inst
=
1
;
inst
<=
UE_IP_NB_INSTANCES_MAX
;
inst
++
)
{
for
(
inst
=
0
;
inst
<
UE_IP_NB_INSTANCES_MAX
;
inst
++
)
{
printk
(
"[UE_IP_DRV][%s] begin init instance %d
\n
"
,
__FUNCTION__
,
inst
);
sprintf
(
devicename
,
"oip%d"
,
inst
);
sprintf
(
devicename
,
"oip%d"
,
inst
+
1
);
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
ue_ip_dev
[
inst
]
=
alloc_netdev
(
sizeof
(
ue_ip_priv_t
),
devicename
,
ue_ip_init
);
#else
...
...
@@ -434,7 +434,7 @@ void cleanup_module(void)
printk
(
"[UE_IP_DRV][CLEANUP] begin
\n
"
);
for
(
inst
=
1
;
inst
<=
UE_IP_NB_INSTANCES_MAX
;
inst
++
)
{
for
(
inst
=
0
;
inst
<
UE_IP_NB_INSTANCES_MAX
;
inst
++
)
{
#ifdef OAI_DRV_DEBUG_DEVICE
printk
(
"[UE_IP_DRV][CLEANUP] unregister and free net device instance %d
\n
"
,
inst
);
#endif
...
...
openair3/NAS/UE/ESM/esm_ebr_context.c
View file @
8120eb68
...
...
@@ -284,16 +284,16 @@ int esm_ebr_context_create(
// if it's made too many tables , OS may crush so we use one table.
#ifdef PDCP_USE_NETLINK
#ifdef UESIM_EXPANSION
uint16_t
inst_nic
=
(
pdn
->
ip_addr
[
3
]
&
0x000000FF
)
-
1
;
uint16_t
inst_nic
=
(
pdn
->
ip_addr
[
3
]
&
0x000000FF
)
-
2
;
res
=
sprintf
(
command_line
,
"ifconfig oip%d %s netmask %s broadcast %s up && "
"ip rule add from %s/24 table %d && "
"ip rule add to %s/24 table %d && "
"ip route add default dev oip%d table %d"
,
inst_nic
,
ipv4_addr
,
netmask
,
broadcast
,
inst_nic
+
1
,
ipv4_addr
,
netmask
,
broadcast
,
ipv4_addr
,
201
,
ipv4_addr
,
201
,
inst_nic
,
201
);
inst_nic
+
1
,
201
);
inst_pdcp_list
[
inst_nic
]
=
ueid
;
#else
...
...
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