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
zzha zzha
OpenXG-RAN
Commits
5ebf096d
Commit
5ebf096d
authored
Dec 19, 2014
by
Lionel Gauthier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
git-svn-id:
http://svn.eurecom.fr/openair4G/trunk@6293
818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent
571f07b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
121 deletions
+53
-121
openair-cn/SGW-LITE/sgw_lite_handlers.c
openair-cn/SGW-LITE/sgw_lite_handlers.c
+2
-2
openair-cn/SGW-LITE/spgw_config.c
openair-cn/SGW-LITE/spgw_config.c
+51
-119
No files found.
openair-cn/SGW-LITE/sgw_lite_handlers.c
View file @
5ebf096d
...
@@ -671,7 +671,7 @@ sgw_lite_handle_sgi_endpoint_updated(
...
@@ -671,7 +671,7 @@ sgw_lite_handle_sgi_endpoint_updated(
#if defined (ENABLE_USE_GTPU_IN_KERNEL)
#if defined (ENABLE_USE_GTPU_IN_KERNEL)
ret
=
snprintf
(
cmd
,
ret
=
snprintf
(
cmd
,
256
,
256
,
"iptables -t mangle -
A
POSTROUTING -d %u.%u.%u.%u -m mark --mark %u -j GTPUAH --own-ip %u.%u.%u.%u --own-tun %u --peer-ip %u.%u.%u.%u --peer-tun %u --action add"
,
"iptables -t mangle -
I
POSTROUTING -d %u.%u.%u.%u -m mark --mark %u -j GTPUAH --own-ip %u.%u.%u.%u --own-tun %u --peer-ip %u.%u.%u.%u --peer-tun %u --action add"
,
eps_bearer_entry_p
->
paa
.
ipv4_address
[
0
],
eps_bearer_entry_p
->
paa
.
ipv4_address
[
0
],
eps_bearer_entry_p
->
paa
.
ipv4_address
[
1
],
eps_bearer_entry_p
->
paa
.
ipv4_address
[
1
],
eps_bearer_entry_p
->
paa
.
ipv4_address
[
2
],
eps_bearer_entry_p
->
paa
.
ipv4_address
[
2
],
...
@@ -736,7 +736,7 @@ sgw_lite_handle_sgi_endpoint_updated(
...
@@ -736,7 +736,7 @@ sgw_lite_handle_sgi_endpoint_updated(
ret
=
snprintf
(
cmd
,
ret
=
snprintf
(
cmd
,
256
,
256
,
"iptables -t raw -
A
%s -s %u.%u.%u.%u -d %u.%u.%u.%u -p udp --dport 2152 -j GTPURH --own-ip %u.%u.%u.%u --own-tun %u --peer-ip %u.%u.%u.%u --peer-tun %u --action remove"
,
"iptables -t raw -
I
%s -s %u.%u.%u.%u -d %u.%u.%u.%u -p udp --dport 2152 -j GTPURH --own-ip %u.%u.%u.%u --own-tun %u --peer-ip %u.%u.%u.%u --peer-tun %u --action remove"
,
chain
,
chain
,
eps_bearer_entry_p
->
enb_ip_address_for_S1u
.
address
.
ipv4_address
[
0
],
eps_bearer_entry_p
->
enb_ip_address_for_S1u
.
address
.
ipv4_address
[
0
],
eps_bearer_entry_p
->
enb_ip_address_for_S1u
.
address
.
ipv4_address
[
1
],
eps_bearer_entry_p
->
enb_ip_address_for_S1u
.
address
.
ipv4_address
[
1
],
...
...
openair-cn/SGW-LITE/spgw_config.c
View file @
5ebf096d
...
@@ -272,7 +272,6 @@ int spgw_config_process(spgw_config_t* config_pP) {
...
@@ -272,7 +272,6 @@ int spgw_config_process(spgw_config_t* config_pP) {
}
}
#if defined (ENABLE_USE_GTPU_IN_KERNEL)
#if defined (ENABLE_USE_GTPU_IN_KERNEL)
if
(
snprintf
(
system_cmd
,
256
,
if
(
snprintf
(
system_cmd
,
256
,
//"iptables -I POSTROUTING -t mangle -o %s -m state --state NEW -m mark ! --mark 0 ! --protocol sctp -j CONNMARK --save-mark",
"iptables -I POSTROUTING -t mangle -o %s -m mark ! --mark 0 ! --protocol sctp -j CONNMARK --save-mark"
,
"iptables -I POSTROUTING -t mangle -o %s -m mark ! --mark 0 ! --protocol sctp -j CONNMARK --save-mark"
,
config_pP
->
pgw_config
.
ipv4
.
pgw_interface_name_for_SGI
)
>
0
)
{
config_pP
->
pgw_config
.
ipv4
.
pgw_interface_name_for_SGI
)
>
0
)
{
ret
+=
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
ret
+=
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
...
@@ -297,54 +296,6 @@ int spgw_config_process(spgw_config_t* config_pP) {
...
@@ -297,54 +296,6 @@ int spgw_config_process(spgw_config_t* config_pP) {
SPGW_APP_ERROR
(
"Restore mark
\n
"
);
SPGW_APP_ERROR
(
"Restore mark
\n
"
);
ret
=
-
1
;
ret
=
-
1
;
}
}
/*// Mark already there
if (snprintf(system_cmd, 256,
"iptables -I INPUT -t mangle ! --protocol sctp -j CONNMARK --restore-mark") > 0) {
ret += spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
} else {
SPGW_APP_ERROR("iptables -I INPUT -t mangle ! --protocol sctp -j CONNMARK --restore-mark\n");
ret = -1;
}*/
ret
+=
spgw_system
(
"iptables -X INGTPU"
,
SPGW_WARN_ON_ERROR
,
__FILE__
,
__LINE__
);
ret
+=
spgw_system
(
"iptables -N INGTPU"
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
if
(
snprintf
(
system_cmd
,
256
,
"iptables -I INPUT --protocol udp --destination-port 2152 -j INGTPU"
)
>
0
)
{
ret
+=
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
}
else
{
SPGW_APP_ERROR
(
"Trace IP traffic mark
\n
"
);
ret
=
-
1
;
}
ret
+=
spgw_system
(
"iptables -A INGTPU -j LOG --log-prefix ' INGTPU ' --log-ip-options --log-level 4"
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
//ret += spgw_system("iptables -A INGTPU -j ACCEPT", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
ret
+=
spgw_system
(
"iptables -X OUTGTPU"
,
SPGW_WARN_ON_ERROR
,
__FILE__
,
__LINE__
);
ret
+=
spgw_system
(
"iptables -N OUTGTPU"
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
if
(
snprintf
(
system_cmd
,
256
,
"iptables -I OUTPUT --protocol udp --destination-port 2152 -j OUTGTPU"
)
>
0
)
{
ret
+=
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
}
else
{
SPGW_APP_ERROR
(
"Trace IP traffic mark
\n
"
);
ret
=
-
1
;
}
ret
+=
spgw_system
(
"iptables -A OUTGTPU -j LOG --log-prefix ' OUTGTPU ' --log-ip-options --log-level 4"
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
//ret += spgw_system("iptables -A OUTGTPU -j ACCEPT", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
ret
+=
spgw_system
(
"iptables -X FW"
,
SPGW_WARN_ON_ERROR
,
__FILE__
,
__LINE__
);
ret
+=
spgw_system
(
"iptables -N FW"
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
if
(
snprintf
(
system_cmd
,
256
,
"iptables -I FORWARD -j FW"
)
>
0
)
{
ret
+=
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
}
else
{
SPGW_APP_ERROR
(
"Trace IP traffic mark
\n
"
);
ret
=
-
1
;
}
ret
+=
spgw_system
(
"iptables -A FW -j LOG --log-prefix ' FW ' --log-ip-options --log-level 4"
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
//ret += spgw_system("iptables -A FW -j ACCEPT", SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
#endif
#endif
return
ret
;
return
ret
;
}
}
...
@@ -594,87 +545,68 @@ int spgw_config_init(char* lib_config_file_name_pP, spgw_config_t* config_pP) {
...
@@ -594,87 +545,68 @@ int spgw_config_init(char* lib_config_file_name_pP, spgw_config_t* config_pP) {
astring
=
config_setting_get_string_elem
(
sub2setting
,
i
);
astring
=
config_setting_get_string_elem
(
sub2setting
,
i
);
if
(
astring
!=
NULL
)
{
if
(
astring
!=
NULL
)
{
trim
(
astring
,
strlen
(
astring
)
+
1
);
trim
(
astring
,
strlen
(
astring
)
+
1
);
if
(
inet_pton
(
AF_INET
,
astring
,
buf_in_addr
)
<
1
)
{
// failure, test if there is a range specified in the string
// failure, test if there is a range specified in the string
atoken
=
strtok
(
astring
,
PGW_CONFIG_STRING_IPV4_PREFIX_DELIMITER
);
atoken
=
strtok
(
astring
,
PGW_CONFIG_STRING_IPV4_PREFIX_DELIMITER
);
if
(
inet_pton
(
AF_INET
,
atoken
,
buf_in_addr
)
==
1
)
{
if
(
inet_pton
(
AF_INET
,
atoken
,
buf_in_addr
)
==
1
)
{
memcpy
(
&
addr_start
,
buf_in_addr
,
sizeof
(
struct
in_addr
));
memcpy
(
&
addr_start
,
buf_in_addr
,
sizeof
(
struct
in_addr
));
// valid address
// valid address
atoken2
=
strtok
(
NULL
,
PGW_CONFIG_STRING_IPV4_PREFIX_DELIMITER
);
atoken2
=
strtok
(
NULL
,
PGW_CONFIG_STRING_IPV4_PREFIX_DELIMITER
);
#if defined (ENABLE_USE_GTPU_IN_KERNEL)
#if defined (ENABLE_USE_GTPU_IN_KERNEL)
in_addr_var
.
s_addr
=
config_pP
->
sgw_config
.
ipv4
.
sgw_ipv4_address_for_S1u_S12_S4_up
;
in_addr_var
.
s_addr
=
config_pP
->
sgw_config
.
ipv4
.
sgw_ipv4_address_for_S1u_S12_S4_up
;
if
(
snprintf
(
system_cmd
,
128
,
"ip route add %s/%s via %s dev %s"
,
if
(
snprintf
(
system_cmd
,
128
,
"ip route add %s/%s via %s dev %s"
,
astring
,
astring
,
atoken2
,
atoken2
,
inet_ntoa
(
in_addr_var
),
inet_ntoa
(
in_addr_var
),
config_pP
->
sgw_config
.
ipv4
.
sgw_interface_name_for_S1u_S12_S4_up
)
>
0
)
{
config_pP
->
sgw_config
.
ipv4
.
sgw_interface_name_for_S1u_S12_S4_up
)
>
0
)
{
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
}
else
{
}
else
{
SPGW_APP_ERROR
(
"Add route: for %s
\n
"
,
astring
);
SPGW_APP_ERROR
(
"Add route: for %s
\n
"
,
astring
);
}
}
if
(
config_pP
->
sgw_config
.
sgw_drop_downlink_traffic
)
{
if
(
config_pP
->
sgw_config
.
sgw_drop_downlink_traffic
)
{
if
(
snprintf
(
system_cmd
,
128
,
if
(
snprintf
(
system_cmd
,
128
,
"iptables -t filter -I FORWARD -d %s/%s -j DROP"
,
"iptables -t filter -I FORWARD -d %s/%s -j DROP"
,
astring
,
atoken2
)
>
0
)
{
astring
,
atoken2
)
>
0
)
{
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
}
else
{
}
else
{
SPGW_APP_ERROR
(
"Drop downlink traffic
\n
"
);
SPGW_APP_ERROR
(
"Drop downlink traffic
\n
"
);
}
}
if
(
snprintf
(
system_cmd
,
128
,
if
(
snprintf
(
system_cmd
,
128
,
"iptables -t filter -I OUTPUT -d %s/%s -j DROP"
,
"iptables -t filter -I OUTPUT -d %s/%s -j DROP"
,
astring
,
atoken2
)
>
0
)
{
astring
,
atoken2
)
>
0
)
{
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
spgw_system
(
system_cmd
,
SPGW_ABORT_ON_ERROR
,
__FILE__
,
__LINE__
);
}
else
{
}
else
{
SPGW_APP_ERROR
(
"Drop downlink traffic
\n
"
);
SPGW_APP_ERROR
(
"Drop downlink traffic
\n
"
);
}
}
}
}
#endif
#endif
prefix_mask
=
atoi
(
atoken2
);
prefix_mask
=
atoi
(
atoken2
);
if
((
prefix_mask
>=
2
)
&&
(
prefix_mask
<
32
))
{
if
((
prefix_mask
>=
2
)
&&
(
prefix_mask
<
32
))
{
memcpy
(
&
addr_start
,
buf_in_addr
,
sizeof
(
struct
in_addr
));
memcpy
(
&
addr_start
,
buf_in_addr
,
sizeof
(
struct
in_addr
));
memcpy
(
&
addr_mask
,
buf_in_addr
,
sizeof
(
struct
in_addr
));
memcpy
(
&
addr_mask
,
buf_in_addr
,
sizeof
(
struct
in_addr
));
addr_mask
.
s_addr
=
addr_mask
.
s_addr
&
htonl
(
0xFFFFFFFF
<<
(
32
-
prefix_mask
));
addr_mask
.
s_addr
=
addr_mask
.
s_addr
&
htonl
(
0xFFFFFFFF
<<
(
32
-
prefix_mask
));
if
(
memcmp
(
&
addr_start
,
&
addr_mask
,
sizeof
(
struct
in_addr
))
!=
0
)
{
if
(
memcmp
(
&
addr_start
,
&
addr_mask
,
sizeof
(
struct
in_addr
))
!=
0
)
{
AssertFatal
(
0
,
"BAD IPV4 ADDR CONFIG/MASK PAIRING %s/%d addr %X mask %X
\n
"
,
AssertFatal
(
0
,
"BAD IPV4 ADDR CONFIG/MASK PAIRING %s/%d addr %X mask %X
\n
"
,
astring
,
prefix_mask
,
addr_start
.
s_addr
,
addr_mask
.
s_addr
);
astring
,
prefix_mask
,
addr_start
.
s_addr
,
addr_mask
.
s_addr
);
}
counter64
=
0x00000000FFFFFFFF
>>
prefix_mask
;
// address Prefix_mask/0..0 not valid
counter64
=
counter64
-
2
;
do
{
addr_start
.
s_addr
=
addr_start
.
s_addr
+
htonl
(
2
);
ip4_ref
=
calloc
(
1
,
sizeof
(
pgw_lite_conf_ipv4_list_elm_t
));
ip4_ref
->
addr
=
addr_start
;
STAILQ_INSERT_TAIL
(
&
config_pP
->
pgw_config
.
pgw_lite_ipv4_pool_list
,
ip4_ref
,
ipv4_entries
);
counter64
=
counter64
-
1
;
}
while
(
counter64
>
0
);
}
else
{
SPGW_APP_ERROR
(
"CONFIG POOL ADDR IPV4: BAD MASQ: %s
\n
"
,
atoken2
);
}
}
counter64
=
0x00000000FFFFFFFF
>>
prefix_mask
;
// address Prefix_mask/0..0 not valid
counter64
=
counter64
-
2
;
do
{
addr_start
.
s_addr
=
addr_start
.
s_addr
+
htonl
(
2
);
ip4_ref
=
calloc
(
1
,
sizeof
(
pgw_lite_conf_ipv4_list_elm_t
));
ip4_ref
->
addr
=
addr_start
;
STAILQ_INSERT_TAIL
(
&
config_pP
->
pgw_config
.
pgw_lite_ipv4_pool_list
,
ip4_ref
,
ipv4_entries
);
counter64
=
counter64
-
1
;
}
while
(
counter64
>
0
);
}
else
{
}
else
{
SPGW_APP_ERROR
(
"CONFIG POOL ADDR IPV4:
ADDR not recognized: %s
\n
"
,
atoken
);
SPGW_APP_ERROR
(
"CONFIG POOL ADDR IPV4:
BAD MASQ: %s
\n
"
,
atoken2
);
}
}
}
else
{
memcpy
(
&
addr_start
,
buf_in_addr
,
sizeof
(
struct
in_addr
));
ip4_ref
=
calloc
(
1
,
sizeof
(
pgw_lite_conf_ipv4_list_elm_t
));
ip4_ref
->
addr
=
addr_start
;
STAILQ_INSERT_TAIL
(
&
config_pP
->
pgw_config
.
pgw_lite_ipv4_pool_list
,
ip4_ref
,
ipv4_entries
);
#if defined (ENABLE_USE_GTPU_IN_KERNEL)
/*if (snprintf(system_cmd, 128, "ip route add %s dev %s",
buf_in_addr,
config_pP->sgw_config.ipv4.sgw_interface_name_for_S1u_S12_S4_up) > 0) {
SPGW_APP_INFO("Add route: %s\n",system_cmd);
spgw_system(system_cmd, SPGW_ABORT_ON_ERROR, __FILE__, __LINE__);
} else {
SPGW_APP_ERROR("Add route: for %s\n", buf_in_addr);
}*/
#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